From a8e9876ce2bc7ade5ea2e17ba193e8f147fdfcf1 Mon Sep 17 00:00:00 2001
From: Shreyas Zare <shreyas@technitium.com>
Date: Sat, 29 Dec 2018 16:40:55 +0530
Subject: [PATCH] webapp: dns server local addresses feature implemented.

---
 DnsServerCore/www/index.html | 14 ++++++++---
 DnsServerCore/www/js/main.js | 48 ++++++++++++++++++++++++++----------
 2 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/DnsServerCore/www/index.html b/DnsServerCore/www/index.html
index 95d767e9..47a51a63 100644
--- a/DnsServerCore/www/index.html
+++ b/DnsServerCore/www/index.html
@@ -762,13 +762,21 @@
                                                     </div>
                                                 </div>
 
-                                                <div class="form-group" style="margin-bottom: 0px;">
+                                                <div class="form-group">
                                                     <label for="txtWebServicePort" class="col-sm-3 control-label">Web Service Port</label>
                                                     <div class="col-sm-6">
-                                                        <input type="number" class="form-control" id="txtWebServicePort" placeholder="Web Service Port" style="width: 100px; margin-bottom: 8px;">
-                                                        <div>To apply web service port changes, you need to manually restart the main service.</div>
+                                                        <input type="number" class="form-control" id="txtWebServicePort" placeholder="Web Service Port" style="width: 100px;">
                                                     </div>
                                                 </div>
+
+                                                <div class="form-group">
+                                                    <label for="txtdnsServerLocalAddresses" class="col-sm-3 control-label">DNS Server Local Addresses</label>
+                                                    <div class="col-sm-6">
+                                                        <textarea id="txtdnsServerLocalAddresses" class="form-control" rows="3"></textarea>
+                                                    </div>
+                                                </div>
+
+                                                <div>To apply web service port and DNS Server local address changes, you need to manually restart the main service.</div>
                                             </div>
 
                                             <div class="well well-sm">
diff --git a/DnsServerCore/www/js/main.js b/DnsServerCore/www/js/main.js
index b8edb229..b1a5855b 100644
--- a/DnsServerCore/www/js/main.js
+++ b/DnsServerCore/www/js/main.js
@@ -176,20 +176,22 @@ $(function () {
 
     $("#optQuickForwarders").change(function () {
 
-        if (($('input[name=rdProxyType]:checked').val() === "Socks5") && ($("#txtProxyAddress").val() === "127.0.0.1") && ($("#txtProxyPort").val() === "9150")) {
-            $("#rdProxyTypeNone").prop("checked", true);
-            $("#txtProxyAddress").prop("disabled", true);
-            $("#txtProxyPort").prop("disabled", true);
-            $("#txtProxyUsername").prop("disabled", true);
-            $("#txtProxyPassword").prop("disabled", true);
-            $("#txtProxyAddress").val("");
-            $("#txtProxyPort").val("");
-            $("#txtProxyUsername").val("");
-            $("#txtProxyPassword").val("");
-        }
-
         var selectedOption = $("#optQuickForwarders").val();
 
+        if (selectedOption !== "blank") {
+            if (($('input[name=rdProxyType]:checked').val() === "Socks5") && ($("#txtProxyAddress").val() === "127.0.0.1") && ($("#txtProxyPort").val() === "9150")) {
+                $("#rdProxyTypeNone").prop("checked", true);
+                $("#txtProxyAddress").prop("disabled", true);
+                $("#txtProxyPort").prop("disabled", true);
+                $("#txtProxyUsername").prop("disabled", true);
+                $("#txtProxyPassword").prop("disabled", true);
+                $("#txtProxyAddress").val("");
+                $("#txtProxyPort").val("");
+                $("#txtProxyUsername").val("");
+                $("#txtProxyPassword").val("");
+            }
+        }
+
         switch (selectedOption) {
             case "cloudflare-udp":
                 $("#txtForwarders").val("1.1.1.1\r\n1.0.0.1");
@@ -504,6 +506,19 @@ function loadDnsSettings() {
 
             $("#txtWebServicePort").val(responseJSON.response.webServicePort);
 
+            var dnsServerLocalAddresses = responseJSON.response.dnsServerLocalAddresses;
+            if (dnsServerLocalAddresses == null) {
+                $("#txtdnsServerLocalAddresses").val("0.0.0.0");
+            }
+            else {
+                var value = "";
+
+                for (var i = 0; i < dnsServerLocalAddresses.length; i++)
+                    value += dnsServerLocalAddresses[i] + "\r\n";
+
+                $("#txtdnsServerLocalAddresses").val(value);
+            }
+
             $("#chkPreferIPv6").prop("checked", responseJSON.response.preferIPv6);
             $("#chkLogQueries").prop("checked", responseJSON.response.logQueries);
             $("#chkAllowRecursion").prop("checked", responseJSON.response.allowRecursion);
@@ -638,6 +653,13 @@ function saveDnsSettings() {
         return false;
     }
 
+    var dnsServerLocalAddresses = cleanTextList($("#txtdnsServerLocalAddresses").val());
+
+    if ((dnsServerLocalAddresses.length === 0) || (dnsServerLocalAddresses === ","))
+        dnsServerLocalAddresses = "0.0.0.0,::";
+    else
+        $("#txtdnsServerLocalAddresses").val(dnsServerLocalAddresses.replace(/,/g, "\n"));
+
     var preferIPv6 = $("#chkPreferIPv6").prop('checked');
     var logQueries = $("#chkLogQueries").prop('checked');
     var allowRecursion = $("#chkAllowRecursion").prop('checked');
@@ -674,7 +696,7 @@ function saveDnsSettings() {
     var btn = $("#btnSaveDnsSettings").button('loading');
 
     HTTPRequest({
-        url: "/api/setDnsSettings?token=" + token + "&serverDomain=" + serverDomain + "&webServicePort=" + webServicePort + "&preferIPv6=" + preferIPv6 + "&logQueries=" + logQueries + "&allowRecursion=" + allowRecursion + "&allowRecursionOnlyForPrivateNetworks=" + allowRecursionOnlyForPrivateNetworks + proxy + "&forwarders=" + forwarders + "&forwarderProtocol=" + forwarderProtocol + "&blockListUrls=" + blockListUrls,
+        url: "/api/setDnsSettings?token=" + token + "&serverDomain=" + serverDomain + "&webServicePort=" + webServicePort + "&dnsServerLocalAddresses=" + dnsServerLocalAddresses + "&preferIPv6=" + preferIPv6 + "&logQueries=" + logQueries + "&allowRecursion=" + allowRecursion + "&allowRecursionOnlyForPrivateNetworks=" + allowRecursionOnlyForPrivateNetworks + proxy + "&forwarders=" + forwarders + "&forwarderProtocol=" + forwarderProtocol + "&blockListUrls=" + blockListUrls,
         success: function (responseJSON) {
             document.title = "Technitium DNS Server " + responseJSON.response.version + " - " + responseJSON.response.serverDomain;
             $("#lblServerDomain").text(" - " + responseJSON.response.serverDomain);