update 2026-05-23 14:30:42

luci-app-ssr-plus/root/etc/init.d/shadowsocksr

@@ -2271,16 +2271,41 @@ start() {
 		echolog "禁止连接的域名加载完毕。"
 		if [ "$(uci_get_by_type global adblock 0)" == "1" ]; then
 			echolog "未启动主节点，广告过滤正在加载。"
-			cp -f /etc/ssrplus/ad.conf $TMP_DNSMASQ_PATH/
+			cp -f /etc/ssrplus/ad.conf "$TMP_DNSMASQ_PATH/"
 			if [ -f "$TMP_DNSMASQ_PATH/ad.conf" ]; then
 				# Optimize: Batch filter using grep instead of looping sed
 				for list_file in /etc/ssrplus/black.list /etc/ssrplus/white.list /etc/ssrplus/deny.list; do
 					if [ -s "$list_file" ]; then
 						# Clean list file (remove comments and empty lines)
-						grep -vE '^\s*#|^\s*$' "$list_file" > "${list_file}.clean"
+						grep -vE '^\s*#|^\s*$' "$list_file" | sed 's/\r//g' > "${list_file}.clean"
 						if [ -s "${list_file}.clean" ]; then
-							grep -v -F -f "${list_file}.clean" "$TMP_DNSMASQ_PATH/ad.conf" > "$TMP_DNSMASQ_PATH/ad.conf.tmp"
-							mv "$TMP_DNSMASQ_PATH/ad.conf.tmp" "$TMP_DNSMASQ_PATH/ad.conf"
+							tmp_file="$TMP_DNSMASQ_PATH/ad.conf.tmp"
+							awk -v list="${list_file}.clean" '
+							BEGIN {
+								while ((getline line < list) > 0) {
+									gsub(/\r/, "", line)
+									if (line != "") {
+										domain[line] = 1
+										# 支持泛域名
+										domain["*." line] = 1
+									}
+								}
+								close(list)
+							}
+							{
+								keep = 1
+								# 匹配 server=/domain/
+								if (match($0, /^server=\/([^\/]+)\//, m)) {
+									if (m[1] in domain) keep = 0
+								}
+								# 匹配 ipset=/domain/
+								if (match($0, /^ipset=\/([^\/]+)\//, m)) {
+									if (m[1] in domain) keep = 0
+								}
+								if (keep) print
+							}
+							' "$TMP_DNSMASQ_PATH/ad.conf" > "$tmp_file"
+							mv "$tmp_file" "$TMP_DNSMASQ_PATH/ad.conf"
 						fi
 						rm -f "${list_file}.clean"
 					fi

luci-app-ssr-plus/root/usr/share/shadowsocksr/gfw2ipset.sh

@@ -45,13 +45,37 @@ done
 # Optimize: Batch filter using grep
 for list_file in /etc/ssrplus/black.list /etc/ssrplus/white.list /etc/ssrplus/deny.list; do
 	if [ -s "$list_file" ]; then
-		grep -vE '^\s*#|^\s*$' "$list_file" > "${list_file}.clean"
+		# 清理注释和空行
+		grep -vE '^\s*#|^\s*$' "$list_file" | sed 's/\r//g' > "${list_file}.clean"
 		if [ -s "${list_file}.clean" ]; then
 			for target_file in "$TMP_DNSMASQ_PATH/gfw_list.conf" "$TMP_DNSMASQ_PATH/gfw_base.conf"; do
-				if [ -f "$target_file" ]; then
-					grep -v -F -f "${list_file}.clean" "$target_file" > "${target_file}.tmp"
-					mv "${target_file}.tmp" "$target_file"
-				fi
+				[ -f "$target_file" ] || continue
+				tmp_file="${target_file}.tmp"
+				awk -v list="${list_file}.clean" '
+				BEGIN {
+					while ((getline line < list) > 0) {
+						gsub(/\r/, "", line)
+						if (line != "") {
+							domain[line] = 1
+							# 同时支持 *.domain
+							domain["*." line] = 1
+						}
+					}
+					close(list)
+				}
+				{
+					# 提取 server=/domain/xxx
+					if (match($0, /^server=\/([^\/]+)\//, m)) {
+						if (m[1] in domain) next
+					}
+					# 提取 ipset=/domain/xxx
+					if (match($0, /^ipset=\/([^\/]+)\//, m)) {
+						if (m[1] in domain) next
+					}
+					print
+				}
+				' "$target_file" > "$tmp_file"
+				mv "$tmp_file" "$target_file"
 			done
 		fi
 		rm -f "${list_file}.clean"
@@ -69,19 +93,45 @@ fi
 cat /etc/ssrplus/deny.list | sed '/^$/d' | sed '/#/d' | sed "/.*/s/.*/address=\/&\//" >$TMP_DNSMASQ_PATH/denylist.conf
 
 if [ "$(uci_get_by_type global adblock 0)" == "1" ]; then
-	cp -f /etc/ssrplus/ad.conf $TMP_DNSMASQ_PATH/
+	cp -f /etc/ssrplus/ad.conf "$TMP_DNSMASQ_PATH/"
 	if [ -f "$TMP_DNSMASQ_PATH/ad.conf" ]; then
 		for list_file in /etc/ssrplus/black.list /etc/ssrplus/white.list /etc/ssrplus/deny.list; do
 			if [ -s "$list_file" ]; then
-				grep -vE '^\s*#|^\s*$' "$list_file" > "${list_file}.clean"
+				# 清理注释 & 空行
+				grep -vE '^\s*#|^\s*$' "$list_file" | sed 's/\r//g' > "${list_file}.clean"
 				if [ -s "${list_file}.clean" ]; then
-					grep -v -F -f "${list_file}.clean" "$TMP_DNSMASQ_PATH/ad.conf" > "$TMP_DNSMASQ_PATH/ad.conf.tmp"
-					mv "$TMP_DNSMASQ_PATH/ad.conf.tmp" "$TMP_DNSMASQ_PATH/ad.conf"
+					tmp_file="$TMP_DNSMASQ_PATH/ad.conf.tmp"
+					awk -v list="${list_file}.clean" '
+					BEGIN {
+						while ((getline line < list) > 0) {
+							gsub(/\r/, "", line)
+							if (line != "") {
+								domain[line] = 1
+								# 支持泛域名
+								domain["*." line] = 1
+							}
+						}
+						close(list)
+					}
+					{
+						keep = 1
+						# 精确匹配 server=/domain/
+						if (match($0, /^server=\/([^\/]+)\//, m)) {
+							if (m[1] in domain) keep = 0
+						}
+						# 精确匹配 ipset=/domain/
+						if (match($0, /^ipset=\/([^\/]+)\//, m)) {
+							if (m[1] in domain) keep = 0
+						}
+						if (keep) print
+					}
+					' "$TMP_DNSMASQ_PATH/ad.conf" > "$tmp_file"
+					mv "$tmp_file" "$TMP_DNSMASQ_PATH/ad.conf"
 				fi
 				rm -f "${list_file}.clean"
 			fi
 		done
 	fi
 else
-	rm -f $TMP_DNSMASQ_PATH/ad.conf
+	rm -f "$TMP_DNSMASQ_PATH/ad.conf"
 fi