mirror of
https://github.com/remittor/zapret-openwrt.git
synced 2026-01-27 12:50:35 +03:00
Compare commits
8 Commits
v0.8.20260
...
v0.8.20260
| Author | SHA1 | Date | |
|---|---|---|---|
|
1f89151fe5 | ||
|
|
3ff8c4d746 | ||
|
|
db1833e93c | ||
|
|
6a50fb9708 | ||
|
|
8eb054f2f9 | ||
|
|
26d88c1efc | ||
|
|
1cef4d7db9 | ||
|
|
0aaee0ad36 |
@@ -5,7 +5,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-zapret2
|
||||
PKG_VERSION:=0.8.20260118
|
||||
PKG_VERSION:=0.8.20260125
|
||||
PKG_RELEASE:=1
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_MAINTAINER:=remittor <https://github.com/remittor>
|
||||
|
||||
@@ -23,9 +23,17 @@ return baseclass.extend({
|
||||
this.logArea.scrollTop = this.logArea.scrollHeight;
|
||||
},
|
||||
|
||||
setBtnMode: function(check1, check2, cancel)
|
||||
{
|
||||
this.btn_dpicheck.disabled = check1 ? false : true;
|
||||
this.btn_sitescheck.disabled = check2 ? false : true;
|
||||
this.btn_cancel.disabled = cancel ? false : true;
|
||||
},
|
||||
|
||||
dpiCheck: async function()
|
||||
{
|
||||
this._action = 'dpiCheck';
|
||||
this.setBtnMode(0, 0, 0);
|
||||
this.appendLog('DPI check [tcp 16-20]...');
|
||||
this.appendLog('Original sources: https://github.com/hyperion-cs/dpi-checkers');
|
||||
this.appendLog('WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/');
|
||||
@@ -36,19 +44,42 @@ return baseclass.extend({
|
||||
cmd.push(...[ '-d', dns_ip.trim() ]);
|
||||
}
|
||||
cmd.push('-R'); // show recommendations
|
||||
let log = '/tmp/'+tools.appName+'_dwc.log';
|
||||
let callback = this.execAndReadCallback;
|
||||
let wnd = this;
|
||||
return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
|
||||
return tools.execAndRead({
|
||||
cmd: cmd,
|
||||
log: '/tmp/'+tools.appName+'_dwc.log',
|
||||
logArea: this.logArea,
|
||||
callback: this.execAndReadCallback,
|
||||
cbarg: this, // wnd
|
||||
});
|
||||
},
|
||||
|
||||
sitesCheck: async function()
|
||||
{
|
||||
this._action = 'dpiCheck';
|
||||
this.setBtnMode(0, 0, 0);
|
||||
this.appendLog('Sites check...');
|
||||
let cmd = [ fn_dwc_sh ];
|
||||
let resolve_dns = document.getElementById('cfg_resolve_dns');
|
||||
let dns_ip = resolve_dns.options[resolve_dns.selectedIndex].text;
|
||||
if (dns_ip && dns_ip != 'default') {
|
||||
cmd.push(...[ '-d', dns_ip.trim() ]);
|
||||
}
|
||||
cmd.push('-s'); // mode: check sites
|
||||
return tools.execAndRead({
|
||||
cmd: cmd,
|
||||
log: '/tmp/'+tools.appName+'_dwc.log',
|
||||
logArea: this.logArea,
|
||||
callback: this.execAndReadCallback,
|
||||
cbarg: this, // wnd
|
||||
});
|
||||
},
|
||||
|
||||
execAndReadCallback: function(wnd, rc, txt = '')
|
||||
{
|
||||
wnd.setBtnMode(1, 1, 1);
|
||||
if (rc == 0 && txt) {
|
||||
if (wnd._action == 'dpiCheck') {
|
||||
wnd.appendLog('=========================================================');
|
||||
return;
|
||||
}
|
||||
wnd.appendLog('=========================================================');
|
||||
return;
|
||||
}
|
||||
if (rc >= 500) {
|
||||
if (txt) {
|
||||
@@ -111,8 +142,15 @@ return baseclass.extend({
|
||||
'id': 'btn_dpicheck',
|
||||
'name': 'btn_dpicheck',
|
||||
'class': btn_style_action,
|
||||
}, _('DPI check [tcp 16-20]'));
|
||||
this.btn_dpicheck.onclick = ui.createHandlerFn(this, () => { this.dpiCheck() });
|
||||
}, _('DPI check'));
|
||||
this.btn_dpicheck.onclick = ui.createHandlerFn(this, this.dpiCheck);
|
||||
|
||||
this.btn_sitescheck = E('button', {
|
||||
'id': 'btn_sitescheck',
|
||||
'name': 'btn_sitescheck',
|
||||
'class': btn_style_action,
|
||||
}, _('Sites check'));
|
||||
this.btn_sitescheck.onclick = ui.createHandlerFn(this, this.sitesCheck);
|
||||
|
||||
ui.showModal(_('Diagnostics'), [
|
||||
E('div', { 'class': 'cbi-section' }, [
|
||||
@@ -121,6 +159,8 @@ return baseclass.extend({
|
||||
this.logArea,
|
||||
]),
|
||||
E('div', { 'class': 'right' }, [
|
||||
this.btn_sitescheck,
|
||||
' ',
|
||||
this.btn_dpicheck,
|
||||
' ',
|
||||
this.btn_cancel,
|
||||
|
||||
@@ -18,14 +18,14 @@ const btn_style_success = 'btn cbi-button-success important';
|
||||
return view.extend({
|
||||
get_svc_buttons: function(elems = { }) {
|
||||
return {
|
||||
enable : elems.btn_enable || document.getElementById('btn_enable'),
|
||||
disable : elems.btn_disable || document.getElementById('btn_disable'),
|
||||
start : elems.btn_start || document.getElementById('btn_start'),
|
||||
restart : elems.btn_restart || document.getElementById('btn_restart'),
|
||||
stop : elems.btn_stop || document.getElementById('btn_stop'),
|
||||
reset : elems.btn_reset || document.getElementById('btn_reset'),
|
||||
diag : elems.btn_diag || document.getElementById('btn_diag'),
|
||||
update : elems.btn_update || document.getElementById('btn_update'),
|
||||
"enable" : elems.btn_enable || document.getElementById('btn_enable'),
|
||||
"disable" : elems.btn_disable || document.getElementById('btn_disable'),
|
||||
"start" : elems.btn_start || document.getElementById('btn_start'),
|
||||
"restart" : elems.btn_restart || document.getElementById('btn_restart'),
|
||||
"stop" : elems.btn_stop || document.getElementById('btn_stop'),
|
||||
"reset" : elems.btn_reset || document.getElementById('btn_reset'),
|
||||
"diag" : elems.btn_diag || document.getElementById('btn_diag'),
|
||||
"update" : elems.btn_update || document.getElementById('btn_update'),
|
||||
};
|
||||
},
|
||||
|
||||
|
||||
@@ -102,9 +102,11 @@ return baseclass.extend({
|
||||
}
|
||||
let pkg_url = txt.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m);
|
||||
if (code && pkg_url) {
|
||||
if (code[1] == 'E' && !wnd.forced_reinstall) {
|
||||
wnd.setStage(0); // install not needed
|
||||
return;
|
||||
if (!wnd.forced_reinstall) {
|
||||
if (code[1] == 'E' || code[1] == 'G') {
|
||||
wnd.setStage(0); // install not needed
|
||||
return;
|
||||
}
|
||||
}
|
||||
wnd.pkg_url = pkg_url[1];
|
||||
wnd.setStage(2); // enable all buttons
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=zapret2
|
||||
PKG_VERSION:=0.8.20260118
|
||||
PKG_VERSION:=0.8.20260125
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_MAINTAINER:=bol-van
|
||||
@@ -14,8 +14,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
|
||||
|
||||
PKG_SOURCE_URL:=https://github.com/bol-van/zapret2.git
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_VERSION:=8e67260a23deeaa14b9de325bb911e5594b2d225
|
||||
PKG_SOURCE_DATE:=2026-01-18
|
||||
PKG_SOURCE_VERSION:=8b11d6c279c737bf78496d04c0261bd3e2c4327f
|
||||
PKG_SOURCE_DATE:=2026-01-25
|
||||
|
||||
#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
#PKG_SOURCE_URL:=https://github.com/bol-van/zapret2/archive/refs/tags/v$(PKG_VERSION).tar.gz?
|
||||
@@ -30,7 +30,7 @@ ifeq ($(LUA_JIT),1)
|
||||
LUA_INCLUDE:=-I$(STAGING_DIR)/usr/include/luajit-$(LUAJIT_VER)
|
||||
LUA_LIBRARY:=-L$(STAGING_DIR)/usr/lib -lluajit-$(LUA_VER)
|
||||
else
|
||||
LUA_VER?=5.3
|
||||
LUA_VER?=5.5
|
||||
LUA_DEPEND:=lua$(LUA_VER)
|
||||
LUA_INCLUDE:=-I$(STAGING_DIR)/usr/include/lua$(LUA_VER)
|
||||
LUA_LIBRARY:=-L$(STAGING_DIR)/usr/lib -llua$(LUA_VER)
|
||||
@@ -251,6 +251,10 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
|
||||
chmod 644 $${ZAPRET_DIR}/ipset_def/*.txt >/dev/null 2>&1
|
||||
chmod 644 $${ZAPRET_DIR}/init.d/openwrt/custom.d/*.sh >/dev/null 2>&1
|
||||
chmod 644 $${ZAPRET_DIR}/config* >/dev/null 2>&1
|
||||
# cleanup custom.d directory
|
||||
rm -f $${ZAPRET_DIR}/init.d/openwrt/custom.d/*-opkg*
|
||||
rm -f $${ZAPRET_DIR}/init.d/openwrt/custom.d/*.opkg*
|
||||
rm -f $${ZAPRET_DIR}/init.d/openwrt/custom.d/*.apk*
|
||||
# creating main config if its not exists
|
||||
if [ ! -f "$${ZAPRET_CONFIG}" ]; then
|
||||
cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
|
||||
|
||||
@@ -193,6 +193,9 @@ function init_before_start
|
||||
[ ! -f "$HOSTLIST_FN" ] && touch "$HOSTLIST_FN"
|
||||
chmod 644 $ZAPRET_BASE/ipset/*.txt
|
||||
chmod 666 $ZAPRET_BASE/ipset/*.log
|
||||
rm -f $ZAPRET_BASE/init.d/openwrt/custom.d/*-opkg*
|
||||
rm -f $ZAPRET_BASE/init.d/openwrt/custom.d/*.opkg*
|
||||
rm -f $ZAPRET_BASE/init.d/openwrt/custom.d/*.apk*
|
||||
rm -f /tmp/$ZAPRET_CFG_NAME+*.log
|
||||
#*/
|
||||
if [ "$DAEMON_LOG_ENABLE" = "1" ]; then
|
||||
|
||||
@@ -80,7 +80,7 @@ function set_cfg_nfqws_strat
|
||||
set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
|
||||
set $cfgname.config.NFQWS2_PORTS_UDP='443'
|
||||
set $cfgname.config.NFQWS2_OPT="
|
||||
# Strategy $strat
|
||||
--comment=Strategy__$strat
|
||||
|
||||
--filter-tcp=80
|
||||
--filter-l7=http <HOSTLIST>
|
||||
@@ -109,7 +109,7 @@ function set_cfg_nfqws_strat
|
||||
set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
|
||||
set $cfgname.config.NFQWS2_PORTS_UDP='443'
|
||||
set $cfgname.config.NFQWS2_OPT="
|
||||
# Strategy $strat
|
||||
--comment=Strategy__$strat
|
||||
|
||||
--filter-tcp=80
|
||||
--filter-l7=http <HOSTLIST>
|
||||
@@ -136,7 +136,7 @@ function set_cfg_nfqws_strat
|
||||
set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
|
||||
set $cfgname.config.NFQWS2_PORTS_UDP='443'
|
||||
set $cfgname.config.NFQWS2_OPT="
|
||||
# Strategy $strat
|
||||
--comment=Strategy__$strat
|
||||
|
||||
--filter-tcp=80
|
||||
--filter-l7=http <HOSTLIST>
|
||||
|
||||
100
zapret2/dwc.sh
100
zapret2/dwc.sh
@@ -3,13 +3,15 @@
|
||||
|
||||
ZAP_TMP_DIR=/tmp/zapret2_dwc
|
||||
|
||||
opt_sites=
|
||||
opt_dig=
|
||||
opt_recom=
|
||||
opt_tmp_dir=
|
||||
opt_test=
|
||||
|
||||
while getopts "d:RT:t" opt; do
|
||||
while getopts "sd:RT:t" opt; do
|
||||
case $opt in
|
||||
s) opt_sites="true";;
|
||||
d) opt_dig="$OPTARG";;
|
||||
R) opt_recom="true";; # Recommendations
|
||||
T) opt_tmp_dir="$OPTARG";;
|
||||
@@ -25,7 +27,7 @@ TARGET_LIST_FILE="$ZAP_TMP_DIR/targets"
|
||||
[ -f "$TARGET_LIST_FILE" ] && exit 3
|
||||
|
||||
CURL_TIMEOUT=5
|
||||
CURL_RANGETO=65535
|
||||
CURL_MAXBODY=65536
|
||||
CURL_NOCACHE='cache-control: no-cache'
|
||||
CURL_NOCACHE2='pragma: no-cache'
|
||||
CURL_USERAGENT='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36'
|
||||
@@ -67,7 +69,7 @@ fi
|
||||
#echo 'Original sources: https://github.com/hyperion-cs/dpi-checkers'
|
||||
#echo 'WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/'
|
||||
|
||||
TEST_SUITE='[
|
||||
TEST_SUITE='
|
||||
{ id: "US.CF-01", provider: "🇺🇸 Cloudflare", times: 1, url: "https://img.wzstats.gg/cleaver/gunFullDisplay" },
|
||||
{ id: "US.CF-02", provider: "🇺🇸 Cloudflare", times: 1, url: "https://genshin.jmp.blue/characters/all#" },
|
||||
{ id: "US.CF-03", provider: "🇺🇸 Cloudflare", times: 1, url: "https://api.frankfurter.dev/v1/2000-01-01..2002-12-31" },
|
||||
@@ -76,7 +78,7 @@ TEST_SUITE='[
|
||||
{ id: "DE.HE-01", provider: "🇩🇪 Hetzner", times: 1, url: "https://j.dejure.org/jcg/doctrine/doctrine_banner.webp" },
|
||||
{ id: "DE.HE-02", provider: "🇩🇪 Hetzner", times: 1, url: "https://maps.gnosis.earth/ogcapi/api/swagger-ui/swagger-ui-standalone-preset.js#" },
|
||||
{ id: "FI.HE-01", provider: "🇫🇮 Hetzner", times: 1, url: "https://251b5cd9.nip.io/1MB.bin" },
|
||||
{ id: "FI.HE-02", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8c176.nip.io/1MB.bin" },
|
||||
{ id: "FI.HE-02", provider: "🇫🇮 Hetzner", times: 1, url: "https://nioges.com/libs/fontawesome/webfonts/fa-solid-900.woff2" },
|
||||
{ id: "FI.HE-03", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8bdae.nip.io/1MB.bin" },
|
||||
{ id: "FI.HE-04", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8bca5.nip.io/1MB.bin" },
|
||||
{ id: "FR.OVH-01", provider: "🇫🇷 OVH", times: 1, url: "https://eu.api.ovh.com/console/rapidoc-min.js" },
|
||||
@@ -93,7 +95,38 @@ TEST_SUITE='[
|
||||
{ id: "FR.CNTB-01", provider: "🇫🇷 Contabo", times: 1, url: "https://airsea.no/images/main_logo.png" },
|
||||
{ id: "NL.SW-01", provider: "🇳🇱 Scaleway", times: 1, url: "https://www.velivole.fr/img/header.jpg" },
|
||||
{ id: "US.CNST-01", provider: "🇺🇸 Constant", times: 1, url: "https://cdn.xuansiwei.com/common/lib/font-awesome/4.7.0/fontawesome-webfont.woff2?v=4.7.0" }
|
||||
]'
|
||||
'
|
||||
|
||||
if [ "$opt_sites" = true ]; then
|
||||
TEST_SUITE='
|
||||
gosuslugi.ru | @ | 40000 | https://gosuslugi.ru/__jsch/static/script.js
|
||||
esia.gosuslugi.ru | @ | 40000 | https://esia.gosuslugi.ru/__jsch/static/script.js
|
||||
gu-st.ru | | | https://gu-st.ru/portal-st/lib-assets/fonts/Lato-Regular-v3.woff2
|
||||
nalog.ru | | | https://data.nalog.ru/images/new/buttons/TSET-button.png
|
||||
lkfl2.nalog.ru | | | https://lkfl2.nalog.ru/lkfl/static/assets/main-desktop-1920-CvJsHANg.jpg
|
||||
rutube.ru | @ | 40000 | https://static.rutube.ru/static/wdp/fonts/Semibold/OpenSans-Semibold.woff2?20231026
|
||||
youtube.com | @# | 300000 | https://youtube.com
|
||||
instagram.com | @# | 300000 | https://instagram.com
|
||||
rutracker.org | @# | 80000 | https://rutracker.org
|
||||
nnmclub.to | @# | 120000 | https://nnmclub.to
|
||||
rutor.info | @# | 110000 | https://rutor.info
|
||||
epidemz.net.co | @# | 40000 | https://epidemz.net.co
|
||||
filmix.my | @ | 23000 | https://filmix.my/templates/Filmix/media/fonts/Roboto/roboto-v20-latin_cyrillic-italic.woff2
|
||||
openwrt.org | + | 60000 | https://openwrt.org/lib/tpl/bootstrap3/assets/bootstrap/default/bootstrap.min.css
|
||||
ntc.party | @# | 200000 | https://ntc.party
|
||||
sxyprn.net | @# | 310000 | https://sxyprn.net
|
||||
pornhub.com | @# | 700000 | https://pornhub.com
|
||||
spankbang.com | @# | 80000 | https://spankbang.com
|
||||
discord.com | @# | 120000 | https://discord.com
|
||||
x.com | @ | 39000 | https://abs.twimg.com/fonts/v1/chirp-extended-heavy-web.woff2
|
||||
flightradar24.com | @ | 100000 | https://www.flightradar24.com/mobile/airlines?format=2&version=0
|
||||
cdn77.com | @ | 24000 | https://cdn77.com/fonts/Eina01-Regular.woff2
|
||||
play.google.com | @# | 100000 | https://gstatic.com/feedback/js/help/prod/service/lazy.min.js
|
||||
genderize.io | @# | 210000 | https://genderize.io
|
||||
ottai.com | @ | 70000 | https://seas.static.ottai.com/ottai-website/public/images/new/home/banner/uk/banner.webp
|
||||
'
|
||||
CURL_TIMEOUT=7
|
||||
fi
|
||||
|
||||
function trim
|
||||
{
|
||||
@@ -105,6 +138,17 @@ mkdir -p "$ZAP_TMP_DIR"
|
||||
: > "$TARGET_LIST_FILE"
|
||||
IDX=0
|
||||
while IFS= read -r line; do
|
||||
if [ "$opt_sites" = true ]; then
|
||||
echo -n "$line" | grep -q ' | http' || continue
|
||||
IDX=$((IDX + 1))
|
||||
TAG=$( printf '%s\n' "$line" | cut -d'|' -f1 | awk '{$1=$1;print}' )
|
||||
FLAGS=$( printf '%s\n' "$line" | cut -d'|' -f2 | awk '{$1=$1;print}' )
|
||||
TSIZE=$( printf '%s\n' "$line" | cut -d'|' -f3 | awk '{$1=$1;print}' )
|
||||
URL=$( printf '%s\n' "$line" | cut -d'|' -f4 | awk '{$1=$1;print}' )
|
||||
COUNTRY="XX"
|
||||
echo "${IDX}|${TAG}|${COUNTRY}|${FLAGS}|${TSIZE}|${URL}" >> "$TARGET_LIST_FILE"
|
||||
continue
|
||||
fi
|
||||
case "$line" in
|
||||
*id:*provider:*url:*)
|
||||
IDX=$((IDX + 1))
|
||||
@@ -127,10 +171,31 @@ CURL_SPEED_LIMIT=1
|
||||
|
||||
while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
|
||||
[ -z "$TAG" ] && continue
|
||||
ID=$((ID+1))
|
||||
ID3=$( printf '%03d' "$ID" )
|
||||
COUNTRY=$( echo "$TAG" | cut -d. -f1 )
|
||||
CNTFLAG=$( echo "$PROVIDER" | awk '{print $1}' )
|
||||
RANGETO=""
|
||||
REDIRECT=""
|
||||
USERAGENT="$CURL_USERAGENT"
|
||||
if [ "$opt_sites" = true ]; then
|
||||
FLAGS="$PROVIDER"
|
||||
TSIZE="$TIMES"
|
||||
[ "$TSIZE" = "" ] && TSIZE=$CURL_MAXBODY
|
||||
if echo "$FLAGS" | grep -q '@'; then
|
||||
RANGETO=""
|
||||
else
|
||||
RANGETO="--range 0-$((TSIZE - 1))"
|
||||
fi
|
||||
PROVIDER="$TSIZE"
|
||||
if echo "$FLAGS" | grep -q '#'; then
|
||||
REDIRECT="-L"
|
||||
fi
|
||||
if echo "$FLAGS" | grep -q '+'; then
|
||||
USERAGENT="curl/8.12"
|
||||
fi
|
||||
else
|
||||
RANGETO="--range 0-$((CURL_MAXBODY - 1))"
|
||||
COUNTRY=$( echo "$TAG" | cut -d. -f1 )
|
||||
CNTFLAG=$( echo "$PROVIDER" | awk '{print $1}' )
|
||||
fi
|
||||
URL_NO_PROTO="${URL#*://}"
|
||||
DOMAIN="${URL_NO_PROTO%%/*}"
|
||||
URLPATH="/${URL_NO_PROTO#*/}"
|
||||
@@ -157,12 +222,13 @@ while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
|
||||
echo "$URL" > "$FNAME.url"
|
||||
curl "$URL" \
|
||||
$RESOLVE_OPT \
|
||||
$REDIRECT \
|
||||
--connect-timeout $CURL_CON_TIMEOUT \
|
||||
--max-time $CURL_TIMEOUT \
|
||||
--speed-time $CURL_SPEED_TIME \
|
||||
--speed-limit $CURL_SPEED_LIMIT \
|
||||
--range 0-$CURL_RANGETO \
|
||||
-A "$CURL_USERAGENT" \
|
||||
$RANGETO \
|
||||
-A "$USERAGENT" \
|
||||
-D "$FNAME.hdr" \
|
||||
-o "$FNAME.body"
|
||||
) > "$FNAME.log" 2>&1 &
|
||||
@@ -181,6 +247,8 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
|
||||
TAG=$( echo "$FILENAME" | cut -d= -f2)
|
||||
PROVIDER=$(echo "$FILENAME" | cut -d= -f3 )
|
||||
FNAME="$ZAP_TMP_DIR/$FILENAME"
|
||||
REQ_SIZE=$CURL_MAXBODY
|
||||
[ "$opt_sites" = true ] && REQ_SIZE="$PROVIDER"
|
||||
BODY_SIZE=0
|
||||
[ -f "$FNAME.body" ] && BODY_SIZE=$( wc -c < "$FNAME.body" )
|
||||
IPADDR="x.x.x.x"
|
||||
@@ -196,7 +264,7 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
|
||||
elif [ ! -s "$FNAME.body" ]; then
|
||||
status="Possibly detected"
|
||||
else
|
||||
if [ "$BODY_SIZE" -le $CURL_RANGETO ]; then
|
||||
if [ $BODY_SIZE -lt $REQ_SIZE ]; then
|
||||
status="Failed (recv $BODY_SIZE bytes)"
|
||||
res=5
|
||||
else
|
||||
@@ -204,7 +272,11 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
|
||||
res=100
|
||||
fi
|
||||
fi
|
||||
printf '%12s / %-15s / %-13s: %s \n' "$TAG" "$IPADDR" "$PROVIDER" "$status"
|
||||
if [ "$opt_sites" = true ]; then
|
||||
printf '%18s / %-15s : %s \n' "$TAG" "$IPADDR" "$status"
|
||||
else
|
||||
printf '%12s / %-15s / %-13s: %s \n' "$TAG" "$IPADDR" "$PROVIDER" "$status"
|
||||
fi
|
||||
echo "$BODY_SIZE" > "$FNAME.size"
|
||||
if [ $res != 100 ]; then
|
||||
URL=$( cat "$FNAME.url" )
|
||||
@@ -212,7 +284,9 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
|
||||
fi
|
||||
done
|
||||
|
||||
rm -f "$ZAP_TMP_DIR"/*.body >/dev/null 2>&1
|
||||
if [ "$opt_test" != true ]; then
|
||||
rm -f "$ZAP_TMP_DIR"/*.body >/dev/null 2>&1
|
||||
fi
|
||||
|
||||
[ "$opt_recom" != "true" ] && return 0
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ fe80::/10
|
||||
nalog.ru
|
||||
gstatic.com
|
||||
gosuslugi.ru
|
||||
mos.ru
|
||||
mos-gorsud.ru
|
||||
gov.ru
|
||||
sudrf.ru
|
||||
@@ -284,4 +285,42 @@ huaweicloud-dns.cn
|
||||
huaweicloud-dns.ru
|
||||
huaweicloud-dns.com
|
||||
huaweicloud-dns.org
|
||||
#################################### Okko
|
||||
okko.tv
|
||||
playfamily.ru
|
||||
#################################### Beeline
|
||||
beeline.ru
|
||||
beeline.tv
|
||||
#################################### Delta Force
|
||||
volces.com
|
||||
wetest.net
|
||||
intlgame.com
|
||||
fleetlogd.com
|
||||
dgameglobal.com
|
||||
tdatamaster.com
|
||||
playdeltaforce.com
|
||||
quovadisglobal.com
|
||||
jupiterlauncher.com
|
||||
anticheatexpert.com
|
||||
#################################### Microsoft
|
||||
live.com
|
||||
lync.com
|
||||
skype.com
|
||||
microsoft
|
||||
msauth.net
|
||||
office.net
|
||||
office.com
|
||||
msocdn.com
|
||||
mojang.com
|
||||
windows.net
|
||||
msftauth.net
|
||||
xboxlive.com
|
||||
microsoft.com
|
||||
office365.com
|
||||
azureedge.net
|
||||
skypeassets.com
|
||||
windowsupdate.com
|
||||
microsoftonline.com
|
||||
microsoftonline-p.com
|
||||
minecraftservices.com
|
||||
####################################
|
||||
|
||||
Reference in New Issue
Block a user