update 2026-08-08 00:47:38

luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua

@@ -227,7 +227,7 @@ if USE_DIRECT_LIST == "1" and not fs.access(file_direct_host) then
 				geosite_arg = geosite_arg .. (geosite_arg ~= "" and "," or "") .. line
 			else
 				line = api.get_std_domain(line)
-				if line ~= "" and not line:find("#") then
+				if line ~= "" and not line:find("#") and not line:find(":") then
 					insert_unique(direct_domain, line, lookup_direct_domain)
 				end
 			end
@@ -277,7 +277,7 @@ if USE_PROXY_LIST == "1" and not fs.access(file_proxy_host) then
 				geosite_arg = geosite_arg .. (geosite_arg ~= "" and "," or "") .. line
 			else
 				line = api.get_std_domain(line)
-				if line ~= "" and not line:find("#") then
+				if line ~= "" and not line:find("#") and not line:find(":") then
 					insert_unique(proxy_domain, line, lookup_proxy_domain)
 				end
 			end
@@ -398,7 +398,7 @@ if IS_SHUNT_NODE then
 
 			local domain_list = s.domain_list or ""
 			for line in string.gmatch(domain_list, "[^\r\n]+") do
-				if line ~= "" and not line:find("#") and not line:find("regexp:") and not line:find("ext:") then
+				if line ~= "" and not line:find("#") and not line:find("regexp:") and not line:find("ext:") and not line:find("rule-set:") and not line:find("rs:") then
 					if line:find("geosite:") then
 						line = string.match(line, ":([^:]+)$")
 						if _node_id == "_direct" then

luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.lua

@@ -181,10 +181,15 @@ function add_rule(var)
 	local CACHE_TEXT_FILE = CACHE_DNS_PATH .. ".txt"
 	local USE_CHINADNS_NG = "0"
 	local IS_SHUNT_NODE = uci:get(appname, TCP_NODE, "protocol") == "_shunt"
+	local USE_GEOVIEW = uci:get(appname, "@global_rules[0]", "enable_geoview")
 
 	local list1 = {}
 	local excluded_domain = {}
 
+	if not api.is_finded("geoview") then
+		USE_GEOVIEW = "0"
+	end
+
 	local function log(...)
 		if NO_LOGIC_LOG == "1" then
 			return
@@ -301,6 +306,21 @@ function add_rule(var)
 		return false
 	end
 
+	local function foreach_geosite(list_arg, callback)
+		local geosite_path = uci:get(appname, "@global_rules[0]", "v2ray_location_asset") or "/usr/share/v2ray/"
+		geosite_path = geosite_path:match("^(.*)/") .. "/geosite.dat"
+		if not fs.access(geosite_path) then return end
+		local bin = api.finded_com("geoview")
+		if not (bin and list_arg) then return end
+		local cmd = string.format("%q -type geosite -action extract -input %q -list %q -lowmem=true", bin, geosite_path, list_arg)
+		local pipe = io.popen(cmd)
+		if not pipe then return end
+		for line in pipe:lines() do
+			if line ~= "" then callback(line) end
+		end
+		pipe:close()
+	end
+
 	local cache_text = ""
 	local nodes_address_md5 = sys.exec("echo -n $(uci show passwall | grep '\\.address') | md5sum")
 	local new_rules = sys.exec("echo -n $(find /usr/share/passwall/rules -type f | xargs md5sum)")
@@ -347,16 +367,28 @@ function add_rule(var)
 
 		--屏蔽列表
 		if USE_CHINADNS_NG == "0" and USE_BLOCK_LIST == "1" then
+			local geosite_arg = ""
 			local f = io.open("/usr/share/passwall/rules/block_host")
 			if f then
 				for line in f:lines() do
-					line = api.get_std_domain(line)
-					if line ~= "" and not line:find("#") and not line:find(":") then
-						set_domain_address(line, "")
+					if not line:find("#") and line:find("geosite:") then
+						line = string.match(line, ":([^:]+)$")
+						geosite_arg = geosite_arg .. (geosite_arg ~= "" and "," or "") .. line
+					else
+						line = api.get_std_domain(line)
+						if line ~= "" and not line:find("#") and not line:find(":") then
+							set_domain_address(line, "")
+						end
 					end
 				end
 				f:close()
 			end
+			if USE_GEOVIEW == "1" and geosite_arg ~= "" then
+				foreach_geosite(geosite_arg, function(line)
+					set_domain_address(line, "")
+				end)
+				log("  - 解析[屏蔽列表] Geosite 到屏蔽域名表(blocklist)完成")
+			end
 		end
 
 		local fwd_dns
