gandc/zapret2
Template
1
0
Fork 0
mirror of https://github.com/bol-van/zapret2.git synced 2026-03-14 06:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

blockcheck: multiple NOTEST fixes

Browse Source
This commit is contained in:
bol-van
2026-01-15 15:08:30 +03:00
parent 3d9a36600b
commit 93d81ca4b2
8 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
blockcheck2.d/standard/20-multi.sh
View File

@@ -41,8 +41,6 @@ pktws_check_https_tls()
local splits_tls='2 1 sniext+1 sniext+4 host+1 midsld 1,midsld 1,midsld,1220 1,sniext+1,host+1,midsld-2,midsld,midsld+2,endhost-1' local splits_tls='2 1 sniext+1 sniext+4 host+1 midsld 1,midsld 1,midsld,1220 1,sniext+1,host+1,midsld-2,midsld,midsld+2,endhost-1'
local PAYLOAD="--payload=tls_client_hello" local PAYLOAD="--payload=tls_client_hello"
[ "$NOTEST_MULTI_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
pktws_simple_split_tests "$1" "$2" "$splits_tls" "$3" pktws_simple_split_tests "$1" "$2" "$splits_tls" "$3"
} }
@@ -50,6 +48,9 @@ pktws_check_https_tls12()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_MULTI_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return
# do not use 'need' values obtained with wssize # do not use 'need' values obtained with wssize
@@ -62,5 +63,8 @@ pktws_check_https_tls13()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_MULTI_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
pktws_check_https_tls "$1" "$2" pktws_check_https_tls "$1" "$2"
} }

6
blockcheck2.d/standard/24-syndata.sh
View File

@@ -23,8 +23,6 @@ pktws_check_https_tls()
local PAYLOAD="--payload=tls_client_hello" ok=0 pre="$3" split local PAYLOAD="--payload=tls_client_hello" ok=0 pre="$3" split
[ "$NOTEST_SYNDATA_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
for split in '' multisplit $MULTIDISORDER; do for split in '' multisplit $MULTIDISORDER; do
pktws_curl_test_update "$1" "$2" $pre --lua-desync=syndata ${split:+$PAYLOAD --lua-desync=$split} && ok=1 pktws_curl_test_update "$1" "$2" $pre --lua-desync=syndata ${split:+$PAYLOAD --lua-desync=$split} && ok=1
pktws_curl_test_update "$1" "$2" $pre --lua-desync=syndata:blob=0x1603 ${split:+$PAYLOAD --lua-desync=$split} && ok=1 pktws_curl_test_update "$1" "$2" $pre --lua-desync=syndata:blob=0x1603 ${split:+$PAYLOAD --lua-desync=$split} && ok=1
@@ -40,6 +38,8 @@ pktws_check_https_tls12()
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_SYNDATA_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return
pktws_check_https_tls "$1" "$2" --lua-desync=wssize:wsize=1:scale=6 pktws_check_https_tls "$1" "$2" --lua-desync=wssize:wsize=1:scale=6
} }
@@ -49,5 +49,7 @@ pktws_check_https_tls13()
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_SYNDATA_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
pktws_check_https_tls "$1" "$2" pktws_check_https_tls "$1" "$2"
} }

8
blockcheck2.d/standard/25-fake.sh
View File

@@ -86,8 +86,6 @@ pktws_check_https_tls()
# $2 - domain # $2 - domain
# $3 - PRE args for nfqws2 # $3 - PRE args for nfqws2
[ "$NOTEST_FAKE_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
local testf=$1 domain="$2" pre="$3" local testf=$1 domain="$2" pre="$3"
local ok ok_any ttls attls f fake fooling local ok ok_any ttls attls f fake fooling
local PAYLOAD="--payload=tls_client_hello" local PAYLOAD="--payload=tls_client_hello"
@@ -133,6 +131,9 @@ pktws_check_https_tls12()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_FAKE_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return
# do not use 'need' values obtained with wssize # do not use 'need' values obtained with wssize
@@ -145,5 +146,8 @@ pktws_check_https_tls13()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_FAKE_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
pktws_check_https_tls "$1" "$2" pktws_check_https_tls "$1" "$2"
} }

7
blockcheck2.d/standard/30-faked.sh
View File

@@ -77,7 +77,6 @@ pktws_check_https_tls()
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
# $3 - PRE args for nfqws2 # $3 - PRE args for nfqws2
[ "$NOTEST_FAKED_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
local splits='2 1 sniext+1 sniext+4 host+1 midsld 1,midsld 1,sniext+1,host+1,midsld-2,midsld,midsld+2,endhost-1' local splits='2 1 sniext+1 sniext+4 host+1 midsld 1,midsld 1,sniext+1,host+1,midsld-2,midsld,midsld+2,endhost-1'
pktws_check_faked $1 "$2" tls_client_hello "$splits" "$FAKED_PATTERN_HTTPS" "$3" pktws_check_faked $1 "$2" tls_client_hello "$splits" "$FAKED_PATTERN_HTTPS" "$3"
@@ -87,6 +86,9 @@ pktws_check_https_tls12()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_FAKED_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return
# do not use 'need' values obtained with wssize # do not use 'need' values obtained with wssize
@@ -99,5 +101,8 @@ pktws_check_https_tls13()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_FAKED_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
pktws_check_https_tls "$1" "$2" pktws_check_https_tls "$1" "$2"
} }

8
blockcheck2.d/standard/35-hostfake.sh
View File

