#4324

vernesong · Feb 18, 2025 · 600dc48 · 600dc48
1 parent 4333c67
commit 600dc48
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/luci-app-openclash/po/zh-cn/openclash.zh-cn.po b/luci-app-openclash/po/zh-cn/openclash.zh-cn.po
@@ -3378,6 +3378,15 @@ msgstr "强制覆盖 DNS 查询的子网区域地址"
 msgid "Tip: Respect-rules Option Need Proxy-server-nameserver Option Must Be Setted, Auto Set to"
 msgstr "提示：使用 Respect-rules 功能时 Proxy-server-nameserver 必须配置，插件将默认将其设置为"
 
+msgid "Tip: Nameserver Option Maybe All Setted The Proxy Option, Auto Set Proxy-server-nameserver Option to"
+msgstr "提示：Nameserver 选项可能全部设置了代理选项，插件已自动设置 Proxy-server-nameserver 选项为"
+
+msgid "Tip: Proxy-server-nameserver Option Maybe All Setted The Proxy Option, Auto Set Proxy-server-nameserver Option to"
+msgstr "提示：Proxy-server-nameserver 选项可能全部设置了代理选项，插件已自动为 Proxy-server-nameserver 选项添加设置"
+
+msgid "For Avoiding Proxies Server Resolve Loop..."
+msgstr "以避免代理服务器解析回环..."
+
 msgid "Tip: Config File"
 msgstr "提示：配置文件"
 

diff --git a/luci-app-openclash/root/usr/share/openclash/yml_change.sh b/luci-app-openclash/root/usr/share/openclash/yml_change.sh
@@ -788,10 +788,22 @@ begin
       Value['dns'].merge!(Value_1);
       Value['dns'].merge!(Value_2);
    end;
-   if ${33} == 1 or Value['dns']['respect-rules'].to_s == 'true' then
-      if not Value['dns'].has_key?('proxy-server-nameserver') or Value['dns']['proxy-server-nameserver'].to_a.empty? then
+   if not Value['dns'].has_key?('proxy-server-nameserver') or Value['dns']['proxy-server-nameserver'].to_a.empty? then
+      all_match = Value['dns']['nameserver'].all? { |x| x =~ /^[^#&]+#(?:(?:h3=|skip-cert-verify=|ecs=|ecs-override=)[^&]*&)*(?:(?!(?:h3=|skip-cert-verify=|ecs=|ecs-override=))[^&]+)/ }
+      if ${33} == 1 or Value['dns']['respect-rules'].to_s == 'true' or all_match then
          Value['dns'].merge!({'proxy-server-nameserver'=>['114.114.114.114','119.29.29.29','8.8.8.8','1.1.1.1']});
-         YAML.LOG('Tip: Respect-rules Option Need Proxy-server-nameserver Option Must Be Setted, Auto Set to【114.114.114.114, 119.29.29.29, 8.8.8.8, 1.1.1.1】');
+         if all_match then
+            YAML.LOG('Tip: Nameserver Option Maybe All Setted The Proxy Option, Auto Set Proxy-server-nameserver Option to【114.114.114.114, 119.29.29.29, 8.8.8.8, 1.1.1.1】For Avoiding Proxies Server Resolve Loop...');
+         else
+            YAML.LOG('Tip: Respect-rules Option Need Proxy-server-nameserver Option Must Be Setted, Auto Set to【114.114.114.114, 119.29.29.29, 8.8.8.8, 1.1.1.1】');
+         end;
+      end;
+   else
+      all_match = Value['dns']['proxy-server-nameserver'].all? { |x| x =~ /^[^#&]+#(?:(?:h3=|skip-cert-verify=|ecs=|ecs-override=)[^&]*&)*(?:(?!(?:h3=|skip-cert-verify=|ecs=|ecs-override=))[^&]+)/ }
+      if all_match then
+         Value_1={'proxy-server-nameserver'=>['114.114.114.114','119.29.29.29','8.8.8.8','1.1.1.1']};
+         Value['dns']['proxy-server-nameserver'] = Value['dns']['proxy-server-nameserver'] | Value_1['proxy-server-nameserver'];
+         YAML.LOG('Tip: Proxy-server-nameserver Option Maybe All Setted The Proxy Option, Auto Set Proxy-server-nameserver Option to【114.114.114.114, 119.29.29.29, 8.8.8.8, 1.1.1.1】For Avoiding Proxies Server Resolve Loop...');
       end;
    end;
 rescue Exception => e