@@ -400,88 +432,124 @@ function add_rule(var)
 
 		--直连（白名单）列表
 		if USE_DIRECT_LIST == "1" then
-			if fs.access("/usr/share/passwall/rules/direct_host") then
-				fwd_dns = LOCAL_DNS
-				if USE_CHINADNS_NG == "1" then
-					fwd_dns = nil
-				end
-				if fwd_dns then
-					local sets = {
-						setflag_4 .. "psw_white",
-						setflag_6 .. "psw_white6"
-					}
-					--始终用国内DNS解析直连（白名单）列表
-					for line in io.lines("/usr/share/passwall/rules/direct_host") do
-						line = api.get_std_domain(line)
-						if line ~= "" and not line:find("#") and not line:find(":") then
-							add_excluded_domain(line)
-							set_domain_dns(line, fwd_dns)
-							set_domain_ipset(line, table.concat(sets, ","))
+			fwd_dns = LOCAL_DNS
+			if USE_CHINADNS_NG == "1" then
+				fwd_dns = nil
+			end
+			if fwd_dns then
+				local sets = {
+					setflag_4 .. "psw_white",
+					setflag_6 .. "psw_white6"
+				}
+				--始终用国内DNS解析直连（白名单）列表
+				local geosite_arg = ""
+				local f = io.open("/usr/share/passwall/rules/direct_host")
+				if f then
+					for line in f:lines() do
+						if not line:find("#") and line:find("geosite:") then
+							line = string.match(line, ":([^:]+)$")
+							geosite_arg = geosite_arg .. (geosite_arg ~= "" and "," or "") .. line
+						else
+							line = api.get_std_domain(line)
+							if line ~= "" and not line:find("#") and not line:find(":") then
+								add_excluded_domain(line)
+								set_domain_dns(line, fwd_dns)
+								set_domain_ipset(line, table.concat(sets, ","))
+							end
 						end
 					end
+					f:close()
 					log(string.format("  - 域名白名单(whitelist)：%s", fwd_dns or "默认"))
 				end
+				if USE_GEOVIEW == "1" and geosite_arg ~= "" then
+					foreach_geosite(geosite_arg, function(line)
+						add_excluded_domain(line)
+						set_domain_dns(line, fwd_dns)
+						set_domain_ipset(line, table.concat(sets, ","))
+					end)
+					log("  - 解析[直连列表] Geosite 到域名白名单(whitelist)完成")
+				end
 			end
 		end
 
 		--代理（黑名单）列表
 		if USE_PROXY_LIST == "1" then
-			if fs.access("/usr/share/passwall/rules/proxy_host") then
-				fwd_dns = TUN_DNS
-				if USE_CHINADNS_NG == "1" then
-					fwd_dns = nil
+			fwd_dns = TUN_DNS
+			if USE_CHINADNS_NG == "1" then
+				fwd_dns = nil
+			end
+			if fwd_dns then
+				local set_name = "psw_black"
+				local set6_name = "psw_black6"
+				if FLAG ~= "default" then
+					set_name = "psw_" .. FLAG .. "_black"
+					set6_name = "psw_" .. FLAG .. "_black6"
 				end
-				if fwd_dns then
-					local set_name = "psw_black"
-					local set6_name = "psw_black6"
-					if FLAG ~= "default" then
-						set_name = "psw_" .. FLAG .. "_black"
-						set6_name = "psw_" .. FLAG .. "_black6"
-					end
-					local sets = {
-						setflag_4 .. set_name
-					}
-					if NO_PROXY_IPV6 ~= "1" then
-						table.insert(sets, setflag_6 .. set6_name)
-					end
-					--始终使用远程DNS解析代理（黑名单）列表
-					for line in io.lines("/usr/share/passwall/rules/proxy_host") do
-						line = api.get_std_domain(line)
-						if line ~= "" and not line:find("#") and not line:find(":") then
-							add_excluded_domain(line)
-							if NO_PROXY_IPV6 == "1" then
-								set_domain_address(line, "::")
+				local sets = {
+					setflag_4 .. set_name
+				}
+				if NO_PROXY_IPV6 ~= "1" then
+					table.insert(sets, setflag_6 .. set6_name)
+				end
+				--始终使用远程DNS解析代理（黑名单）列表
+				local geosite_arg = ""
+				local f = io.open("/usr/share/passwall/rules/proxy_host")
+				if f then
+					for line in f:lines() do
+						if not line:find("#") and line:find("geosite:") then
+							line = string.match(line, ":([^:]+)$")
+							geosite_arg = geosite_arg .. (geosite_arg ~= "" and "," or "") .. line
+						else
+							line = api.get_std_domain(line)
+							if line ~= "" and not line:find("#") and not line:find(":") then
+								add_excluded_domain(line)
+								if NO_PROXY_IPV6 == "1" then
+									set_domain_address(line, "::")
+								end
+								set_domain_dns(line, fwd_dns)
+								set_domain_ipset(line, table.concat(sets, ","))
 							end
