ForkMaster/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-01-04 07:20:35 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

blockcheck: skip ip block test if unblocked_dom is blocked

Browse Source
This commit is contained in:
bol-van 2024-06-21 11:18:14 +03:00
parent ceb4782613
commit 04e8106b98
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
blockcheck.sh
View File

@ -1229,30 +1229,32 @@ check_dpi_ip_block()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
# $3 - port
local blocked_ip blocked_ips local blocked_dom=$2
local blocked_ip blocked_ips unblocked_ip
echo echo
echo "- IP block tests (requires manual interpretation)" echo "- IP block tests (requires manual interpretation)"
echo "testing $UNBLOCKED_DOM on it's original ip" echo "testing $UNBLOCKED_DOM on it's original ip"
curl_test $1 $UNBLOCKED_DOM if curl_test $1 $UNBLOCKED_DOM; then
unblocked_ip=$(mdig_resolve $IPV $UNBLOCKED_DOM)
[ -n "$unblocked_ip" ] || {
echo $UNBLOCKED_DOM does not resolve. tests not possible.
return 1
}
unblocked_ip=$(mdig_resolve $IPV $UNBLOCKED_DOM) echo "testing $blocked_dom on $unblocked_ip ($UNBLOCKED_DOM)"
[ -n "$unblocked_ip" ] || { curl_test $1 $blocked_dom $unblocked_ip
echo $UNBLOCKED_DOM does not resolve. tests not possible.
return 1
}
echo "testing $2 on $unblocked_ip ($UNBLOCKED_DOM)" blocked_ips=$(mdig_resolve_all $IPV $blocked_dom)
curl_test $1 $2 $unblocked_ip for blocked_ip in $blocked_ips; do
echo "testing $UNBLOCKED_DOM on $blocked_ip ($blocked_dom)"
blocked_ips=$(mdig_resolve_all $IPV $2) curl_test $1 $UNBLOCKED_DOM $blocked_ip
for blocked_ip in $blocked_ips; do done
echo "testing $UNBLOCKED_DOM on $blocked_ip ($2)" else
curl_test $1 $UNBLOCKED_DOM $blocked_ip echo $UNBLOCKED_DOM is not available. skipping this test.
done fi
} }
curl_has_reason_to_continue() curl_has_reason_to_continue()
@ -1300,7 +1302,7 @@ check_domain_http_tcp()
check_domain_prolog $1 $2 $4 || return check_domain_prolog $1 $2 $4 || return
check_dpi_ip_block $1 $4 $2 check_dpi_ip_block $1 $4
[ "$SKIP_TPWS" = 1 ] || { [ "$SKIP_TPWS" = 1 ] || {
echo echo