sad/firehol
1
0
Fork 0
mirror of https://github.com/firehol/firehol.git synced 2024-06-29 18:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for malc0de giving ip 0.0.0.0

Browse Source
This commit is contained in:
Costa Tsaousis (ktsaou) 2015-04-25 21:03:08 +03:00
parent ddd7d7724c
commit 53cd6da3d0
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
contrib/update-ipsets.sh
View File

@ -79,13 +79,16 @@ geturl() {
fi
}
remove_slash32() {
sed "s|/32$||g"
}
filter_ip4() { egrep "^[0-9\.]+$"; }
filter_net4() { egrep "^[0-9\.]+/[0-9]+$"; }
filter_all4() { egrep "^[0-9\.]+(/[0-9]+)?$"; }
remove_slash128() {
sed "s|/128$||g"
}
filter_ip6() { egrep "^[0-9a-fA-F:]+$"; }
filter_net6() { egrep "^[0-9a-fA-F:]+/[0-9]+$"; }
filter_all6() { egrep "^[0-9a-fA-F:]+(/[0-9]+)?$"; }
remove_slash32() { sed "s|/32$||g"; }
remove_slash128() { sed "s|/128$||g"; }
append_slash32() {
# this command appends '/32' to all the lines
@ -99,6 +102,10 @@ append_slash128() {
awk '/\// {print $1; next}; // {print $1 "/128" }'
}
filter_invalid4() {
egrep -v "^(0\.0\.0\.0|0\.0\.0\.0/0|255\.255\.255\.255|255\.255\.255\.255/0)$"
}
download_url() {
local ipset="${1}" mins="${2}" url="${3}" \
install="${base}/${1}" \
@ -155,28 +162,27 @@ download_url() {
update() {
local ipset="${1}" mins="${2}" ipv="${3}" type="${4}" url="${5}" processor="${6-cat}"
install="${base}/${1}" tmp= error=0 now= date= pre_fix="cat" post_fix="cat"
install="${base}/${1}" tmp= error=0 now= date= pre_filter="cat" post_filter="cat" filter="cat"
shift 6
case "${ipv}" in
ipv4)
post_filter="filter_invalid4"
case "${type}" in
ip|ips) hash="ip"
type="ip"
pre_fix="remove_slash32"
filter="^[0-9\.]+$"
pre_filter="remove_slash32"
filter="filter_ip4"
;;
net|nets) hash="net"
type="net"
filter="^[0-9\.]+/[0-9]+$"
filter="filter_net4"
;;
both|all) hash="net"
type=""
filter="^[0-9\./]+$"
filter="filter_all4"
;;
split) ;;
@ -190,18 +196,18 @@ update() {
case "${type}" in
ip|ips) hash="ip"
type="ip"
pre_fix="remove_slash128"
filter="^[0-9a-fA-F:]+$"
pre_filter="remove_slash128"
filter="filter_ip6"
;;
net|nets) hash="net"
type="net"
filter="^[0-9a-fA-F:]+/[0-9]+$"
filter="filter_net6"
;;
both|all) hash="net"
type=""
filter="^[0-9a-fA-F:/]+$"
filter="filter_all6"
;;
split) ;;
@ -244,9 +250,9 @@ update() {
tmp="${install}.tmp.$$.${RANDOM}"
${processor} <"${install}.source" |\
${pre_fix} |\
egrep "${filter}" |\
${post_fix} |\
${pre_filter} |\
${filter} |\
${post_filter} |\
sort -u >"${tmp}"
if [ $? -ne 0 ]