-							set_domain_dns(line, fwd_dns)
-							set_domain_ipset(line, table.concat(sets, ","))
 						end
 					end
+					f:close()
 					log(string.format("  - 代理域名表(blacklist)：%s", fwd_dns or "默认"))
 				end
+				if USE_GEOVIEW == "1" and geosite_arg ~= "" then
+					foreach_geosite(geosite_arg, function(line)
+						add_excluded_domain(line)
+						if NO_PROXY_IPV6 == "1" then
+							set_domain_address(line, "::")
+						end
+						set_domain_dns(line, fwd_dns)
+						set_domain_ipset(line, table.concat(sets, ","))
+					end)
+					log("  - 解析[代理列表] Geosite 到代理域名表(blacklist)完成")
+				end
 			end
 		end
 
 		--GFW列表
 		if USE_GFW_LIST == "1" then
-			if fs.access("/usr/share/passwall/rules/gfwlist") then
-				fwd_dns = TUN_DNS
-				if USE_CHINADNS_NG == "1" then
-					fwd_dns = nil
+			fwd_dns = TUN_DNS
+			if USE_CHINADNS_NG == "1" then
+				fwd_dns = nil
+			end
+			if fwd_dns then
+				local set_name = "psw_gfw"
+				local set6_name = "psw_gfw6"
+				if FLAG ~= "default" then
+					set_name = "psw_" .. FLAG .. "_gfw"
+					set6_name = "psw_" .. FLAG .. "_gfw6"
 				end
-				if fwd_dns then
-					local set_name = "psw_gfw"
-					local set6_name = "psw_gfw6"
-					if FLAG ~= "default" then
-						set_name = "psw_" .. FLAG .. "_gfw"
-						set6_name = "psw_" .. FLAG .. "_gfw6"
-					end
-					local sets = {
-						setflag_4 .. set_name
-					}
-					if NO_PROXY_IPV6 ~= "1" then
-						table.insert(sets, setflag_6 .. set6_name)
-					end
-					for line in io.lines("/usr/share/passwall/rules/gfwlist") do
+				local sets = {
+					setflag_4 .. set_name
+				}
+				if NO_PROXY_IPV6 ~= "1" then
+					table.insert(sets, setflag_6 .. set6_name)
+				end
+				local f = io.open("/usr/share/passwall/rules/gfwlist")
+				if f then
+					for line in f:lines() do
 						if line ~= "" and not line:find("#") and not check_excluded_domain(line) then
 							if NO_PROXY_IPV6 == "1" then
 								set_domain_address(line, "::")
@@ -494,6 +562,7 @@ function add_rule(var)
 							set_domain_ipset(line, table.concat(sets, ","))
 						end
 					end
+					f:close()
 					log(string.format("  - 防火墙域名表(gfwlist)：%s", fwd_dns or "默认"))
 				end
 			end
@@ -501,30 +570,31 @@ function add_rule(var)
 
 		--中国列表
 		if CHN_LIST ~= "0" then
-			if fs.access("/usr/share/passwall/rules/chnlist") then
+			fwd_dns = nil
+			if CHN_LIST == "direct" then
+				fwd_dns = LOCAL_DNS
+			end
+			if CHN_LIST == "proxy" then
+				fwd_dns = TUN_DNS
+			end
+			if USE_CHINADNS_NG == "1" then
 				fwd_dns = nil
-				if CHN_LIST == "direct" then
-					fwd_dns = LOCAL_DNS
-				end
+			end
+			if fwd_dns then
+				local sets = {
+					setflag_4 .. "psw_chn",
+					setflag_6 .. "psw_chn6"
+				}
 				if CHN_LIST == "proxy" then
-					fwd_dns = TUN_DNS
-				end
-				if USE_CHINADNS_NG == "1" then
-					fwd_dns = nil
-				end
-				if fwd_dns then
-					local sets = {
-						setflag_4 .. "psw_chn",
-						setflag_6 .. "psw_chn6"
-					}
-					if CHN_LIST == "proxy" then
-						if NO_PROXY_IPV6 == "1" then
-							sets = {
-								setflag_4 .. "psw_chn"
-							}
-						end
+					if NO_PROXY_IPV6 == "1" then
+						sets = {
+							setflag_4 .. "psw_chn"
+						}
 					end
