From dffbe9739074f98f6174d40b7406d6c93d9f7e09 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 08:46:36 +0800 Subject: [PATCH] update 2023-02-10 08:46:36 --- .../root/etc/mosdns/rule/geosite_no_cn.txt | 6 ++++++ luci-app-openclash/root/etc/init.d/openclash | 4 ++-- luci-app-passwall/Makefile | 2 +- .../luasrc/view/passwall/rule/rule_version.htm | 2 +- .../root/usr/share/passwall/rule_update.lua | 16 +++++----------- luci-app-passwall2/Makefile | 2 +- .../luasrc/view/passwall2/rule/rule_version.htm | 2 +- .../root/usr/share/passwall2/rule_update.lua | 10 +++++----- luci-app-ssr-plus/Makefile | 2 +- .../model/cbi/shadowsocksr/client-config.lua | 14 ++++++++++---- .../luasrc/view/shadowsocksr/ssrurl.htm | 1 + .../root/etc/uci-defaults/luci-ssr-plus | 1 + .../root/usr/share/shadowsocksr/subscribe.lua | 1 + 13 files changed, 36 insertions(+), 27 deletions(-) diff --git a/luci-app-mosdns/root/etc/mosdns/rule/geosite_no_cn.txt b/luci-app-mosdns/root/etc/mosdns/rule/geosite_no_cn.txt index 69954fbd..2aea9239 100644 --- a/luci-app-mosdns/root/etc/mosdns/rule/geosite_no_cn.txt +++ b/luci-app-mosdns/root/etc/mosdns/rule/geosite_no_cn.txt @@ -20432,6 +20432,7 @@ nitter.tedomum.net niu.moe niu95992.com niubowang.com +niuc2.com niusnews.com niuxuewang.com nivod.tv @@ -21468,6 +21469,8 @@ patelbrothersusa.com patentgold.net patenttruth.org patreon.com +patreoncommunity.com +patreonusercontent.com patriademarti.com patrickemaher.com paulsimon-music.com @@ -25201,6 +25204,7 @@ springboardplatform.com springer.com springerlink.com springernature.com +springwood.me sprinklesapp.com sprint.com sprint0.net @@ -34194,6 +34198,7 @@ yong9191.com yoplay.com yoshisnewisland.com you-get.org +you.com you2be.wzfou.me youassporn.com youav.com @@ -34893,6 +34898,7 @@ full:licdn.cn.cdn20.com full:linear-abematv.akamaized.net full:link.theplatform.com full:linkedin.sc.omtrdc.net +full:live-patreon-marketing.pantheonsite.io full:lolstatic-a.akamaihd.net full:mdn.mozillademos.org full:media-rockstargames-com.akamaized.net diff --git a/luci-app-openclash/root/etc/init.d/openclash b/luci-app-openclash/root/etc/init.d/openclash index cf15cc4e..7355c5fa 100644 --- a/luci-app-openclash/root/etc/init.d/openclash +++ b/luci-app-openclash/root/etc/init.d/openclash @@ -1565,7 +1565,7 @@ if [ -n "$FW4" ]; then ip link set utun up LOG_OUT "Tip: Waiting for TUN Interface Start..." - while ( [ -n "$(pidof clash)" ] && [ -z "$(ip route list |grep utun)" ] && [ "$TUN_WAIT" -le 10 ] ) + while ( [ -n "$(pidof clash)" ] && [ -z "$(ip route list |grep utun)" ] && [ "$TUN_WAIT" -le 30 ] ) do ip link set utun up let TUN_WAIT++ @@ -2238,7 +2238,7 @@ else ip link set utun up LOG_OUT "Tip: Waiting for TUN Interface Start..." - while ( [ -n "$(pidof clash)" ] && [ -z "$(ip route list |grep utun)" ] && [ "$TUN_WAIT" -le 10 ] ) + while ( [ -n "$(pidof clash)" ] && [ -z "$(ip route list |grep utun)" ] && [ "$TUN_WAIT" -le 30 ] ) do ip link set utun up let TUN_WAIT++ diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index e78191a6..9f01f8d8 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=4.58 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm b/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm index c0256c71..dec512c9 100644 --- a/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm +++ b/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm @@ -25,7 +25,7 @@ local geosite_update = api.uci_get_type("global_rules", "geosite_update", "1") = } } XHR.get('<%=api.url("update_rules")%>', { - update: checkBoxList + update: checkBoxList.join(",") }, function(x, data) { if(x && x.status == 200) { diff --git a/luci-app-passwall/root/usr/share/passwall/rule_update.lua b/luci-app-passwall/root/usr/share/passwall/rule_update.lua index 13ebcd54..d72df197 100755 --- a/luci-app-passwall/root/usr/share/passwall/rule_update.lua +++ b/luci-app-passwall/root/usr/share/passwall/rule_update.lua @@ -49,16 +49,10 @@ local log = function(...) end end --- trim -local function trim(text) - if not text or text == "" then return "" end - return (string.gsub(text, "^%s*(.-)%s*$", "%1")) -end - -- curl local function curl(url, file, valifile) local args = { - "-sKL", "-w %{http_code}", "--retry 3", "--connect-timeout 3" + "-skL", "-w %{http_code}", "--retry 3", "--connect-timeout 3" } if file then args[#args + 1] = "-o " .. file @@ -241,8 +235,8 @@ end local function fetch_geoip() --请求geoip xpcall(function() - local json_str = api.curl_logic(geoip_api) - local json = jsonc.parse(json_str) + local return_code, content = api.curl_logic(geoip_api) + local json = jsonc.parse(content) if json.tag_name and json.assets then for _, v in ipairs(json.assets) do if v.name and v.name == "geoip.dat.sha256sum" then @@ -292,8 +286,8 @@ end local function fetch_geosite() --请求geosite xpcall(function() - local json_str = api.curl_logic(geosite_api) - local json = jsonc.parse(json_str) + local return_code, content = api.curl_logic(geosite_api) + local json = jsonc.parse(content) if json.tag_name and json.assets then for _, v in ipairs(json.assets) do if v.name and v.name == "geosite.dat.sha256sum" then diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index 4bd69193..34b29e1f 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall2 PKG_VERSION:=1.8 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \ diff --git a/luci-app-passwall2/luasrc/view/passwall2/rule/rule_version.htm b/luci-app-passwall2/luasrc/view/passwall2/rule/rule_version.htm index 033153c9..26a77802 100644 --- a/luci-app-passwall2/luasrc/view/passwall2/rule/rule_version.htm +++ b/luci-app-passwall2/luasrc/view/passwall2/rule/rule_version.htm @@ -21,7 +21,7 @@ local geosite_update = api.uci_get_type("global_rules", "geosite_update", "1") = } } XHR.get('<%=api.url("update_rules")%>', { - update: checkBoxList + update: checkBoxList.join(",") }, function(x, data) { if(x && x.status == 200) { diff --git a/luci-app-passwall2/root/usr/share/passwall2/rule_update.lua b/luci-app-passwall2/root/usr/share/passwall2/rule_update.lua index ddfd35e3..adea036a 100755 --- a/luci-app-passwall2/root/usr/share/passwall2/rule_update.lua +++ b/luci-app-passwall2/root/usr/share/passwall2/rule_update.lua @@ -37,7 +37,7 @@ end -- curl local function curl(url, file) local args = { - "-sKL", "-w %{http_code}", "--retry 3", "--connect-timeout 3" + "-skL", "-w %{http_code}", "--retry 3", "--connect-timeout 3" } if file then args[#args + 1] = "-o " .. file @@ -50,8 +50,8 @@ end local function fetch_geoip() --请求geoip xpcall(function() - local json_str = api.curl_logic(geoip_api) - local json = jsonc.parse(json_str) + local return_code, content = api.curl_logic(geoip_api) + local json = jsonc.parse(content) if json.tag_name and json.assets then for _, v in ipairs(json.assets) do if v.name and v.name == "geoip.dat.sha256sum" then @@ -101,8 +101,8 @@ end local function fetch_geosite() --请求geosite xpcall(function() - local json_str = api.curl_logic(geosite_api) - local json = jsonc.parse(json_str) + local return_code, content = api.curl_logic(geosite_api) + local json = jsonc.parse(content) if json.tag_name and json.assets then for _, v in ipairs(json.assets) do if v.name and v.name == "geosite.dat.sha256sum" then diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index ac99a7a1..536d7c59 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=186 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NONE_V2RAY \ diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua index 1203f5df..5040fc70 100644 --- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua +++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua @@ -147,7 +147,7 @@ o.rawhtml = true o.template = "shadowsocksr/ssrurl" o.value = sid -o = s:option(ListValue, "type", translate("Server Node Type")) +o = s:option(Value, "type", translate("Server Node Type")) if is_finded("xray") or is_finded("v2ray") then o:value("v2ray", translate("V2Ray/XRay")) end @@ -715,14 +715,20 @@ o.default = "0" if is_finded("xray") then -- [[ uTLS ]]-- o = s:option(ListValue, "fingerprint", translate("Finger Print")) - o:value("disable", translate("disable")) - o:value("firefox", translate("firefox")) + o:value("", translate("disable")) o:value("chrome", translate("chrome")) + o:value("firefox", translate("firefox")) o:value("safari", translate("safari")) + o:value("ios", translate("ios")) + o:value("android", translate("android")) + o:value("edge", translate("edge")) + o:value("360", translate("360")) + o:value("qq", translate("qq")) + o:value("random", translate("random")) o:value("randomized", translate("randomized")) o:depends({type = "v2ray", tls = true}) o:depends({type = "v2ray", xtls = true}) - o.default = "disable" + o.default = "" end o = s:option(Value, "tls_host", translate("TLS Host")) diff --git a/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm b/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm index c6caa22d..4e2e4148 100644 --- a/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm +++ b/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm @@ -315,6 +315,7 @@ function import_ssr_url(btn, urlname, sid) { document.getElementsByName('cbid.shadowsocksr.' + sid + '.vless_flow')[0].value = params.get("flow") || "xtls-rprx-splice"; document.getElementsByName('cbid.shadowsocksr.' + sid + '.vless_flow')[0].dispatchEvent(event); } + document.getElementsByName('cbid.shadowsocksr.' + sid + '.fingerprint')[0].value = params.get("fp") || ""; document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls_host')[0].value = params.get("sni") || ""; } switch (params.get("type")) { diff --git a/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus b/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus index 63b8b2bc..d7378d81 100755 --- a/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus +++ b/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus @@ -32,6 +32,7 @@ sed -i "s/option pdnsd_enable '3'/option pdnsd_enable '1'/g" /etc/config/shadows sed -i "s/option type 'vmess'/option type 'v2ray'\n\toption v2ray_protocol 'vmess'/g" /etc/config/shadowsocksr sed -i "s/option type 'vless'/option type 'v2ray'\n\toption v2ray_protocol 'vless'/g" /etc/config/shadowsocksr sed -i "s/option encrypt_method_v2ray_ss/option encrypt_method_ss/g" /etc/config/shadowsocksr +sed -i "/option fingerprint 'disable'/d" /etc/config/shadowsocksr if [ -s "/etc/uwsgi/vassals/luci-webui.ini" ];then limit=$(cat /etc/uwsgi/vassals/luci-webui.ini | grep -Eo "limit-as.*"|grep -Eo "[0-9]+") diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua index e2fb4a26..518bb987 100755 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua @@ -366,6 +366,7 @@ local function processData(szType, content) result.tls_host = params.sni result.xtls = params.security == "xtls" and "1" or nil result.vless_flow = params.flow + result.fingerprint = params.fp if result.transport == "ws" then result.ws_host = (result.tls ~= "1") and (params.host and UrlDecode(params.host)) or nil result.ws_path = params.path and UrlDecode(params.path) or "/"