From a2b8e5d31523de3a97803245215e10195e76ba40 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Wed, 11 Dec 2024 20:41:45 +0800 Subject: [PATCH] update 2024-12-11 20:41:45 --- luci-app-istoredup/Makefile | 4 ++-- luci-app-nekobox/htdocs/nekobox/mihomo.php | 5 ++++- .../model/cbi/passwall/client/other.lua | 2 +- .../luasrc/passwall/util_xray.lua | 21 +++++++++++++----- luci-app-passwall/po/zh-cn/passwall.po | 3 +++ .../model/cbi/passwall2/client/other.lua | 2 +- .../luasrc/passwall2/util_xray.lua | 22 ++++++++++++++----- luci-app-passwall2/po/zh-cn/passwall2.po | 3 +++ 8 files changed, 45 insertions(+), 17 deletions(-) diff --git a/luci-app-istoredup/Makefile b/luci-app-istoredup/Makefile index dee4b72a0..12fce9bcc 100644 --- a/luci-app-istoredup/Makefile +++ b/luci-app-istoredup/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.6-20241211 +PKG_VERSION:=1.1.7-20241211 PKG_RELEASE:= LUCI_TITLE:=LuCI support for istoredup @@ -15,7 +15,7 @@ endef define Package/luci-app-istoredup/prerm #!/bin/sh -/root/usr/libexec/istorec/istoredup.sh stop +/usr/libexec/istorec/istoredup.sh stop exit 0 endef diff --git a/luci-app-nekobox/htdocs/nekobox/mihomo.php b/luci-app-nekobox/htdocs/nekobox/mihomo.php index 153e50c90..ec6550d78 100644 --- a/luci-app-nekobox/htdocs/nekobox/mihomo.php +++ b/luci-app-nekobox/htdocs/nekobox/mihomo.php @@ -416,6 +416,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { $subscription_url = $_POST['subscription_url']; $filename = $_POST['filename']; + if (strpos($subscription_url, '&flag=meta') === false) { + $subscription_url .= '&flag=meta'; + } + if (empty($filename)) { $filename = 'config.yaml'; } @@ -515,7 +519,6 @@ $current_subscription_url = getSubscriptionUrlFromFile($subscription_file);
  • 输入订阅链接: 在文本框中输入您的 Clash 订阅链接。
  • 输入保存文件名: 指定保存配置文件的文件名，默认为 "config.yaml"，无需添加后缀。
  • 点击 "更新订阅" 按钮，系统将下载订阅内容，并进行转换和保存。
    • -
  • 只支持Clash格式的订阅。
    • diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua index 11a052dd5..0bc15c66d 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua @@ -180,7 +180,7 @@ if has_xray then o = s_xray:option(Flag, "sniffing_override_dest", translate("Override the connection destination address")) o.default = 0 - o.description = translate("Override the connection destination address with the sniffed domain.
    When enabled, traffic will match only by domain, ignoring IP rules.
    If using shunt nodes, configure the domain shunt rules correctly.") + o.description = translate("Override the connection destination address with the sniffed domain.
    Otherwise use sniffed domain for routing only.
    If using shunt nodes, configure the domain shunt rules correctly.") local domains_excluded = string.format("/usr/share/%s/rules/domains_excluded", appname) o = s_xray:option(TextValue, "excluded_domains", translate("Excluded Domains"), translate("If the traffic sniffing result is in this list, the destination address will not be overridden.")) diff --git a/luci-app-passwall/luasrc/passwall/util_xray.lua b/luci-app-passwall/luasrc/passwall/util_xray.lua index 3c9907758..05a9f1ddb 100644 --- a/luci-app-passwall/luasrc/passwall/util_xray.lua +++ b/luci-app-passwall/luasrc/passwall/util_xray.lua @@ -612,8 +612,15 @@ function gen_config(var) port = tonumber(local_socks_port), protocol = "socks", settings = {auth = "noauth", udp = true}, - sniffing = {enabled = true, destOverride = {"http", "tls", "quic"}} + sniffing = { + enabled = xray_settings.sniffing_override_dest == "1" or node.protocol == "_shunt" + } } + if inbound.sniffing.enabled == true then + inbound.sniffing.destOverride = {"http", "tls", "quic"} + inbound.sniffing.routeOnly = xray_settings.sniffing_override_dest ~= "1" or nil + inbound.sniffing.domainsExcluded = xray_settings.sniffing_override_dest == "1" and get_domain_excluded() or nil + end if local_socks_username and local_socks_password and local_socks_username ~= "" and local_socks_password ~= "" then inbound.settings.auth = "password" inbound.settings.accounts = { @@ -649,13 +656,15 @@ function gen_config(var) settings = {network = "tcp,udp", followRedirect = true}, streamSettings = {sockopt = {tproxy = "tproxy"}}, sniffing = { - enabled = xray_settings.sniffing_override_dest == "1" or node.protocol == "_shunt", - destOverride = {"http", "tls", "quic"}, - metadataOnly = false, - routeOnly = node.protocol == "_shunt" and xray_settings.sniffing_override_dest ~= "1" or nil, - domainsExcluded = xray_settings.sniffing_override_dest == "1" and get_domain_excluded() or nil + enabled = xray_settings.sniffing_override_dest == "1" or node.protocol == "_shunt" } } + if inbound.sniffing.enabled == true then + inbound.sniffing.destOverride = {"http", "tls", "quic", (remote_dns_fake) and "fakedns"} + inbound.sniffing.metadataOnly = false + inbound.sniffing.routeOnly = xray_settings.sniffing_override_dest ~= "1" or nil + inbound.sniffing.domainsExcluded = xray_settings.sniffing_override_dest == "1" and get_domain_excluded() or nil + end if tcp_redir_port then local tcp_inbound = api.clone(inbound) diff --git a/luci-app-passwall/po/zh-cn/passwall.po b/luci-app-passwall/po/zh-cn/passwall.po index a32f413fe..610fe9bca 100644 --- a/luci-app-passwall/po/zh-cn/passwall.po +++ b/luci-app-passwall/po/zh-cn/passwall.po @@ -1645,6 +1645,9 @@ msgstr "握手服务器" msgid "Handshake Server Port" msgstr "握手服务器端口" +msgid "Override the connection destination address with the sniffed domain.
    Otherwise use sniffed domain for routing only.
    If using shunt nodes, configure the domain shunt rules correctly." +msgstr "用探测出的域名覆盖连接目标地址。
    否则仅将探测得到的域名用于路由。
    如使用分流节点，请正确设置域名分流规则。" + msgid "Override the connection destination address with the sniffed domain.
    When enabled, traffic will match only by domain, ignoring IP rules.
    If using shunt nodes, configure the domain shunt rules correctly." msgstr "用探测出的域名覆盖连接目标地址。
    启用后仅使用域名进行流量匹配，将忽略IP规则。
    如使用分流节点，请正确设置域名分流规则。" diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/other.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/other.lua index 0930eb713..c8b9693d6 100644 --- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/other.lua +++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/other.lua @@ -166,7 +166,7 @@ if has_xray then o = s_xray:option(Flag, "sniffing_override_dest", translate("Override the connection destination address")) o.default = 0 - o.description = translate("Override the connection destination address with the sniffed domain.
    When enabled, traffic will match only by domain, ignoring IP rules.
    If using shunt nodes, configure the domain shunt rules correctly.") + o.description = translate("Override the connection destination address with the sniffed domain.
    Otherwise use sniffed domain for routing only.
    If using shunt nodes, configure the domain shunt rules correctly.") o = s_xray:option(Flag, "route_only", translate("Sniffing Route Only")) o.default = 0 diff --git a/luci-app-passwall2/luasrc/passwall2/util_xray.lua b/luci-app-passwall2/luasrc/passwall2/util_xray.lua index 4f0eb3b87..a179e3452 100644 --- a/luci-app-passwall2/luasrc/passwall2/util_xray.lua +++ b/luci-app-passwall2/luasrc/passwall2/util_xray.lua @@ -612,8 +612,15 @@ function gen_config(var) port = tonumber(local_socks_port), protocol = "socks", settings = {auth = "noauth", udp = true}, - sniffing = {enabled = true, destOverride = {"http", "tls", "quic"}} + sniffing = { + enabled = xray_settings.sniffing_override_dest == "1" or node.protocol == "_shunt" + } } + if inbound.sniffing.enabled == true then + inbound.sniffing.destOverride = {"http", "tls", "quic"} + inbound.sniffing.routeOnly = xray_settings.sniffing_override_dest ~= "1" or nil + inbound.sniffing.domainsExcluded = xray_settings.sniffing_override_dest == "1" and get_domain_excluded() or nil + end if local_socks_username and local_socks_password and local_socks_username ~= "" and local_socks_password ~= "" then inbound.settings.auth = "password" inbound.settings.accounts = { @@ -651,13 +658,16 @@ function gen_config(var) settings = {network = "tcp,udp", followRedirect = true}, streamSettings = {sockopt = {tproxy = "tproxy"}}, sniffing = { - enabled = xray_settings.sniffing_override_dest == "1" or node.protocol == "_shunt", - destOverride = {"http", "tls", "quic", (remote_dns_fake) and "fakedns"}, - metadataOnly = false, - routeOnly = node.protocol == "_shunt" and xray_settings.sniffing_override_dest ~= "1" or nil, - domainsExcluded = xray_settings.sniffing_override_dest == "1" and get_domain_excluded() or nil + enabled = xray_settings.sniffing_override_dest == "1" or node.protocol == "_shunt" } } + if inbound.sniffing.enabled == true then + inbound.sniffing.destOverride = {"http", "tls", "quic", (remote_dns_fake) and "fakedns"} + inbound.sniffing.metadataOnly = false + inbound.sniffing.routeOnly = xray_settings.sniffing_override_dest ~= "1" or nil + inbound.sniffing.domainsExcluded = xray_settings.sniffing_override_dest == "1" and get_domain_excluded() or nil + end + local tcp_inbound = api.clone(inbound) tcp_inbound.tag = "tcp_redir" tcp_inbound.settings.network = "tcp" diff --git a/luci-app-passwall2/po/zh-cn/passwall2.po b/luci-app-passwall2/po/zh-cn/passwall2.po index 6e07733c0..6e79108d7 100644 --- a/luci-app-passwall2/po/zh-cn/passwall2.po +++ b/luci-app-passwall2/po/zh-cn/passwall2.po @@ -1486,6 +1486,9 @@ msgstr "Sing-Box 会在启动时自动下载资源文件，您可以使用此功 msgid "Override the connection destination address" msgstr "覆盖连接目标地址" +msgid "Override the connection destination address with the sniffed domain.
    Otherwise use sniffed domain for routing only.
    If using shunt nodes, configure the domain shunt rules correctly." +msgstr "用探测出的域名覆盖连接目标地址。
    否则仅将探测得到的域名用于路由。
    如使用分流节点，请正确设置域名分流规则。" + msgid "Override the connection destination address with the sniffed domain.
    When enabled, traffic will match only by domain, ignoring IP rules.
    If using shunt nodes, configure the domain shunt rules correctly." msgstr "用探测出的域名覆盖连接目标地址。
    启用后仅使用域名进行流量匹配，将忽略IP规则。
    如使用分流节点，请正确设置域名分流规则。"