From 66d7b2aad7e5428e6b7092a4d9aab78becbd4d5c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 23:56:33 +0800 Subject: [PATCH] update 2022-10-12 23:56:33 --- alist/Makefile | 8 +- luci-app-godproxy/Makefile | 2 +- luci-app-godproxy/change.log | 3 - .../root/usr/share/koolproxy/kpupdate | 20 ++--- luci-app-ikoolproxy/Makefile | 2 +- luci-app-ikoolproxy/change.log | 3 - .../root/usr/share/koolproxy/kpupdate | 20 ++--- .../passwall/node_list/link_share_man.htm | 46 ++++++++-- .../root/usr/share/passwall/0_default_config | 85 +++++++++---------- .../root/usr/share/passwall/subscribe.lua | 17 ++++ 10 files changed, 124 insertions(+), 82 deletions(-) diff --git a/alist/Makefile b/alist/Makefile index a3e508add..ae77822ef 100644 --- a/alist/Makefile +++ b/alist/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alist -PKG_VERSION:=3.1.0 -PKG_WEB_VERSION:=3.1.0 +PKG_VERSION:=3.2.0 +PKG_WEB_VERSION:=3.2.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/alist-org/alist/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=134fba47e1a96e303ce9f8c080e80f2eb483c2f23b2d85827cf1d1d3762cc78e +PKG_HASH:=5752b659d0a9374a96b3d9ac187627f8818552e51945018363230d2fca06aacc PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILE:=LICENSE @@ -23,7 +23,7 @@ define Download/$(PKG_NAME)-web FILE:=$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz URL_FILE:=dist.tar.gz URL:=https://github.com/alist-org/alist-web/releases/download/$(PKG_WEB_VERSION)/ - HASH:=f5dd1c4bf8544d3258852d82a2f69503047dce206950c2e67f81e534b7bc6cfd + HASH:=c8dfcf29e7af78b202e4975243a3f76dcbb80f967f5f63fd5f44535cc5c90aac endef PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-godproxy/Makefile b/luci-app-godproxy/Makefile index d1535db78..bb61dcd88 100644 --- a/luci-app-godproxy/Makefile +++ b/luci-app-godproxy/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ikoolproxy PKG_VERSION:=3.8.5 -PKG_RELEASE:=20221012 +PKG_RELEASE:=20221011 PKG_MAINTAINER:=panda-mute diff --git a/luci-app-godproxy/change.log b/luci-app-godproxy/change.log index 47253c2a8..2868d251f 100644 --- a/luci-app-godproxy/change.log +++ b/luci-app-godproxy/change.log @@ -1,7 +1,4 @@ -## 更新：2022年10月12日： -1、更换规则更新地址。 - ## 更新：2022年10月11日： 1、感谢群里Mr Conter（@biliconter）提供修复证书过期的二进制文件。 diff --git a/luci-app-godproxy/root/usr/share/koolproxy/kpupdate b/luci-app-godproxy/root/usr/share/koolproxy/kpupdate index 00bbd4631..ed9719fb3 100755 --- a/luci-app-godproxy/root/usr/share/koolproxy/kpupdate +++ b/luci-app-godproxy/root/usr/share/koolproxy/kpupdate @@ -111,16 +111,16 @@ update_rss_rules() { update_rules() { echo $(date "+%F %T"): ------------------- 内置规则更新 ------------------- >>$LOGFILE - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/daily.txt' -q -O $KP_DIR/data/rules/daily.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/koolproxy.txt' -q -O $KP_DIR/data/rules/koolproxy.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/steven.txt' -q -O $KP_DIR/data/rules/steven.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/adg.txt' -q -O $KP_DIR/data/rules/adg.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/antiad.txt' -q -O $KP_DIR/data/rules/antiad.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/adgk.txt' -q -O $KP_DIR/data/rules/adgk.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/koolproxy_ipset.conf' -q -O $KP_DIR/koolproxy_ipset.conf - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/dnsmasq.adblock' -q -O $KP_DIR/dnsmasq.adblock + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/daily.txt' -q -O $KP_DIR/data/rules/daily.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/koolproxy.txt' -q -O $KP_DIR/data/rules/koolproxy.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/steven.txt' -q -O $KP_DIR/data/rules/steven.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/adg.txt' -q -O $KP_DIR/data/rules/adg.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/antiad.txt' -q -O $KP_DIR/data/rules/antiad.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/adgk.txt' -q -O $KP_DIR/data/rules/adgk.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/koolproxy_ipset.conf' -q -O $KP_DIR/koolproxy_ipset.conf + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/dnsmasq.adblock' -q -O $KP_DIR/dnsmasq.adblock adg_rules_local=`cat /usr/share/koolproxy/data/rules/adg.txt | sed -n '4p'|awk '{print $4}'` steven_rules_local=`cat /usr/share/koolproxy/data/rules/steven.txt | sed -n '2p'|awk '{print $3,$4,$5,$6}'` yhosts_rules_local=`cat /usr/share/koolproxy/data/rules/yhosts.txt | sed -n '1p' | cut -d ":" -f2` diff --git a/luci-app-ikoolproxy/Makefile b/luci-app-ikoolproxy/Makefile index d1535db78..bb61dcd88 100644 --- a/luci-app-ikoolproxy/Makefile +++ b/luci-app-ikoolproxy/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ikoolproxy PKG_VERSION:=3.8.5 -PKG_RELEASE:=20221012 +PKG_RELEASE:=20221011 PKG_MAINTAINER:=panda-mute diff --git a/luci-app-ikoolproxy/change.log b/luci-app-ikoolproxy/change.log index 47253c2a8..2868d251f 100644 --- a/luci-app-ikoolproxy/change.log +++ b/luci-app-ikoolproxy/change.log @@ -1,7 +1,4 @@ -## 更新：2022年10月12日： -1、更换规则更新地址。 - ## 更新：2022年10月11日： 1、感谢群里Mr Conter（@biliconter）提供修复证书过期的二进制文件。 diff --git a/luci-app-ikoolproxy/root/usr/share/koolproxy/kpupdate b/luci-app-ikoolproxy/root/usr/share/koolproxy/kpupdate index 00bbd4631..ed9719fb3 100755 --- a/luci-app-ikoolproxy/root/usr/share/koolproxy/kpupdate +++ b/luci-app-ikoolproxy/root/usr/share/koolproxy/kpupdate @@ -111,16 +111,16 @@ update_rss_rules() { update_rules() { echo $(date "+%F %T"): ------------------- 内置规则更新 ------------------- >>$LOGFILE - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/daily.txt' -q -O $KP_DIR/data/rules/daily.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/koolproxy.txt' -q -O $KP_DIR/data/rules/koolproxy.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/steven.txt' -q -O $KP_DIR/data/rules/steven.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/adg.txt' -q -O $KP_DIR/data/rules/adg.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/antiad.txt' -q -O $KP_DIR/data/rules/antiad.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/adgk.txt' -q -O $KP_DIR/data/rules/adgk.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/koolproxy_ipset.conf' -q -O $KP_DIR/koolproxy_ipset.conf - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/dnsmasq.adblock' -q -O $KP_DIR/dnsmasq.adblock + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/daily.txt' -q -O $KP_DIR/data/rules/daily.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/koolproxy.txt' -q -O $KP_DIR/data/rules/koolproxy.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/steven.txt' -q -O $KP_DIR/data/rules/steven.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/adg.txt' -q -O $KP_DIR/data/rules/adg.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/antiad.txt' -q -O $KP_DIR/data/rules/antiad.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/adgk.txt' -q -O $KP_DIR/data/rules/adgk.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/koolproxy_ipset.conf' -q -O $KP_DIR/koolproxy_ipset.conf + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/dnsmasq.adblock' -q -O $KP_DIR/dnsmasq.adblock adg_rules_local=`cat /usr/share/koolproxy/data/rules/adg.txt | sed -n '4p'|awk '{print $4}'` steven_rules_local=`cat /usr/share/koolproxy/data/rules/steven.txt | sed -n '2p'|awk '{print $3,$4,$5,$6}'` yhosts_rules_local=`cat /usr/share/koolproxy/data/rules/yhosts.txt | sed -n '1p' | cut -d ":" -f2` diff --git a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm index c1db7a0e1..5bbd1a299 100644 --- a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm +++ b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm @@ -149,12 +149,41 @@ local has_xray = api.is_finded("xray") } var v_plugin_opts = opt.get("ss_plugin_opts").value; if (v_plugin_opts && v_plugin_opts != "") { - v_plugin += encodeURI(";" + v_plugin_opts); + v_plugin += ";" + v_plugin_opts; } - params += "&plugin=" + encodeURI(v_plugin); + params += "&plugin=" + encodeURIComponent(v_plugin); } params += "&group=" - params += "#" + encodeURI(v_alias.value); + params += "#" + encodeURIComponent(v_alias.value); + if (params[0] == "&") { + params = params.substring(1); + } + url += params; + } else if (v_type === "SS-Rust") { + v_type = "SS" + var v_server = opt.get("address"); + var v_port = opt.get("port"); + var v_method = opt.get("ss_rust_encrypt_method"); + var v_password = opt.get("password"); + + url = btoa(v_method.value + ":" + v_password.value) + "@" + + v_server.value + ":" + + v_port.value + "/?"; + + var params = ""; + var v_plugin = opt.get("ss_plugin").value; + if (v_plugin && v_plugin != "none") { + if (v_plugin == "simple-obfs" || v_plugin == "obfs-local") { + v_plugin = "obfs-local"; + } + var v_plugin_opts = opt.get("ss_plugin_opts").value; + if (v_plugin_opts && v_plugin_opts != "") { + v_plugin += ";" + v_plugin_opts; + } + params += "&plugin=" + encodeURIComponent(v_plugin); + } + params += "&group=" + params += "#" + encodeURIComponent(v_alias.value); if (params[0] == "&") { params = params.substring(1); } @@ -552,18 +581,23 @@ local has_xray = api.is_finded("xray") var pluginIndex = pluginInfo.indexOf(";"); var pluginNameInfo = pluginInfo.substr(0, pluginIndex); plugin = pluginNameInfo.substr(pluginNameInfo.indexOf("=") + 1) - pluginOpts = pluginInfo.substr(pluginIndex + 1); + pluginOpts = pluginInfo.substr(pluginIndex + 1).split("&")[0]; } var userInfoSplitIndex = userInfo.indexOf(":"); if (userInfoSplitIndex !== -1) { method = userInfo.substr(0, userInfoSplitIndex); password = userInfo.substr(userInfoSplitIndex + 1); } - opt.set('type', "SS"); + if (["2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha8-poly1305", "2022-blake3-chacha20-poly1305"].includes(method)) { + opt.set('type', "SS-Rust"); + opt.set('ss_rust_encrypt_method', method || ""); + } else { + opt.set('type', "SS"); + opt.set('ss_encrypt_method', method || ""); + } opt.set('address', server); opt.set('port', port); opt.set('password', password || ""); - opt.set('ss_encrypt_method', method || ""); opt.set('ss_plugin', plugin || "none"); if (plugin && plugin != "none") { opt.set('ss_plugin_opts', pluginOpts || ""); diff --git a/luci-app-passwall/root/usr/share/passwall/0_default_config b/luci-app-passwall/root/usr/share/passwall/0_default_config index 447ed4235..ae8dc1a35 100644 --- a/luci-app-passwall/root/usr/share/passwall/0_default_config +++ b/luci-app-passwall/root/usr/share/passwall/0_default_config @@ -83,18 +83,14 @@ config nodes 'myshunt' option remarks '分流总节点' option type 'Xray' option protocol '_shunt' - option AD 'nil' + option AD '_blackhole' option BT '_direct' - option Netflix 'nil' - option TVB 'nil' - option China 'nil' + option Proxy '_default' + option Netflix '_default' + option Direct '_direct' option default_node 'nil' option domainStrategy 'IPOnDemand' -config shunt_rules 'GAME' - option remarks 'GAME' - option domain_list 'geosite:category-games@cn' - config shunt_rules 'AD' option remarks 'AD' option domain_list 'geosite:category-ads-all' @@ -103,43 +99,44 @@ config shunt_rules 'BT' option remarks 'BT' option protocol 'bittorrent' -config shunt_rules 'YOUTUBE' - option remarks 'YOUTUBE' - option domain_list 'www.youtube.com -youtube.com -fonts.googleapis.com' +config shunt_rules 'Proxy' + option remarks 'Proxy' + option domain_list 'geosite:geolocation-!cn' + option ip_list '149.154.160.0/20 +91.108.4.0/22 +91.108.56.0/24 +109.239.140.0/24 +67.198.55.0/24 +8.8.4.4 +8.8.8.8 +208.67.222.222 +208.67.220.220 +1.1.1.1 +1.1.1.2 +1.0.0.1 +9.9.9.9 +149.112.112.112 +2001:67c:4e8::/48 +2001:b28:f23c::/48 +2001:b28:f23d::/48 +2001:b28:f23f::/48 +2001:b28:f242::/48 +2001:4860:4860::8888 +2001:4860:4860::8844 +2606:4700:4700::1111 +2606:4700:4700::1001' config shunt_rules 'Netflix' option remarks 'Netflix' - option domain_list 'fast.com -netflix -netflix.ca -netflix.com -netflix.net -nflxso.net -nflxext.com -nflximg.com -nflximg.net -nflxsearch.net -nflxvideo.net -netflixdnstest0.com -netflixdnstest1.com -netflixdnstest2.com -netflixdnstest3.com -netflixdnstest4.com -netflixdnstest5.com -netflixdnstest6.com -netflixdnstest7.com -netflixdnstest8.com -netflixdnstest9.com -netflixdnstest10.com' + option domain_list 'geosite:netflix' -config shunt_rules 'TVB' - option remarks 'TVB' - option domain_list 'tvb.com -mytvsuper.com' - -config shunt_rules 'China' - option remarks 'China' - option domain_list 'geosite:cn' - option ip_list 'geoip:cn' +config shunt_rules 'Direct' + option remarks 'Direct' + option domain_list 'geosite:category-games@cn +geosite:cn' + option ip_list '223.5.5.5/32 +119.29.29.29/32 +180.76.76.76/32 +114.114.114.114/32 +geoip:cn +geoip:private' diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index d7c408aa3..d69429b80 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -420,6 +420,7 @@ local function processData(szType, content, add_mode, add_from) result.mkcp_downlinkCapacity = 20 result.mkcp_readBufferSize = 2 result.mkcp_writeBufferSize = 2 + result.mkcp_seed = info.seed end if info.net == 'quic' then result.quic_guise = info.type @@ -524,6 +525,21 @@ local function processData(szType, content, add_mode, add_from) end end end + local aead2022 = false + for k, v in ipairs({"2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha8-poly1305", "2022-blake3-chacha20-poly1305"}) do + if method:lower() == v:lower() then + aead2022 = true + end + end + if aead2022 then + if ss_aead_type_default == "xray" and has_xray and not result.plugin then + result.type = 'Xray' + result.protocol = 'shadowsocks' + result.transport = 'tcp' + elseif has_ss_rust then + result.type = 'SS-Rust' + end + end elseif szType == "trojan" then local alias = "" if content:find("#") then @@ -739,6 +755,7 @@ local function processData(szType, content, add_mode, add_from) result.mkcp_downlinkCapacity = 20 result.mkcp_readBufferSize = 2 result.mkcp_writeBufferSize = 2 + result.mkcp_seed = params.seed end if params.type == 'quic' then result.quic_guise = params.headerType or "none"