OpenWrt/kenzok8-package
1
0
Fork 0
mirror of https://github.com/kenzok8/small-package synced 2025-01-08 13:27:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 2024-09-01 20:33:31

Browse Source
This commit is contained in:
kenzok8 2024-09-01 20:33:31 +08:00
parent 0ba2638aa2
commit 2a0e47d8fb
4 changed files with 19 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
View File

@ -82,66 +82,34 @@ local doh_validate = function(self, value, t)
return value
end
end
return nil, translate("DoH request address") .. " " .. translate("Format must be:") .. " URL,IP"
return nil, translatef("%s request address","DoH") .. " " .. translate("Format must be:") .. " URL,IP"
end
local chinadns_dot_validate = function(self, value, t)
local function isValidDoTString(s)
local prefix = "tls://"
if s:sub(1, #prefix) ~= prefix then
return false
end
local address = s:sub(#prefix + 1)
if s:sub(1, 6) ~= "tls://" then return false end
local address = s:sub(7)
local at_index = address:find("@")
local hash_index = address:find("#")
local domain, ip, port
if at_index then
if hash_index then
domain = address:sub(1, at_index - 1)
ip = address:sub(at_index + 1, hash_index - 1)
port = address:sub(hash_index + 1)
else
domain = address:sub(1, at_index - 1)
ip = address:sub(at_index + 1)
port = nil
end
else
if hash_index then
ip = address:sub(1, hash_index - 1)
port = address:sub(hash_index + 1)
else
ip = address
port = nil
end
end
local function isValidPort(port)
if not port then return true end
local num = tonumber(port)
return num and num > 0 and num < 65536
end
local function isValidDomain(domain)
if not domain then return true end
return #domain > 0
end
local function isValidIP(ip)
return datatypes.ipaddr(ip) or datatypes.ip6addr(ip)
end
if not isValidIP(ip) or not isValidPort(port) then
return false
end
if not isValidDomain(domain) then
local ip, port
local domain = at_index and address:sub(1, at_index - 1) or nil
ip = at_index and address:sub(at_index + 1, (hash_index or 0) - 1) or address:sub(1, (hash_index or 0) - 1)
port = hash_index and address:sub(hash_index + 1) or nil
local num_port = tonumber(port)
if (port and (not num_port or num_port <= 0 or num_port >= 65536)) or
(domain and domain == "") or
(not datatypes.ipaddr(ip) and not datatypes.ip6addr(ip)) then
return false
end
return true
end
if value ~= "" then
value = api.trim(value)
if isValidDoTString(value) then
return value
end
end
return nil, translate("Direct DNS") .. " DoT " .. translate("Format must be:") .. " tls://Domain@IP(#Port) or tls://IP(#Port)"
return nil, translatef("%s request address","DoT") .. " " .. translate("Format must be:") .. " tls://" .. translate("Domain") .. "@IP[#Port] | tls://IP[#Port]"
end
m:append(Template(appname .. "/global/status"))

2
luci-app-passwall/luasrc/passwall/util_xray.lua
View File

@ -1003,6 +1003,7 @@ function gen_config(var)
end
end)
--[[
if default_outbound_tag or default_balancer_tag then
table.insert(rules, {
type = "field",
@ -1011,6 +1012,7 @@ function gen_config(var)
network = "tcp,udp"
})
end
]]--
routing = {
domainStrategy = node.domainStrategy or "AsIs",

3
luci-app-passwall/po/zh-cn/passwall.po
View File

@ -142,6 +142,9 @@ msgstr "配置不当"
msgid "Make sure socks service is available on this address."
msgstr "请确保此 Socks 服务可用。"
msgid "%s request address"
msgstr "%s 请求地址"
msgid "Format must be:"
msgstr "格式必须为："

4
luci-app-passwall2/luasrc/passwall2/util_xray.lua
View File

@ -1010,7 +1010,7 @@ function gen_config(var)
end
end
end)
--[[
if default_outboundTag or default_balancerTag then
table.insert(rules, {
_flag = "default",
@ -1020,7 +1020,7 @@ function gen_config(var)
network = "tcp,udp"
})
end
]]
routing = {
domainStrategy = node.domainStrategy or "AsIs",
domainMatcher = node.domainMatcher or "hybrid",