From b5318086d2153aa1325603bda24aaffe5cf36bc0 Mon Sep 17 00:00:00 2001
From: Bernd Storath <32197462+kaaax0815@users.noreply.github.com>
Date: Fri, 25 Jul 2025 11:26:16 +0200
Subject: [PATCH] Fix: Remove dns if empty (#2057)

remove dns if empty
---
 src/server/utils/wgHelper.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/server/utils/wgHelper.ts b/src/server/utils/wgHelper.ts
index 6d096e99..51fa0ce2 100644
--- a/src/server/utils/wgHelper.ts
+++ b/src/server/utils/wgHelper.ts
@@ -85,14 +85,19 @@ PostDown = ${iptablesTemplate(hooks.postDown, wgInterface)}`;
       client.postUp ? `PostUp = ${client.postUp}` : null,
       client.preDown ? `PreDown = ${client.preDown}` : null,
       client.postDown ? `PostDown = ${client.postDown}` : null,
-    ].filter((v) => v !== null);
+    ];
+
+    const dnsServers = client.dns ?? userConfig.defaultDns;
+    const dnsLine =
+      dnsServers.length > 0 ? `DNS = ${dnsServers.join(', ')}` : null;
+
+    const extraLines = [dnsLine, ...hookLines].filter((v) => v !== null);
 
     return `[Interface]
 PrivateKey = ${client.privateKey}
 Address = ${address}
-DNS = ${(client.dns ?? userConfig.defaultDns).join(', ')}
 MTU = ${client.mtu}
-${hookLines.length ? `${hookLines.join('\n')}\n` : ''}
+${extraLines.length ? `${extraLines.join('\n')}\n` : ''}
 [Peer]
 PublicKey = ${wgInterface.publicKey}
 PresharedKey = ${client.preSharedKey}