From d040286c2eeed8fc0c9936b54b8b22b2adffacdc Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Mon, 17 Sep 2018 07:42:57 +0200
Subject: [PATCH] net/wireguard: add DNS to server config (#850)

(cherry picked from commit a466110442ae4a7006c36c983456f5bfd532dfdf)
---
 .../Wireguard/forms/dialogEditWireguardServer.xml         | 8 ++++++++
 .../opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml | 6 ++++++
 .../templates/OPNsense/Wireguard/wireguard-server.conf    | 5 ++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml
index 2b50d5543..3520a60b9 100644
--- a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml
+++ b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml
@@ -35,6 +35,14 @@
         <type>text</type>
         <help>Set port for this instance to listen on.</help>
     </field>
+    <field>
+        <id>server.dns</id>
+        <label>DNS Server</label>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <allownew>true</allownew>
+        <help>Set the interface specific DNS server.</help>
+    </field>
     <field>
         <id>server.tunneladdress</id>
         <label>Tunnel Address</label>
diff --git a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml
index f60519d24..de52efe72 100644
--- a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml
+++ b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml
@@ -31,6 +31,12 @@
                     <default>51820</default>
                     <Required>Y</Required>
                 </port>
+                <dns type="CSVListField">
+                    <Required>N</Required>
+                    <mask>/^([a-fA-F0-9\.:\[\]]*?,)*([a-fA-F0-9\.:\[\]]*)$/</mask>
+                    <ValidationMessage>Please use valid IPv4 or IPv6 addresses.</ValidationMessage>
+
+                </dns>
                 <tunneladdress type="NetworkField">
                     <default></default>
                     <FieldSeparator>,</FieldSeparator>
diff --git a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf
index ca3e5a84d..ebd19b18a 100644
--- a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf
+++ b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf
@@ -6,12 +6,15 @@
 {%       if server_list.enabled == '1' %}
 [Interface]
 Address = {{ server_list.tunneladdress }}
-PrivateKey = {{ server_list.privkey }}
+{%         if server_list.dns|default('') != '' %}
+DNS = {{ server_list.dns }}
+{%         endif %}
 ListenPort = {{ server_list.port }}
 {%         if server_list.peers|default('') != '' %}
 {%           for peerlist in server_list.peers.split(",") %}
 {%             set peerlist2_data = helpers.getUUID(peerlist) %}
 {%             if peerlist2_data != {} and peerlist2_data.enabled == '1' %}
+PrivateKey = {{ server_list.privkey }}
 [Peer]
 PublicKey = {{ peerlist2_data.pubkey }}
 AllowedIPs = {{ peerlist2_data.tunneladdress }}