diff --git a/luci-app-passwall/luasrc/passwall/util_sing-box.lua b/luci-app-passwall/luasrc/passwall/util_sing-box.lua index bfa24b46c..671974548 100644 --- a/luci-app-passwall/luasrc/passwall/util_sing-box.lua +++ b/luci-app-passwall/luasrc/passwall/util_sing-box.lua @@ -7,6 +7,9 @@ local appname = "passwall" local fs = api.fs local split = api.split +local local_version = api.get_app_version("singbox") +local version_ge_1_11_0 = api.compare_versions(local_version:match("[^v]+"), ">=", "1.11.0") + local new_port local function get_new_port() @@ -729,6 +732,26 @@ function gen_config_server(node) end end + if version_ge_1_11_0 then + -- Migrate logics + -- https://sing-box.sagernet.org/migration/ + for i = #config.outbounds, 1, -1 do + local value = config.outbounds[i] + if value.type == "block" then + -- https://sing-box.sagernet.org/migration/#migrate-legacy-special-outbounds-to-rule-actions + table.remove(config.outbounds, i) + end + end + -- https://sing-box.sagernet.org/migration/#migrate-legacy-special-outbounds-to-rule-actions + for i = #config.route.rules, 1, -1 do + local value = config.route.rules[i] + if value.outbound == "block" then + value.action = "reject" + value.outbound = nil + end + end + end + return config end @@ -1098,7 +1121,6 @@ function gen_config(var) local rule = { inbound = inboundTag, outbound = outboundTag, - invert = false, --匹配反选 protocol = protocols } @@ -1487,6 +1509,90 @@ function gen_config(var) end end end + if version_ge_1_11_0 then + -- Migrate logics + -- https://sing-box.sagernet.org/migration/ + local endpoints = {} + for i = #config.outbounds, 1, -1 do + local value = config.outbounds[i] + if value.type == "wireguard" then + -- https://sing-box.sagernet.org/migration/#migrate-wireguard-outbound-to-endpoint + local endpoint = { + type = "wireguard", + tag = value.tag, + system = value.system_interface, + name = value.interface_name, + mtu = value.mtu, + address = value.local_address, + private_key = value.private_key, + peers = { + { + address = value.server, + port = value.server_port, + public_key = value.peer_public_key, + pre_shared_key = value.pre_shared_key, + allowed_ips = {"0.0.0.0/0"}, + reserved = value.reserved + } + }, + domain_strategy = value.domain_strategy, + detour = value.detour + } + endpoints[#endpoints + 1] = endpoint + table.remove(config.outbounds, i) + end + if value.type == "block" or value.type == "dns" then + -- https://sing-box.sagernet.org/migration/#migrate-legacy-special-outbounds-to-rule-actions + table.remove(config.outbounds, i) + end + end + if #endpoints > 0 then + config.endpoints = endpoints + end + + -- https://sing-box.sagernet.org/migration/#migrate-legacy-special-outbounds-to-rule-actions + for i = #config.route.rules, 1, -1 do + local value = config.route.rules[i] + if value.outbound == "block" then + value.action = "reject" + value.outbound = nil + elseif value.outbound == "dns-out" then + value.action = "hijack-dns" + value.outbound = nil + else + value.action = "route" + end + end + + -- https://sing-box.sagernet.org/migration/#migrate-legacy-inbound-fields-to-rule-actions + for i = #config.inbounds, 1, -1 do + local value = config.inbounds[i] + if value.sniff == true then + table.insert(config.route.rules, 1, { + inbound = value.tag, + action = "sniff" + }) + value.sniff = nil + value.sniff_override_destination = nil + end + if value.domain_strategy then + table.insert(config.route.rules, 1, { + inbound = value.tag, + action = "resolve", + strategy = value.domain_strategy, + --server = "" + }) + value.domain_strategy = nil + end + end + + if config.route.final == "block" then + config.route.final = nil + table.insert(config.route.rules, { + action = "reject" + }) + end + end return jsonc.stringify(config, 1) end end diff --git a/luci-app-passwall/root/usr/share/passwall/app.sh b/luci-app-passwall/root/usr/share/passwall/app.sh index dda7f6dfd..0818288f0 100755 --- a/luci-app-passwall/root/usr/share/passwall/app.sh +++ b/luci-app-passwall/root/usr/share/passwall/app.sh @@ -2026,6 +2026,8 @@ start() { get_config export V2RAY_LOCATION_ASSET=$(config_t_get global_rules v2ray_location_asset "/usr/share/v2ray/") export XRAY_LOCATION_ASSET=$V2RAY_LOCATION_ASSET + export ENABLE_DEPRECATED_GEOSITE=true + export ENABLE_DEPRECATED_GEOIP=true ulimit -n 65535 start_haproxy start_socks diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index 0809f3888..daabe24b4 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -85,10 +85,10 @@ local function is_filter_keyword(value) end local nodeResult = {} -- update result -local debug = false +local isDebug = false local log = function(...) - if debug == true then + if isDebug == true then local result = os.date("%Y-%m-%d %H:%M:%S: ") .. table.concat({...}, " ") print(result) else @@ -1728,7 +1728,9 @@ if arg[1] then log('开始订阅...') xpcall(execute, function(e) log(e) - log(debug.traceback()) + if type(debug) == "table" and type(debug.traceback) == "function" then + log(debug.traceback()) + end log('发生错误, 正在恢复服务') end) log('订阅完毕...') diff --git a/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua b/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua index f3d132db8..c590ab38f 100644 --- a/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua +++ b/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua @@ -8,6 +8,9 @@ local fs = api.fs local CACHE_PATH = api.CACHE_PATH local split = api.split +local local_version = api.get_app_version("singbox") +local version_ge_1_11_0 = api.compare_versions(local_version:match("[^v]+"), ">=", "1.11.0") + local new_port local function get_new_port() @@ -726,6 +729,26 @@ function gen_config_server(node) end end + if version_ge_1_11_0 then + -- Migrate logics + -- https://sing-box.sagernet.org/migration/ + for i = #config.outbounds, 1, -1 do + local value = config.outbounds[i] + if value.type == "block" then + -- https://sing-box.sagernet.org/migration/#migrate-legacy-special-outbounds-to-rule-actions + table.remove(config.outbounds, i) + end + end + -- https://sing-box.sagernet.org/migration/#migrate-legacy-special-outbounds-to-rule-actions + for i = #config.route.rules, 1, -1 do + local value = config.route.rules[i] + if value.outbound == "block" then + value.action = "reject" + value.outbound = nil + end + end + end + return config end @@ -1087,7 +1110,6 @@ function gen_config(var) local rule = { inbound = inboundTag, outbound = outboundTag, - invert = false, --匹配反选 protocol = protocols } @@ -1480,6 +1502,90 @@ function gen_config(var) end end end + if version_ge_1_11_0 then + -- Migrate logics + -- https://sing-box.sagernet.org/migration/ + local endpoints = {} + for i = #config.outbounds, 1, -1 do + local value = config.outbounds[i] + if value.type == "wireguard" then + -- https://sing-box.sagernet.org/migration/#migrate-wireguard-outbound-to-endpoint + local endpoint = { + type = "wireguard", + tag = value.tag, + system = value.system_interface, + name = value.interface_name, + mtu = value.mtu, + address = value.local_address, + private_key = value.private_key, + peers = { + { + address = value.server, + port = value.server_port, + public_key = value.peer_public_key, + pre_shared_key = value.pre_shared_key, + allowed_ips = {"0.0.0.0/0"}, + reserved = value.reserved + } + }, + domain_strategy = value.domain_strategy, + detour = value.detour + } + endpoints[#endpoints + 1] = endpoint + table.remove(config.outbounds, i) + end + if value.type == "block" or value.type == "dns" then + -- https://sing-box.sagernet.org/migration/#migrate-legacy-special-outbounds-to-rule-actions + table.remove(config.outbounds, i) + end + end + if #endpoints > 0 then + config.endpoints = endpoints + end + + -- https://sing-box.sagernet.org/migration/#migrate-legacy-special-outbounds-to-rule-actions + for i = #config.route.rules, 1, -1 do + local value = config.route.rules[i] + if value.outbound == "block" then + value.action = "reject" + value.outbound = nil + elseif value.outbound == "dns-out" then + value.action = "hijack-dns" + value.outbound = nil + else + value.action = "route" + end + end + + -- https://sing-box.sagernet.org/migration/#migrate-legacy-inbound-fields-to-rule-actions + for i = #config.inbounds, 1, -1 do + local value = config.inbounds[i] + if value.sniff == true then + table.insert(config.route.rules, 1, { + inbound = value.tag, + action = "sniff" + }) + value.sniff = nil + value.sniff_override_destination = nil + end + if value.domain_strategy then + table.insert(config.route.rules, 1, { + inbound = value.tag, + action = "resolve", + strategy = value.domain_strategy, + --server = "" + }) + value.domain_strategy = nil + end + end + + if config.route.final == "block" then + config.route.final = nil + table.insert(config.route.rules, { + action = "reject" + }) + end + end return jsonc.stringify(config, 1) end end @@ -1563,183 +1669,8 @@ function gen_proto_config(var) return jsonc.stringify(config, 1) end -function gen_dns_config(var) - local dns_listen_port = var["-dns_listen_port"] - local dns_query_strategy = var["-dns_query_strategy"] - local dns_out_tag = var["-dns_out_tag"] - local direct_dns_udp_server = var["-direct_dns_udp_server"] - local direct_dns_udp_port = var["-direct_dns_udp_port"] - local direct_dns_tcp_server = var["-direct_dns_tcp_server"] - local direct_dns_tcp_port = var["-direct_dns_tcp_port"] - local direct_dns_doh_url = var["-direct_dns_doh_url"] - local direct_dns_doh_host = var["-direct_dns_doh_host"] - local direct_dns_doh_ip = var["-direct_dns_doh_ip"] - local direct_dns_doh_port = var["-direct_dns_doh_port"] - local remote_dns_udp_server = var["-remote_dns_udp_server"] - local remote_dns_udp_port = var["-remote_dns_udp_port"] - local remote_dns_tcp_server = var["-remote_dns_tcp_server"] - local remote_dns_tcp_port = var["-remote_dns_tcp_port"] - local remote_dns_doh_url = var["-remote_dns_doh_url"] - local remote_dns_doh_host = var["-remote_dns_doh_host"] - local remote_dns_doh_ip = var["-remote_dns_doh_ip"] - local remote_dns_doh_port = var["-remote_dns_doh_port"] - local remote_dns_detour = var["-remote_dns_detour"] - local remote_dns_client_ip = var["-remote_dns_client_ip"] - local remote_dns_outbound_socks_address = var["-remote_dns_outbound_socks_address"] - local remote_dns_outbound_socks_port = var["-remote_dns_outbound_socks_port"] - local dns_cache = var["-dns_cache"] - local log = var["-log"] or "0" - local loglevel = var["-loglevel"] or "warn" - local logfile = var["-logfile"] or "/dev/null" - - local inbounds = {} - local outbounds = {} - local dns = nil - local route = nil - - if dns_listen_port then - route = { - rules = {} - } - - dns = { - servers = {}, - rules = {}, - disable_cache = (dns_cache and dns_cache == "0") and true or false, - disable_expire = false, --禁用 DNS 缓存过期。 - independent_cache = false, --使每个 DNS 服务器的缓存独立，以满足特殊目的。如果启用，将轻微降低性能。 - reverse_mapping = true, --在响应 DNS 查询后存储 IP 地址的反向映射以为路由目的提供域名。 - } - - if dns_out_tag == "remote" then - local out_tag = nil - if remote_dns_detour == "direct" then - out_tag = "direct-out" - table.insert(outbounds, 1, { - type = "direct", - tag = out_tag, - routing_mark = 255, - domain_strategy = (dns_query_strategy and dns_query_strategy ~= "UseIP") and "ipv4_only" or "prefer_ipv6", - }) - else - if remote_dns_outbound_socks_address and remote_dns_outbound_socks_port then - out_tag = "remote-out" - table.insert(outbounds, 1, { - type = "socks", - tag = out_tag, - server = remote_dns_outbound_socks_address, - server_port = tonumber(remote_dns_outbound_socks_port), - }) - end - end - - local server = { - tag = dns_out_tag, - address_strategy = "prefer_ipv4", - strategy = (dns_query_strategy and dns_query_strategy ~= "UseIP") and "ipv4_only" or "prefer_ipv6", - detour = out_tag, - } - - if remote_dns_udp_server then - local server_port = tonumber(remote_dns_udp_port) or 53 - server.address = "udp://" .. remote_dns_udp_server .. ":" .. server_port - end - - if remote_dns_tcp_server then - local server_port = tonumber(remote_dns_tcp_port) or 53 - server.address = "tcp://" .. remote_dns_tcp_server .. ":" .. server_port - end - - if remote_dns_doh_url then - server.address = remote_dns_doh_url - end - - table.insert(dns.servers, server) - - route.final = out_tag - elseif dns_out_tag == "direct" then - local out_tag = "direct-out" - table.insert(outbounds, 1, { - type = "direct", - tag = out_tag, - routing_mark = 255, - domain_strategy = (dns_query_strategy and dns_query_strategy ~= "UseIP") and "ipv4_only" or "prefer_ipv6", - }) - - local server = { - tag = dns_out_tag, - address_strategy = "prefer_ipv6", - strategy = (dns_query_strategy and dns_query_strategy ~= "UseIP") and "ipv4_only" or "prefer_ipv6", - detour = out_tag, - client_subnet = (remote_dns_client_ip and remote_dns_client_ip ~= "") and remote_dns_client_ip or nil, - } - - if direct_dns_udp_server then - local server_port = tonumber(direct_dns_udp_port) or 53 - server.address = "udp://" .. direct_dns_udp_server .. ":" .. server_port - end - - if direct_dns_tcp_server then - local server_port = tonumber(direct_dns_tcp_port) or 53 - server.address = "tcp://" .. direct_dns_tcp_server .. ":" .. server_port - end - - if direct_dns_doh_url then - server.address = direct_dns_doh_url - end - - table.insert(dns.servers, server) - - route.final = out_tag - end - - table.insert(inbounds, { - type = "direct", - tag = "dns-in", - listen = "127.0.0.1", - listen_port = tonumber(dns_listen_port), - sniff = true, - }) - - table.insert(outbounds, { - type = "dns", - tag = "dns-out", - }) - - table.insert(route.rules, 1, { - protocol = "dns", - inbound = { - "dns-in" - }, - outbound = "dns-out" - }) - end - - if inbounds or outbounds then - local config = { - log = { - disabled = log == "0" and true or false, - level = loglevel, - timestamp = true, - output = logfile, - }, - -- DNS - dns = dns, - -- 传入连接 - inbounds = inbounds, - -- 传出连接 - outbounds = outbounds, - -- 路由 - route = route - } - return jsonc.stringify(config, 1) - end - -end - _G.gen_config = gen_config _G.gen_proto_config = gen_proto_config -_G.gen_dns_config = gen_dns_config if arg[1] then local func =_G[arg[1]] diff --git a/luci-app-passwall2/luasrc/passwall2/util_xray.lua b/luci-app-passwall2/luasrc/passwall2/util_xray.lua index d8cbd949d..943d59f8c 100644 --- a/luci-app-passwall2/luasrc/passwall2/util_xray.lua +++ b/luci-app-passwall2/luasrc/passwall2/util_xray.lua @@ -715,7 +715,7 @@ function gen_config(var) local blc_node_tag = "blc-" .. blc_node_id local is_new_blc_node = true for _, outbound in ipairs(outbounds) do - if outbound.tag:find("^" .. blc_node_tag) == 1 then + if string.sub(outbound.tag, 1, #blc_node_tag) == blc_node_tag then is_new_blc_node = false valid_nodes[#valid_nodes + 1] = outbound.tag break @@ -740,7 +740,7 @@ function gen_config(var) if fallback_node_id then local is_new_node = true for _, outbound in ipairs(outbounds) do - if outbound.tag:find("^" .. fallback_node_id) == 1 then + if string.sub(outbound.tag, 1, #fallback_node_id) == fallback_node_id then is_new_node = false fallback_node_tag = outbound.tag break diff --git a/luci-app-passwall2/root/usr/share/passwall2/app.sh b/luci-app-passwall2/root/usr/share/passwall2/app.sh index ed19cdf02..f07d50ab5 100755 --- a/luci-app-passwall2/root/usr/share/passwall2/app.sh +++ b/luci-app-passwall2/root/usr/share/passwall2/app.sh @@ -1238,6 +1238,8 @@ start() { get_config export V2RAY_LOCATION_ASSET=$(config_t_get global_rules v2ray_location_asset "/usr/share/v2ray/") export XRAY_LOCATION_ASSET=$V2RAY_LOCATION_ASSET + export ENABLE_DEPRECATED_GEOSITE=true + export ENABLE_DEPRECATED_GEOIP=true ulimit -n 65535 start_haproxy start_socks diff --git a/luci-app-passwall2/root/usr/share/passwall2/haproxy_check.sh b/luci-app-passwall2/root/usr/share/passwall2/haproxy_check.sh index 53a43cc5d..dfbcbf65c 100755 --- a/luci-app-passwall2/root/usr/share/passwall2/haproxy_check.sh +++ b/luci-app-passwall2/root/usr/share/passwall2/haproxy_check.sh @@ -9,20 +9,21 @@ probe_file="/tmp/etc/passwall2/haproxy/Probe_URL" probeUrl="https://www.google.com/generate_204" if [ -f "$probe_file" ]; then firstLine=$(head -n 1 "$probe_file" | tr -d ' \t') - if [ -n "$firstLine" ]; then - probeUrl="$firstLine" - fi + [ -n "$firstLine" ] && probeUrl="$firstLine" fi -status=$(/usr/bin/curl -I -o /dev/null -skL -x socks5h://${server_address}:${server_port} --connect-timeout 3 --retry 3 -w %{http_code} "${probeUrl}") +extra_params="-x socks5h://${server_address}:${server_port}" +if /usr/bin/curl --help all | grep -q "\-\-retry-all-errors"; then + extra_params="${extra_params} --retry-all-errors" +fi + +status=$(/usr/bin/curl -I -o /dev/null -skL ${extra_params} --connect-timeout 3 --retry 1 -w "%{http_code}" "${probeUrl}") + case "$status" in - 204|\ - 200) - status=200 + 200|204) + exit 0 + ;; + *) + exit 1 ;; esac -return_code=1 -if [ "$status" = "200" ]; then - return_code=0 -fi -exit ${return_code} diff --git a/luci-app-passwall2/root/usr/share/passwall2/socks_auto_switch.sh b/luci-app-passwall2/root/usr/share/passwall2/socks_auto_switch.sh index b3c174189..85d81353f 100755 --- a/luci-app-passwall2/root/usr/share/passwall2/socks_auto_switch.sh +++ b/luci-app-passwall2/root/usr/share/passwall2/socks_auto_switch.sh @@ -24,9 +24,10 @@ test_url() { local timeout=2 [ -n "$3" ] && timeout=$3 local extra_params=$4 - curl --help all | grep "\-\-retry-all-errors" > /dev/null - [ $? == 0 ] && extra_params="--retry-all-errors ${extra_params}" - status=$(/usr/bin/curl -I -o /dev/null -skL --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36" ${extra_params} --connect-timeout ${timeout} --retry ${try} -w %{http_code} "$url") + if /usr/bin/curl --help all | grep -q "\-\-retry-all-errors"; then + extra_params="--retry-all-errors ${extra_params}" + fi + status=$(/usr/bin/curl -I -o /dev/null -skL ${extra_params} --connect-timeout ${timeout} --retry ${try} -w %{http_code} "$url") case "$status" in 204) status=200