From 518a5546976807b205f3b062dd6f4e52093d21f2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:34:29 +0800 Subject: [PATCH] update 03-23 20:34 --- luci-app-godproxy/Makefile | 2 +- luci-app-godproxy/rulesupdate.log | 86 ++++++++++--------- luci-app-ikoolproxy/Makefile | 2 +- luci-app-ikoolproxy/rulesupdate.log | 86 ++++++++++--------- luci-app-passwall2/Makefile | 2 +- .../model/cbi/passwall2/api/gen_v2ray.lua | 41 ++++----- .../root/usr/share/passwall2/app.sh | 2 +- 7 files changed, 107 insertions(+), 114 deletions(-) diff --git a/luci-app-godproxy/Makefile b/luci-app-godproxy/Makefile index 7d69d3d15..991f8d660 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:=20220322 +PKG_RELEASE:=20220212 PKG_MAINTAINER:=panda-mute diff --git a/luci-app-godproxy/rulesupdate.log b/luci-app-godproxy/rulesupdate.log index decd46cbf..8a004319c 100644 --- a/luci-app-godproxy/rulesupdate.log +++ b/luci-app-godproxy/rulesupdate.log @@ -1,42 +1,44 @@ -2022-03-20 12:58:16: ------------------- 规则更新 ----------------------- -2022-03-20 12:58:16: ==================================================== -2022-03-20 12:58:16: 开始更新koolproxy的规则，请等待... -2022-03-20 12:58:16: --------------------------------------------------------------------------------------- -2022-03-20 12:58:16: Yhosts规则本地版本号： 202111082343 -2022-03-20 12:58:16: Yhosts规则在线版本号： 2022031015 -2022-03-20 12:58:16: 检测到 Yhosts规则 已更新，现在开始更新... -2022-03-20 12:58:16: 将临时文件覆盖到原始Yhosts文件 -2022-03-20 12:58:16: --------------------------------------------------------------------------------------- -2022-03-20 12:58:16: Antiad规则本地版本号： 20220317102914 -2022-03-20 12:58:16: Antiad规则在线版本号： 20220320023951 -2022-03-20 12:58:16: 检测到新版本 Antiad规则 列表，开始更新... -2022-03-20 12:58:16: 将临时文件覆盖到原始 Antiad规则 文件 -2022-03-20 12:58:16: --------------------------------------------------------------------------------------- -2022-03-20 12:58:16: StevenBlack规则本地版本号： 14 March 2022 21:25:43 -2022-03-20 12:58:16: StevenBlack规则在线版本号： 19 March 2022 18:42:31 -2022-03-20 12:58:16: 检测到新版本 StevenBlack规则 列表，开始更新... -2022-03-20 12:58:16: 将临时文件覆盖到原始 StevenBlack规则 文件 -2022-03-20 12:58:16: --------------------------------------------------------------------------------------- -2022-03-20 12:58:16: AdGuard DNS规则本地版本号： 2022-03-19T00:02:22.499Z -2022-03-20 12:58:16: AdGuard DNS规则在线版本号： 2022-03-20T12:01:15.868Z -2022-03-20 12:58:16: 检测到新版本 AdGuard DNS规则 列表，开始更新... -2022-03-20 12:58:16: 将临时文件覆盖到原始 AdGuard DNS规则 文件 -2022-03-20 12:58:16: --------------------------------------------------------------------------------------- -2022-03-20 12:58:16: ADgk规则本地版本号： 20220318115118 -2022-03-20 12:58:16: ADgk规则在线版本号： 20220318115118 -2022-03-20 12:58:16: 检测到 ADgk规则 本地版本号和在线版本号相同，那还更新个毛啊! -2022-03-20 12:58:16: 正在优化 补充规则yhosts。。。。。 -2022-03-20 12:58:16: 正在优化 补充规则antiad。。。。。 -2022-03-20 12:58:17: 正在优化 补充规则steven。。。。。 -2022-03-20 12:58:17: 正在优化 补充规则AdGuard DNS。。。。。 -2022-03-20 12:58:24: 跳过优化 ADgk规则。。。。。 -2022-03-20 12:58:24: 所有规则更新并优化完毕！ -2022-03-20 12:58:24: ==================================================== -2022-03-20 12:58:25: -------------------AdGuard规则 version 2022-03-20T12:01:15.868Z -2022-03-20 12:58:25: -------------------Antiad规则 version 20220320023951 -2022-03-20 12:58:25: -------------------Banben规则 version 20220318115118 -2022-03-20 12:58:25: -------------------Yhosts规则 version 2022031015 -2022-03-20 12:58:25: -------------------Steven规则 version 19 March 2022 18:42:31 -2022-03-20 12:58:25: -------------------静态规则 version 2022-03-05 17:16 -2022-03-20 12:58:25: ------------------- 内置规则更新成功！ ------------------- -2022-03-20 12:58:25: ------------------- 规则更新成功！ ------------------- +2022-02-07 01:07:34: ------------------- 规则更新 ----------------------- +2022-02-07 01:07:34: ==================================================== +2022-02-07 01:07:34: 开始更新koolproxy的规则，请等待... +2022-02-07 01:07:34: kpr_our_rule规则文件下载失败 +2022-02-07 01:07:34: dykpr规则文件下载失败 +2022-02-07 01:07:34: --------------------------------------------------------------------------------------- +2022-02-07 01:07:34: Yhosts规则本地版本号： 202111082343 +2022-02-07 01:07:34: Yhosts规则在线版本号： 202111082343 +2022-02-07 01:07:34: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊! +2022-02-07 01:07:34: --------------------------------------------------------------------------------------- +2022-02-07 01:07:35: Antiad规则本地版本号： 20220201023931 +2022-02-07 01:07:35: Antiad规则在线版本号： 20220205023331 +2022-02-07 01:07:35: 检测到新版本 Antiad规则 列表，开始更新... +2022-02-07 01:07:35: 将临时文件覆盖到原始 Antiad规则 文件 +2022-02-07 01:07:35: --------------------------------------------------------------------------------------- +2022-02-07 01:07:35: StevenBlack规则本地版本号： 31 January 2022 16:06:44 +2022-02-07 01:07:35: StevenBlack规则在线版本号： 01 February 2022 17:17:39 +2022-02-07 01:07:35: 检测到新版本 StevenBlack规则 列表，开始更新... +2022-02-07 01:07:35: 将临时文件覆盖到原始 StevenBlack规则 文件 +2022-02-07 01:07:35: --------------------------------------------------------------------------------------- +2022-02-07 01:07:35: AdGuard DNS规则本地版本号： 2022-02-01T00:27:36.809Z +2022-02-07 01:07:35: AdGuard DNS规则在线版本号： 2022-02-07T00:22:12.257Z +2022-02-07 01:07:35: 检测到新版本 AdGuard DNS规则 列表，开始更新... +2022-02-07 01:07:35: 将临时文件覆盖到原始 AdGuard DNS规则 文件 +2022-02-07 01:07:35: --------------------------------------------------------------------------------------- +2022-02-07 01:07:36: ADgk规则本地版本号： 20220201032941 +2022-02-07 01:07:36: ADgk规则在线版本号： 20220206232113 +2022-02-07 01:07:36: 检测到新版本 ADgk规则 列表，开始更新... +2022-02-07 01:07:36: 将临时文件覆盖到原始 ADgk规则 文件 +2022-02-07 01:07:36: 跳过优化 补充规则Yhosts。。。。。 +2022-02-07 01:07:36: 正在优化 补充规则antiad。。。。。 +2022-02-07 01:07:37: 正在优化 补充规则steven。。。。。 +2022-02-07 01:07:37: 正在优化 补充规则AdGuard DNS。。。。。 +2022-02-07 01:07:44: 正在优化 ADgk规则。。。。。 +2022-02-07 01:07:56: 所有规则更新并优化完毕！ +2022-02-07 01:07:56: ==================================================== +2022-02-07 01:07:59: -------------------AdGuard规则 version 2022-02-07T00:22:12.257Z +2022-02-07 01:07:59: -------------------Antiad规则 version 20220205023331 +2022-02-07 01:07:59: -------------------Banben规则 version 20220206232113 +2022-02-07 01:07:59: -------------------Yhosts规则 version 202111082343 +2022-02-07 01:07:59: -------------------Steven规则 version 01 February 2022 17:17:39 +2022-02-07 01:07:59: -------------------静态规则 version 2022-02-06 14:00 +2022-02-07 01:07:59: ------------------- 内置规则更新成功！ ------------------- +2022-02-07 01:07:59: ------------------- 规则更新成功！ ------------------- diff --git a/luci-app-ikoolproxy/Makefile b/luci-app-ikoolproxy/Makefile index 7d69d3d15..991f8d660 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:=20220322 +PKG_RELEASE:=20220212 PKG_MAINTAINER:=panda-mute diff --git a/luci-app-ikoolproxy/rulesupdate.log b/luci-app-ikoolproxy/rulesupdate.log index decd46cbf..8a004319c 100644 --- a/luci-app-ikoolproxy/rulesupdate.log +++ b/luci-app-ikoolproxy/rulesupdate.log @@ -1,42 +1,44 @@ -2022-03-20 12:58:16: ------------------- 规则更新 ----------------------- -2022-03-20 12:58:16: ==================================================== -2022-03-20 12:58:16: 开始更新koolproxy的规则，请等待... -2022-03-20 12:58:16: --------------------------------------------------------------------------------------- -2022-03-20 12:58:16: Yhosts规则本地版本号： 202111082343 -2022-03-20 12:58:16: Yhosts规则在线版本号： 2022031015 -2022-03-20 12:58:16: 检测到 Yhosts规则 已更新，现在开始更新... -2022-03-20 12:58:16: 将临时文件覆盖到原始Yhosts文件 -2022-03-20 12:58:16: --------------------------------------------------------------------------------------- -2022-03-20 12:58:16: Antiad规则本地版本号： 20220317102914 -2022-03-20 12:58:16: Antiad规则在线版本号： 20220320023951 -2022-03-20 12:58:16: 检测到新版本 Antiad规则 列表，开始更新... -2022-03-20 12:58:16: 将临时文件覆盖到原始 Antiad规则 文件 -2022-03-20 12:58:16: --------------------------------------------------------------------------------------- -2022-03-20 12:58:16: StevenBlack规则本地版本号： 14 March 2022 21:25:43 -2022-03-20 12:58:16: StevenBlack规则在线版本号： 19 March 2022 18:42:31 -2022-03-20 12:58:16: 检测到新版本 StevenBlack规则 列表，开始更新... -2022-03-20 12:58:16: 将临时文件覆盖到原始 StevenBlack规则 文件 -2022-03-20 12:58:16: --------------------------------------------------------------------------------------- -2022-03-20 12:58:16: AdGuard DNS规则本地版本号： 2022-03-19T00:02:22.499Z -2022-03-20 12:58:16: AdGuard DNS规则在线版本号： 2022-03-20T12:01:15.868Z -2022-03-20 12:58:16: 检测到新版本 AdGuard DNS规则 列表，开始更新... -2022-03-20 12:58:16: 将临时文件覆盖到原始 AdGuard DNS规则 文件 -2022-03-20 12:58:16: --------------------------------------------------------------------------------------- -2022-03-20 12:58:16: ADgk规则本地版本号： 20220318115118 -2022-03-20 12:58:16: ADgk规则在线版本号： 20220318115118 -2022-03-20 12:58:16: 检测到 ADgk规则 本地版本号和在线版本号相同，那还更新个毛啊! -2022-03-20 12:58:16: 正在优化 补充规则yhosts。。。。。 -2022-03-20 12:58:16: 正在优化 补充规则antiad。。。。。 -2022-03-20 12:58:17: 正在优化 补充规则steven。。。。。 -2022-03-20 12:58:17: 正在优化 补充规则AdGuard DNS。。。。。 -2022-03-20 12:58:24: 跳过优化 ADgk规则。。。。。 -2022-03-20 12:58:24: 所有规则更新并优化完毕！ -2022-03-20 12:58:24: ==================================================== -2022-03-20 12:58:25: -------------------AdGuard规则 version 2022-03-20T12:01:15.868Z -2022-03-20 12:58:25: -------------------Antiad规则 version 20220320023951 -2022-03-20 12:58:25: -------------------Banben规则 version 20220318115118 -2022-03-20 12:58:25: -------------------Yhosts规则 version 2022031015 -2022-03-20 12:58:25: -------------------Steven规则 version 19 March 2022 18:42:31 -2022-03-20 12:58:25: -------------------静态规则 version 2022-03-05 17:16 -2022-03-20 12:58:25: ------------------- 内置规则更新成功！ ------------------- -2022-03-20 12:58:25: ------------------- 规则更新成功！ ------------------- +2022-02-07 01:07:34: ------------------- 规则更新 ----------------------- +2022-02-07 01:07:34: ==================================================== +2022-02-07 01:07:34: 开始更新koolproxy的规则，请等待... +2022-02-07 01:07:34: kpr_our_rule规则文件下载失败 +2022-02-07 01:07:34: dykpr规则文件下载失败 +2022-02-07 01:07:34: --------------------------------------------------------------------------------------- +2022-02-07 01:07:34: Yhosts规则本地版本号： 202111082343 +2022-02-07 01:07:34: Yhosts规则在线版本号： 202111082343 +2022-02-07 01:07:34: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊! +2022-02-07 01:07:34: --------------------------------------------------------------------------------------- +2022-02-07 01:07:35: Antiad规则本地版本号： 20220201023931 +2022-02-07 01:07:35: Antiad规则在线版本号： 20220205023331 +2022-02-07 01:07:35: 检测到新版本 Antiad规则 列表，开始更新... +2022-02-07 01:07:35: 将临时文件覆盖到原始 Antiad规则 文件 +2022-02-07 01:07:35: --------------------------------------------------------------------------------------- +2022-02-07 01:07:35: StevenBlack规则本地版本号： 31 January 2022 16:06:44 +2022-02-07 01:07:35: StevenBlack规则在线版本号： 01 February 2022 17:17:39 +2022-02-07 01:07:35: 检测到新版本 StevenBlack规则 列表，开始更新... +2022-02-07 01:07:35: 将临时文件覆盖到原始 StevenBlack规则 文件 +2022-02-07 01:07:35: --------------------------------------------------------------------------------------- +2022-02-07 01:07:35: AdGuard DNS规则本地版本号： 2022-02-01T00:27:36.809Z +2022-02-07 01:07:35: AdGuard DNS规则在线版本号： 2022-02-07T00:22:12.257Z +2022-02-07 01:07:35: 检测到新版本 AdGuard DNS规则 列表，开始更新... +2022-02-07 01:07:35: 将临时文件覆盖到原始 AdGuard DNS规则 文件 +2022-02-07 01:07:35: --------------------------------------------------------------------------------------- +2022-02-07 01:07:36: ADgk规则本地版本号： 20220201032941 +2022-02-07 01:07:36: ADgk规则在线版本号： 20220206232113 +2022-02-07 01:07:36: 检测到新版本 ADgk规则 列表，开始更新... +2022-02-07 01:07:36: 将临时文件覆盖到原始 ADgk规则 文件 +2022-02-07 01:07:36: 跳过优化 补充规则Yhosts。。。。。 +2022-02-07 01:07:36: 正在优化 补充规则antiad。。。。。 +2022-02-07 01:07:37: 正在优化 补充规则steven。。。。。 +2022-02-07 01:07:37: 正在优化 补充规则AdGuard DNS。。。。。 +2022-02-07 01:07:44: 正在优化 ADgk规则。。。。。 +2022-02-07 01:07:56: 所有规则更新并优化完毕！ +2022-02-07 01:07:56: ==================================================== +2022-02-07 01:07:59: -------------------AdGuard规则 version 2022-02-07T00:22:12.257Z +2022-02-07 01:07:59: -------------------Antiad规则 version 20220205023331 +2022-02-07 01:07:59: -------------------Banben规则 version 20220206232113 +2022-02-07 01:07:59: -------------------Yhosts规则 version 202111082343 +2022-02-07 01:07:59: -------------------Steven规则 version 01 February 2022 17:17:39 +2022-02-07 01:07:59: -------------------静态规则 version 2022-02-06 14:00 +2022-02-07 01:07:59: ------------------- 内置规则更新成功！ ------------------- +2022-02-07 01:07:59: ------------------- 规则更新成功！ ------------------- diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index 202dd98ec..cf6e200fd 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.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \ diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/api/gen_v2ray.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/api/gen_v2ray.lua index e0001fe64..71502ff38 100644 --- a/luci-app-passwall2/luasrc/model/cbi/passwall2/api/gen_v2ray.lua +++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/api/gen_v2ray.lua @@ -287,36 +287,23 @@ if true then end if redir_port then - table.insert(inbounds, { + local inbound = { port = tonumber(redir_port), protocol = "dokodemo-door", - settings = {network = "tcp", followRedirect = true}, - streamSettings = {sockopt = {tproxy = tcp_proxy_way}}, - sniffing = {enabled = sniffing and true or false, destOverride = {"http", "tls", (dns_fakedns) and "fakedns"}, metadataOnly = false, routeOnly = route_only and true or nil, domainsExcluded = (sniffing and not route_only) and get_domain_excluded() or nil} - }) - table.insert(inbounds, { - port = tonumber(redir_port), - protocol = "dokodemo-door", - settings = {network = "udp", followRedirect = true}, + settings = {network = "tcp,udp", followRedirect = true}, streamSettings = {sockopt = {tproxy = "tproxy"}}, sniffing = {enabled = sniffing and true or false, destOverride = {"http", "tls", (dns_fakedns) and "fakedns"}, metadataOnly = false, routeOnly = route_only and true or nil, domainsExcluded = (sniffing and not route_only) and get_domain_excluded() or nil} - }) - end + } + local tcp_inbound = api.clone(inbound) + tcp_inbound.tag = "tcp_redir" + tcp_inbound.settings.network = "tcp" + tcp_inbound.streamSettings.sockopt.tproxy = tcp_proxy_way + table.insert(inbounds, tcp_inbound) - local up_trust_doh = uci:get(appname, "@global[0]", "up_trust_doh") - if up_trust_doh then - local t = {} - string.gsub(up_trust_doh, '[^' .. "," .. ']+', function (w) - table.insert(t, w) - end) - if #t > 1 then - local host = sys.exec("echo -n $(echo " .. t[1] .. " | sed 's/https:\\/\\///g' | awk -F ':' '{print $1}' | awk -F '/' '{print $1}')") - dns = { - hosts = { - [host] = t[2] - } - } - end + local udp_inbound = api.clone(inbound) + udp_inbound.tag = "udp_redir" + udp_inbound.settings.network = "udp" + table.insert(inbounds, udp_inbound) end local nodes = {} @@ -674,7 +661,9 @@ end if inbounds or outbounds then local config = { log = { - -- error = string.format("/tmp/etc/%s/%s.log", appname, node[".name"]), + --access = string.format("/tmp/etc/%s/%s_access.log", appname, "global"), + --error = string.format("/tmp/etc/%s/%s_error.log", appname, "global"), + --dnsLog = true, loglevel = loglevel }, -- DNS diff --git a/luci-app-passwall2/root/usr/share/passwall2/app.sh b/luci-app-passwall2/root/usr/share/passwall2/app.sh index 12e832637..b5591bb6b 100755 --- a/luci-app-passwall2/root/usr/share/passwall2/app.sh +++ b/luci-app-passwall2/root/usr/share/passwall2/app.sh @@ -723,7 +723,7 @@ LOCALHOST_TCP_PROXY_MODE="global" LOCALHOST_UDP_PROXY_MODE="global" DNS_PROTOCOL=$(config_t_get global dns_protocol tcp) DNS_FORWARD=$(config_t_get global dns_forward 1.1.1.1:53 | sed 's/#/:/g' | sed -E 's/\:([^:]+)$/#\1/g') -DNS_CACHE=$(config_t_get global dns_cache 0) +DNS_CACHE=$(config_t_get global dns_cache 1) DEFAULT_DNS=$(uci show dhcp | grep "@dnsmasq" | grep "\.server=" | awk -F '=' '{print $2}' | sed "s/'//g" | tr ' ' '\n' | grep -v "\/" | head -2 | sed ':label;N;s/\n/,/;b label') [ -z "${DEFAULT_DNS}" ] && DEFAULT_DNS=$(echo -n $(sed -n 's/^nameserver[ \t]*\([^ ]*\)$/\1/p' "${RESOLVFILE}" | grep -v -E "0.0.0.0|127.0.0.1|::" | head -2) | tr ' ' ',')