drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-05-24 22:32:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

get_combined.sh http-https separation

Browse Source
This commit is contained in:
bolvan
2017-05-11 18:36:52 +03:00
parent 4331604181
commit b15afded1a
5 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ipset/def.sh
View File

@@ -1,3 +1,4 @@
TMPDIR=/tmp
ZIPSET=zapret
ZIPLIST=$EXEDIR/zapret-ip.txt
ZIPLIST_EXCLUDE=$EXEDIR/zapret-ip-exclude.txt
@@ -17,4 +18,11 @@ getuser()
[ -f $ZUSERLIST_IPBAN ] && {
dig A +short +time=8 +tries=2 -f $ZUSERLIST_IPBAN | grep -E '^[^;].*[^.]$' | grep -vE '^192\.168\.[0-9]+\.[0-9]+$' | grep -vE '^127\.[0-9]+\.[0-9]+\.[0-9]+$' | grep -vE '^10\.[0-9]+\.[0-9]+\.[0-9]+$' | sort -u >$ZIPLIST_USER_IPBAN
}
}
}
cut_local()
{
grep -vE '^192\.168\.[0-9]+\.[0-9]+$' |
grep -vE '^127\.[0-9]+\.[0-9]+\.[0-9]+$' |
grep -vE '^10\.[0-9]+\.[0-9]+\.[0-9]+$'
}

11
ipset/get_antizapret.sh
View File

@@ -8,18 +8,11 @@ EXEDIR=$(dirname $SCRIPT)
#ZURL=https://github.com/zapret-info/z-i/raw/master/dump.csv
ZURL=http://antizapret.prostovpn.org/iplist.txt
ZIPLISTTMP=/tmp/zapret-ip.txt
ZIPLISTTMP=$TMPDIR/zapret-ip.txt
getuser
#curl --fail --max-time 300 --max-filesize 33554432 -k -L "$ZURL" \
# | sed -nre "s/([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})/\1\n/gp" \
# | sed -nre "s/^[^0-9]*([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*$/\1/p" \
# | grep -vE '^192\.168\.[0-9]+\.[0-9]+$' | grep -vE '^127\.[0-9]+\.[0-9]+\.[0-9]+$' | grep -vE '^10\.[0-9]+\.[0-9]+\.[0-9]+$' \
# | sort -u \
curl --fail --max-time 300 --max-filesize 33554432 -k -L "$ZURL" \
| grep -vE '^192\.168\.[0-9]+\.[0-9]+$' | grep -vE '^127\.[0-9]+\.[0-9]+\.[0-9]+$' | grep -vE '^10\.[0-9]+\.[0-9]+\.[0-9]+$' \
>$ZIPLISTTMP &&
curl --fail --max-time 120 --max-filesize 10485760 -k -L "$ZURL" | cut_local >$ZIPLISTTMP &&
{
dlsize=$(wc -c "$ZIPLISTTMP" | cut -f 1 -d ' ')
if test $dlsize -lt 204800; then

49
ipset/get_combined.sh
View File

@@ -6,36 +6,37 @@ EXEDIR=$(dirname $SCRIPT)
. "$EXEDIR/def.sh"
ZREESTR=/tmp/reestr.txt
ZANTIZAPRET=/tmp/antizapret.txt
ZURL_REESTR=http://reestr.rublacklist.net/api/ips
ZURL_ANTIZAPRET=http://antizapret.prostovpn.org/iplist.txt
ZREESTR=$TMPDIR/reestr.txt
ZURL_REESTR=http://reestr.rublacklist.net/api/current
ZAZ=$TMPDIR/zapret-ip.txt
ZURL_AZ=http://antizapret.prostovpn.org/iplist.txt
getuser
curl --fail --max-time 300 --max-filesize 41943040 "$ZURL_REESTR" |
grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' |
grep -vE '^192\.168\.[0-9]+\.[0-9]+$' |
grep -vE '^127\.[0-9]+\.[0-9]+\.[0-9]+$' |
grep -vE '^10\.[0-9]+\.[0-9]+\.[0-9]+$' |
sort -u >$ZREESTR
# assume all https banned by ip
curl --fail --max-time 300 --max-filesize 41943040 "$ZURL_REESTR" -o $ZREESTR
dlsize=$(wc -c "$ZREESTR" | cut -f 1 -d ' ')
if test $dlsize -lt 10240; then
if test $dlsize -lt 1048576; then
echo reestr ip list is too small. can be bad.
exit 2
fi
curl --fail --max-time 300 --max-filesize 33554432 -k -L "$ZURL_ANTIZAPRET" |
grep -vE '^192\.168\.[0-9]+\.[0-9]+$' |
grep -vE '^127\.[0-9]+\.[0-9]+\.[0-9]+$' |
grep -vE '^10\.[0-9]+\.[0-9]+\.[0-9]+$' >$ZANTIZAPRET
dlsize=$(wc -c "$ZANTIZAPRET" | cut -f 1 -d ' ')
if test $dlsize -lt 10240; then
echo antizapret ip list is too small. can be bad.
exit 2
fi
sed -i 's/\\n/\r\n/g' $ZREESTR
grep "https://" $ZREESTR |
grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' |
cut_local |
sort -u >$ZIPLIST_IPBAN
grep -vFf $ZREESTR $ZANTIZAPRET >$ZIPLIST
mv -f $ZREESTR $ZIPLIST_IPBAN
rm -f $ZANTIZAPRET
rm -f $ZREESTR
"$EXEDIR/create_ipset.sh"
curl --fail --max-time 120 --max-filesize 10485760 -k -L "$ZURL_AZ" | cut_local >$ZAZ &&
{
dlsize=$(wc -c "$ZAZ" | cut -f 1 -d ' ')
if test $dlsize -lt 204800; then
echo antizapret list file is too small. can be bad.
exit 2
fi
# do not include hosts banned by ip
grep -vFf $ZIPLIST_IPBAN $ZAZ >$ZIPLIST
rm -f $ZAZ
"$EXEDIR/create_ipset.sh"
}

6
ipset/get_reestr.sh
View File

@@ -6,9 +6,9 @@ EXEDIR=$(dirname $SCRIPT)
. "$EXEDIR/def.sh"
ZREESTR=/tmp/zapret.txt
ZDIG=/tmp/zapret-dig.txt
ZIPLISTTMP=/tmp/zapret-ip.txt
ZREESTR=$TMPDIR/zapret.txt
ZDIG=$TMPDIR/zapret-dig.txt
ZIPLISTTMP=$TMPDIR/zapret-ip.txt
ZURL=http://reestr.rublacklist.net/api/current
getuser