@@ -77,14 +77,15 @@ pktws_check_https_tls()
# $2 - domain # $2 - domain
# $3 - PRE args for nfqws2 # $3 - PRE args for nfqws2
[ "$NOTEST_HOSTFAKE_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
pktws_check_hostfake $1 "$2" tls_client_hello "$3" pktws_check_hostfake $1 "$2" tls_client_hello "$3"
} }
pktws_check_https_tls12() pktws_check_https_tls12()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_HOSTFAKE_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return
# do not use 'need' values obtained with wssize # do not use 'need' values obtained with wssize
@@ -97,5 +98,8 @@ pktws_check_https_tls13()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_HOSTFAKE_HTTPS" = 1 ] && { echo "SKIPPED"; return; }
pktws_check_https_tls "$1" "$2" pktws_check_https_tls "$1" "$2"
} }

8
blockcheck2.d/standard/50-fake-multi.sh
View File

@@ -92,8 +92,6 @@ pktws_check_https_tls()
# $2 - domain # $2 - domain
# $3 - PRE args for nfqws2 # $3 - PRE args for nfqws2
[ "$NOTEST_FAKE_MULTI_HTTPS" = 1 ] && { echo "SKIPPED"; return 0; }
local testf=$1 domain="$2" pre="$3" local testf=$1 domain="$2" pre="$3"
local ok ok_any ttls attls f fake fooling splitf splitfs= split splits='2 1 sniext+1 sniext+4 host+1 midsld 1,midsld 1,midsld,1220 1,sniext+1,host+1,midsld-2,midsld,midsld+2,endhost-1' local ok ok_any ttls attls f fake fooling splitf splitfs= split splits='2 1 sniext+1 sniext+4 host+1 midsld 1,midsld 1,midsld,1220 1,sniext+1,host+1,midsld-2,midsld,midsld+2,endhost-1'
local PAYLOAD="--payload=tls_client_hello" local PAYLOAD="--payload=tls_client_hello"
@@ -148,6 +146,9 @@ pktws_check_https_tls12()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_FAKE_MULTI_HTTPS" = 1 ] && { echo "SKIPPED"; return 0; }
pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return
pktws_check_https_tls "$1" "$2" --lua-desync=wssize:wsize=1:scale=6 pktws_check_https_tls "$1" "$2" --lua-desync=wssize:wsize=1:scale=6
} }
@@ -156,5 +157,8 @@ pktws_check_https_tls13()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_FAKE_MULTI_HTTPS" = 1 ] && { echo "SKIPPED"; return 0; }
pktws_check_https_tls "$1" "$2" pktws_check_https_tls "$1" "$2"
} }

8
blockcheck2.d/standard/55-fake-faked.sh
View File

@@ -93,8 +93,6 @@ pktws_check_https_tls()
# $2 - domain # $2 - domain
# $3 - PRE args for nfqws2 # $3 - PRE args for nfqws2
[ "$NOTEST_FAKE_FAKED_HTTPS" = 1 ] && { echo "SKIPPED"; return 0; }
local testf=$1 domain="$2" pre="$3" local testf=$1 domain="$2" pre="$3"
local ok ok_any ttls attls f fake fooling splitf splitfs= split splits='2 1 sniext+1 sniext+4 host+1 midsld 1,midsld 1,sniext+1,host+1,midsld-2,midsld,midsld+2,endhost-1' local ok ok_any ttls attls f fake fooling splitf splitfs= split splits='2 1 sniext+1 sniext+4 host+1 midsld 1,midsld 1,sniext+1,host+1,midsld-2,midsld,midsld+2,endhost-1'
local PAYLOAD="--payload=tls_client_hello" local PAYLOAD="--payload=tls_client_hello"
@@ -149,6 +147,9 @@ pktws_check_https_tls12()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_FAKE_FAKED_HTTPS" = 1 ] && { echo "SKIPPED"; return 0; }
pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return
pktws_check_https_tls "$1" "$2" --lua-desync=wssize:wsize=1:scale=6 pktws_check_https_tls "$1" "$2" --lua-desync=wssize:wsize=1:scale=6
} }
@@ -157,5 +158,8 @@ pktws_check_https_tls13()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_FAKE_FAKED_HTTPS" = 1 ] && { echo "SKIPPED"; return 0; }
pktws_check_https_tls "$1" "$2" pktws_check_https_tls "$1" "$2"
} }

8
blockcheck2.d/standard/60-fake-hostfake.sh
View File

@@ -83,8 +83,6 @@ pktws_check_https_tls()
# $2 - domain # $2 - domain
# $3 - PRE args for nfqws2 # $3 - PRE args for nfqws2
[ "$NOTEST_FAKE_HOSTFAKE_HTTPS" = 1 ] && { echo "SKIPPED"; return 0; }
local PAYLOAD="--payload=tls_client_hello" local PAYLOAD="--payload=tls_client_hello"
local FAKE="$FAKE_HTTPS" local FAKE="$FAKE_HTTPS"
@@ -101,6 +99,9 @@ pktws_check_https_tls12()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_FAKE_HOSTFAKE_HTTPS" = 1 ] && { echo "SKIPPED"; return 0; }
pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return pktws_check_https_tls "$1" "$2" && [ "$SCANLEVEL" != force ] && return
pktws_check_https_tls "$1" "$2" --lua-desync=wssize:wsize=1:scale=6 pktws_check_https_tls "$1" "$2" --lua-desync=wssize:wsize=1:scale=6
} }
@@ -109,5 +110,8 @@ pktws_check_https_tls13()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
[ "$NOTEST_FAKE_HOSTFAKE_HTTPS" = 1 ] && { echo "SKIPPED"; return 0; }
pktws_check_https_tls "$1" "$2" pktws_check_https_tls "$1" "$2"
} }