Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2025-12-06 03:26:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

config: luci: Fix merging longstr values (NFQWS_DESYNC_*)

Browse Source
This commit is contained in:
remittor
2024-10-25 14:04:12 +03:00
parent 5373d5dd2a
commit 7e901513c5
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -355,7 +355,11 @@ return baseclass.extend({
},
load: function() {
return uci.get('zapret', this.cfgsec, this.cfgparam);
let value = uci.get('zapret', this.cfgsec, this.cfgparam);
if (typeof(value) === 'string') {
return value.trim();
}
return value;
},
render: function(content) {
@@ -394,7 +398,9 @@ return baseclass.extend({
handleSave: function(ev) {
let txt = document.getElementById('widget.modal_content');
let value = txt.value.trim().replace(/\r\n/g, ' ').replace(/\r/g, ' ').replace(/\n/g, ' ').trim();
if (value == "") {
value = "\t";
}
uci.set('zapret', this.cfgsec, this.cfgparam, value);
uci.save();
let elem = document.getElementById("cbi-zapret-" + this.cfgsec + "-_" + this.cfgparam);

13
zapret/sync_config.sh
View File

@@ -7,6 +7,13 @@ ZAPRET_CONFIG="$ZAPRET_BASE/config"
ZAPRET_CONFIG_DEF="$ZAPRET_BASE/config.default"
ZAPRET_CFG=/etc/config/zapret
ZAPRET_CFG_SEC_NAME="$( uci -q get zapret.config )"
if [ -z "$ZAPRET_CFG_SEC_NAME" ]; then
# wrong uci-config
return 1
fi
function get_sed_compat
{
local str=$( ( echo $1|sed -r 's/([\$\.\*\/\[\\^])/\\\1/g'|sed 's/[]]/\\]/g' )>&1 )
@@ -51,9 +58,13 @@ function sync_param
{
local param=$1
local vtype=$2
local value=$( uci -q get zapret.@main[0].$param )
local value="$( uci -q get zapret.config.$param )"
uncomment_param $param
append_param $param
local TAB="$( echo -n -e '\t' )"
if [ "$value" = "$TAB" ]; then
value=""
fi
if [ "$vtype" = "str" ]; then
set_param_value_str $param "$value"
else

25
zapret/uci-def-cfg.sh
View File

@@ -19,6 +19,7 @@ CFG_OPT_SYNC_CFG=0
function set_default_values
{
local cfgname=${1:-$ZAPRET_CFG_NAME}
local TAB="$( echo -n -e '\t' )"
uci batch <<-EOF
set $cfgname.config.autostart='0'
set $cfgname.config.FWTYPE='nftables'
@@ -31,26 +32,26 @@ function set_default_values
set $cfgname.config.DESYNC_MARK='0x40000000'
set $cfgname.config.DESYNC_MARK_POSTNAT='0x20000000'
set $cfgname.config.NFQWS_OPT_DESYNC='--dpi-desync=fake,split2 --dpi-desync-ttl=7 --dpi-desync-ttl6=0 --dpi-desync-repeats=20 --dpi-desync-fooling=md5sig,badseq --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin'
set $cfgname.config.NFQWS_OPT_DESYNC_SUFFIX=''
set $cfgname.config.NFQWS_OPT_DESYNC_SUFFIX="$TAB"
set $cfgname.config.MODE_HTTP='1'
set $cfgname.config.MODE_HTTP_KEEPALIVE='0'
set $cfgname.config.HTTP_PORTS='80'
set $cfgname.config.NFQWS_OPT_DESYNC_HTTP=''
set $cfgname.config.NFQWS_OPT_DESYNC_HTTP_SUFFIX=''
set $cfgname.config.NFQWS_OPT_DESYNC_HTTP6=''
set $cfgname.config.NFQWS_OPT_DESYNC_HTTP6_SUFFIX=''
set $cfgname.config.NFQWS_OPT_DESYNC_HTTP="$TAB"
set $cfgname.config.NFQWS_OPT_DESYNC_HTTP_SUFFIX="$TAB"
set $cfgname.config.NFQWS_OPT_DESYNC_HTTP6="$TAB"
set $cfgname.config.NFQWS_OPT_DESYNC_HTTP6_SUFFIX="$TAB"
set $cfgname.config.MODE_HTTPS='1'
set $cfgname.config.HTTPS_PORTS='443'
set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS=''
set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS_SUFFIX=''
set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS6=''
set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS6_SUFFIX=''
set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS="$TAB"
set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS_SUFFIX="$TAB"
set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS6="$TAB"
set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS6_SUFFIX="$TAB"
set $cfgname.config.MODE_QUIC='1'
set $cfgname.config.QUIC_PORTS='443'
set $cfgname.config.NFQWS_OPT_DESYNC_QUIC='--dpi-desync=fake,split2 --dpi-desync-repeats=15 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin --new --dpi-desync=fake --dpi-desync-repeats=15'
set $cfgname.config.NFQWS_OPT_DESYNC_QUIC_SUFFIX=''
set $cfgname.config.NFQWS_OPT_DESYNC_QUIC6=''
set $cfgname.config.NFQWS_OPT_DESYNC_QUIC6_SUFFIX=''
set $cfgname.config.NFQWS_OPT_DESYNC_QUIC_SUFFIX="$TAB"
set $cfgname.config.NFQWS_OPT_DESYNC_QUIC6="$TAB"
set $cfgname.config.NFQWS_OPT_DESYNC_QUIC6_SUFFIX="$TAB"
commit $cfgname
EOF
return 0