mirror of
https://github.com/bol-van/zapret2.git
synced 2026-10-29 06:02:05 +00:00
Alexander Golovanov
bf64220ab8
Custom strategy lists are plain text, and each line gets run through the shell - so a strategy containing certain characters (<, parentheses, quotes) would fail unless you added quotes around it by hand. Some real, valid strategies use exactly these characters. Now, when a line fails for that reason, it's automatically retried in a simpler way that doesn't care about those characters at all. You can paste a strategy in exactly as blockcheck2 prints it and it'll just work. Manual escaping still works too, and is tried first if you're already doing it.
78 lines
1.7 KiB
Bash
78 lines
1.7 KiB
Bash
LIST_HTTP="${LIST_HTTP:-$TESTDIR/list_http.txt}"
|
|
LIST_HTTPS_TLS12="${LIST_HTTPS_TLS12:-$TESTDIR/list_https_tls12.txt}"
|
|
LIST_HTTPS_TLS13="${LIST_HTTPS_TLS13:-$TESTDIR/list_https_tls13.txt}"
|
|
LIST_QUIC="${LIST_QUIC:-$TESTDIR/list_quic.txt}"
|
|
|
|
emptyf()
|
|
{
|
|
:
|
|
}
|
|
|
|
check_list()
|
|
{
|
|
# $1 - test function
|
|
# $2 - domain
|
|
# $3 - file
|
|
|
|
local line ok=0
|
|
[ -f "$3" ] || {
|
|
echo "no strategy file '$3'"
|
|
return 1
|
|
}
|
|
while IFS= read -r line; do
|
|
case "$line" in
|
|
""|\#*) continue ;;
|
|
esac
|
|
line=$(echo "$line" | tr -d "\r\n")
|
|
# dry run eval in subshell. can fail because of unescaped chars or something else
|
|
if (eval emptyf $line) 2>/dev/null; then
|
|
# real run in the current shell. can modify vars
|
|
eval pktws_curl_test_update "$1" "$2" $line && ok=1
|
|
else
|
|
# $line contains characters that are meaningful to nfqws2/lua-desync
|
|
# syntax (e.g. "<" in --out-range=s1<d1, or "(" and "'" in a
|
|
# --lua-init=...=tls_mod(...,'rnd') expression) but aren't valid
|
|
# shell syntax on their own, so the dry run above rejected it.
|
|
# Fall back to a plain (non-eval) split: $line is only word-split
|
|
# on whitespace here, nothing in it is re-parsed as shell syntax,
|
|
# so these can be used exactly as blockcheck2 itself prints them,
|
|
# with no manual escaping needed.
|
|
pktws_curl_test_update "$1" "$2" $line && ok=1
|
|
fi
|
|
done < "$3"
|
|
|
|
[ "$ok" = 1 ]
|
|
}
|
|
|
|
pktws_check_http()
|
|
{
|
|
# $1 - test function
|
|
# $2 - domain
|
|
|
|
check_list "$1" "$2" "$LIST_HTTP"
|
|
}
|
|
|
|
pktws_check_https_tls12()
|
|
{
|
|
# $1 - test function
|
|
# $2 - domain
|
|
|
|
check_list "$1" "$2" "$LIST_HTTPS_TLS12"
|
|
}
|
|
|
|
pktws_check_https_tls13()
|
|
{
|
|
# $1 - test function
|
|
# $2 - domain
|
|
|
|
check_list "$1" "$2" "$LIST_HTTPS_TLS13"
|
|
}
|
|
|
|
pktws_check_http3()
|
|
{
|
|
# $1 - test function
|
|
# $2 - domain
|
|
|
|
check_list "$1" "$2" "$LIST_QUIC"
|
|
}
|