Bump version to v68-20241110

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     tags:
-      - '*'
+      - v[0-9]+*
 
 jobs:
   check:
@@ -63,6 +63,7 @@ jobs:
     #if: needs.check.outputs.is_active == 'true'
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         #branch: [ openwrt-22.03, openwrt-23.05 ]
         branch: [ openwrt-23.05 ]
@@ -111,6 +112,17 @@ jobs:
           repository: 'remittor/zapret-openwrt'
           path: zapret-openwrt
 
+      - name: Setup OpenWrt SDK
+        if: ${{ matrix.branch == 'openwrt-23.05' || matrix.branch == 'SNAPSHOT' }}
+        working-directory: /builder
+        shell: bash
+        run: |
+          # gpg --verbose --recv-keys 0x1D53D1877742E911
+          gpg --verbose --import <(wget -qO- 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=gpg/0x1D53D1877742E911.asc')
+          sed -r -i 's/^rm.+//' setup.sh
+          ./setup.sh
+          ls -lh
+
       - name: Setup ccache
         uses: actions/cache@v4
         with:
@@ -132,8 +144,8 @@ jobs:
         shell: bash
         run: |
           #export PKG_VERSION=$(date --utc -d $DATE +%Y%m%d)
-          #find $GITHUB_WORKSPACE/zapret-openwrt -type d -path '*/package/zapret' -exec cp -r {} ./package \;
-          cp -r $GITHUB_WORKSPACE/zapret-openwrt ./package/zapret-openwrt/
+          #find $GITHUB_WORKSPACE/zapret-openwrt -type d -path '*/package/zapret' -exec cp -vr {} ./package \;
+          cp -vr $GITHUB_WORKSPACE/zapret-openwrt ./package/zapret-openwrt/
           
           mv feeds.conf.default feeds.conf
           sed -i -e 's|base.*\.git|base https://github.com/openwrt/openwrt.git|' feeds.conf

luci-app-zapret/Makefile

@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-zapret
-PKG_RELEASE:=20241030
-PKG_VERSION:=67-$(PKG_RELEASE)
+PKG_RELEASE:=20241110
+PKG_VERSION:=68-$(PKG_RELEASE)
 PKG_LICENSE:=MIT
 
 LUCI_TITLE:=LuCI support for zapret

luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js

@@ -160,10 +160,25 @@ return baseclass.extend({
         }        
         let plist = this.get_pid_list(proc_list.stdout);
         
-        let jdata = JSON.parse(svc_info.stdout);
-        if (typeof(jdata) !== 'object') {
+        if (plist.length < 4) {
             return -3;
         }
+        if (typeof(svc_info.stdout) !== 'string') {
+            return -4;
+        }
+        if (svc_info.stdout.length < 3) {
+            return -5;
+        }
+        let jdata;
+        try {
+            jdata = JSON.parse(svc_info.stdout);
+        } catch (e) {
+            console.log('Incorrect JSON: ' + svc_info.stdout);
+            return -6;
+        }
+        if (typeof(jdata) !== 'object') {
+            return -7;
+        }
         if (typeof(jdata.zapret) == 'object') {
             result.dmn.inited = true;
             let dmn_list = jdata.zapret.instances;

zapret-ip2net/Makefile

@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-ip2net
-PKG_VERSION:=67
-PKG_RELEASE:=20241030
+PKG_VERSION:=68
+PKG_RELEASE:=20241110
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +10,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f22dcb24877ec9fe6be63ce3cf64d5433a3061b3
-PKG_SOURCE_DATE:=2024-10-30
+PKG_SOURCE_VERSION:=41b4c6650b13707654066b5af007d531dd348286
+PKG_SOURCE_DATE:=2024-11-10
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret-mdig/Makefile

@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-mdig
-PKG_VERSION:=67
-PKG_RELEASE:=20241030
+PKG_VERSION:=68
+PKG_RELEASE:=20241110
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +10,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f22dcb24877ec9fe6be63ce3cf64d5433a3061b3
-PKG_SOURCE_DATE:=2024-10-30
+PKG_SOURCE_VERSION:=41b4c6650b13707654066b5af007d531dd348286
+PKG_SOURCE_DATE:=2024-11-10
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret-tpws/Makefile

@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-tpws
-PKG_VERSION:=67
-PKG_RELEASE:=20241030
+PKG_VERSION:=68
+PKG_RELEASE:=20241110
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +10,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f22dcb24877ec9fe6be63ce3cf64d5433a3061b3
-PKG_SOURCE_DATE:=2024-10-30
+PKG_SOURCE_VERSION:=41b4c6650b13707654066b5af007d531dd348286
+PKG_SOURCE_DATE:=2024-11-10
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret/Makefile

@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
-PKG_VERSION:=67
-PKG_RELEASE:=20241030
+PKG_VERSION:=68
+PKG_RELEASE:=20241110
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -14,8 +14,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f22dcb24877ec9fe6be63ce3cf64d5433a3061b3
-PKG_SOURCE_DATE:=2024-10-30
+PKG_SOURCE_VERSION:=41b4c6650b13707654066b5af007d531dd348286
+PKG_SOURCE_DATE:=2024-11-10
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret/config.default

@@ -93,7 +93,7 @@ NFQWS_PORTS_UDP_KEEPALIVE=0
 # use <HOSTLIST> and <HOSTLIST_NOAUTO> placeholders to engage standard hostlists and autohostlist in ipset dir
 # hostlist markers are replaced to empty string if MODE_FILTER does not satisfy
 # <HOSTLIST_NOAUTO> appends ipset/zapret-hosts-auto.txt as normal list
-NFQWS_OPT="--filter-tcp=80 <HOSTLIST> --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new --filter-tcp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt --dpi-desync=fake,split2 --dpi-desync-repeats=11 --dpi-desync-fooling=md5sig --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin --new --filter-udp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt --dpi-desync=fake --dpi-desync-repeats=11 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin --new --filter-udp=443 <HOSTLIST_NOAUTO> --dpi-desync=fake --dpi-desync-repeats=11 --new <HOSTLIST> --dpi-desync=fake,disorder2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig"
+NFQWS_OPT="--filter-tcp=80 <HOSTLIST> --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new --filter-tcp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt --dpi-desync=fake,split2 --dpi-desync-repeats=11 --dpi-desync-fooling=md5sig --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin --new --filter-udp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt --dpi-desync=fake --dpi-desync-repeats=11 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin --new --filter-udp=443 <HOSTLIST_NOAUTO> --dpi-desync=fake --dpi-desync-repeats=11 --new --filter-tcp=80,443 <HOSTLIST> --dpi-desync=fake,disorder2 --dpi-desync-repeats=6 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig"
 
 
 # FlowOffload mode : donttouch,none,software,hardware

zapret/uci-def-cfg.sh

@@ -68,8 +68,9 @@ function set_default_values
 			--dpi-desync=fake
 			--dpi-desync-repeats=11
 			--new
-			<HOSTLIST>
+			--filter-tcp=80,443 <HOSTLIST>
 			--dpi-desync=fake,disorder2
+			--dpi-desync-repeats=6
 			--dpi-desync-autottl=2
 			--dpi-desync-fooling=md5sig
 		"