-					for line in io.lines("/usr/share/passwall/rules/chnlist") do
+				end
+				local f = io.open("/usr/share/passwall/rules/chnlist")
+				if f then
+					for line in f:lines() do
 						if line ~= "" and not line:find("#") and not check_excluded_domain(line) then
 							if CHN_LIST == "proxy" and NO_PROXY_IPV6 == "1" then
 								set_domain_address(line, "::")
@@ -537,6 +607,7 @@ function add_rule(var)
 							set_domain_ipset(line, table.concat(sets, ","))
 						end
 					end
+					f:close()
 					log(string.format("  - 中国域名表(chnroute)：%s", fwd_dns or "默认"))
 				end
 			end
@@ -590,21 +661,40 @@ function add_rule(var)
 					end
 
 					local domain_list = s.domain_list or ""
+					local geosite_arg = ""
 					for line in string.gmatch(domain_list, "[^\r\n]+") do
-						if line ~= "" and not line:find("#") and not line:find("regexp:") and not line:find("geosite:") and not line:find("ext:") then
-							if line:find("domain:") or line:find("full:") then
+						if line ~= "" and not line:find("#") and not line:find("regexp:") and not line:find("ext:") and not line:find("rule-set:") and not line:find("rs:") then
+							if line:find("geosite:") then
 								line = string.match(line, ":([^:]+)$")
-							end
-							line = api.get_std_domain(line)
-							add_excluded_domain(line)
+								geosite_arg = geosite_arg .. (geosite_arg ~= "" and "," or "") .. line
+							else
+								if line:find("domain:") or line:find("full:") then
+									line = string.match(line, ":([^:]+)$")
+								end
+								line = api.get_std_domain(line)
+								add_excluded_domain(line)
 
+								if no_ipv6 then
+									set_domain_address(line, "::")
+								end
+								set_domain_dns(line, fwd_dns)
+								set_domain_ipset(line, table.concat(sets, ","))
+							end
+						end
+					end
+
+					if USE_GFW_LIST == "1" and CHN_LIST == "0" and USE_GEOVIEW == "1" and geosite_arg ~= "" then  --仅GFW模式解析geosite
+						foreach_geosite(geosite_arg, function(line)
+							add_excluded_domain(line)
 							if no_ipv6 then
 								set_domain_address(line, "::")
 							end
 							set_domain_dns(line, fwd_dns)
 							set_domain_ipset(line, table.concat(sets, ","))
-						end
+						end)
+						log(string.format("  - 解析分流规则(%s) Geosite 完成", s.remarks))
 					end
+
 					if _node_id ~= "_direct" then
 						log(string.format("  - Sing-Box/Xray分流规则(%s)：%s", s.remarks, fwd_dns or "默认"))
 					end

luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua

@@ -388,7 +388,7 @@ if USE_DIRECT_LIST == "1" and not fs.access(file_direct_host) then
 				geosite_arg = geosite_arg .. (geosite_arg ~= "" and "," or "") .. line
 			else
 				line = api.get_std_domain(line)
-				if line ~= "" and not line:find("#") then
+				if line ~= "" and not line:find("#") and not line:find(":") then
 					insert_unique(direct_domain, line, lookup_direct_domain)
 				end
 			end
@@ -440,7 +440,7 @@ if USE_PROXY_LIST == "1" and not fs.access(file_proxy_host) then
 				geosite_arg = geosite_arg .. (geosite_arg ~= "" and "," or "") .. line
 			else
 				line = api.get_std_domain(line)
-				if line ~= "" and not line:find("#") then
+				if line ~= "" and not line:find("#") and not line:find(":") then
 					insert_unique(proxy_domain, line, lookup_proxy_domain)
 				end
 			end
@@ -566,7 +566,7 @@ if IS_SHUNT_NODE then
 
 			local domain_list = s.domain_list or ""
 			for line in string.gmatch(domain_list, "[^\r\n]+") do
-				if line ~= "" and not line:find("#") and not line:find("regexp:") and not line:find("ext:") then
+				if line ~= "" and not line:find("#") and not line:find("regexp:") and not line:find("ext:") and not line:find("rule-set:") and not line:find("rs:") then
 					if line:find("geosite:") then
 						line = string.match(line, ":([^:]+)$")
 						if _node_id == "_direct" then