From cf3fdd99ce79ef6f2ede17aef513731b081c9a57 Mon Sep 17 00:00:00 2001
From: Shreyas Zare <shreyas@technitium.com>
Date: Sun, 17 Jun 2018 23:22:29 +0530
Subject: [PATCH] Dns web app: DNS-over-HTTPS options implemented.

---
 DnsServerCore/www/index.html | 23 ++++++++++++++++++++---
 DnsServerCore/www/js/main.js | 25 +++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/DnsServerCore/www/index.html b/DnsServerCore/www/index.html
index adf6b36d..1bab4299 100644
--- a/DnsServerCore/www/index.html
+++ b/DnsServerCore/www/index.html
@@ -401,7 +401,7 @@
                                         <div class="form-group">
                                             <label for="txtDnsClientNameServer">Server</label>
                                             <div class="input-group dropdown">
-                                                <input type="text" class="form-control dropdown-toggle" style="width: 180px;" id="txtDnsClientNameServer" value="This Server (this-server)">
+                                                <input type="text" class="form-control dropdown-toggle" style="width: 240px;" id="txtDnsClientNameServer" value="This Server (this-server)">
                                                 <ul class="dropdown-menu" id="optDnsClientNameServers">
                                                     <li><a href="#">This Server (this-server)</a></li>
                                                     <li><a href="#">Cloudflare (1.1.1.1)</a></li>
@@ -412,10 +412,13 @@
                                                     <li><a href="#">Cloudflare TLS (1.0.0.1:853)</a></li>
                                                     <li><a href="#">Cloudflare TLS ([2606:4700:4700::1111]:853)</a></li>
                                                     <li><a href="#">Cloudflare TLS ([2606:4700:4700::1001]:853)</a></li>
+                                                    <li><a href="#">Cloudflare HTTPS (https://cloudflare-dns.com/dns-query)</a></li>
+                                                    <li><a href="#">Cloudflare HTTPS-JSON (https://cloudflare-dns.com/dns-query)</a></li>
                                                     <li><a href="#">Google (8.8.8.8)</a></li>
                                                     <li><a href="#">Google (8.8.4.4)</a></li>
                                                     <li><a href="#">Google ([2001:4860:4860::8888])</a></li>
                                                     <li><a href="#">Google ([2001:4860:4860::8844])</a></li>
+                                                    <li><a href="#">Google HTTPS-JSON (https://dns.google.com/resolve)</a></li>
                                                     <li><a href="#">IBM Quad9 Secure (9.9.9.9)</a></li>
                                                     <li><a href="#">IBM Quad9 Secure ([2620:fe::fe])</a></li>
                                                     <li><a href="#">IBM Quad9 Secure TLS (9.9.9.9:853)</a></li>
@@ -453,7 +456,7 @@
 
                                         <div class="form-group">
                                             <label for="txtDnsClientDomain">Domain</label>
-                                            <input type="text" class="form-control" style="width: 210px;" id="txtDnsClientDomain" placeholder="example.com">
+                                            <input type="text" class="form-control" style="width: 260px;" id="txtDnsClientDomain" placeholder="example.com">
                                         </div>
 
                                         <div class="form-group">
@@ -478,10 +481,12 @@
                                                 <option>UDP</option>
                                                 <option>TCP</option>
                                                 <option>TLS</option>
+                                                <option value="Https">HTTPS</option>
+                                                <option value="HttpsJson">HTTPS (JSON)</option>
                                             </select>
                                         </div>
 
-                                        <div class="form-group">
+                                        <div class="form-group" style="margin-bottom: 0px; margin-top: 10px;">
                                             <button type="submit" class="btn btn-primary" id="btnDnsClientResolve" data-loading-text="Resolving..." onclick="return resolveQuery();" style="margin-right: 6px;">Resolve</button>
                                             <button type="button" class="btn btn-warning" id="btnDnsClientImport" data-loading-text="Importing..." onclick="return resolveQuery(true);">Import</button>
                                         </div>
@@ -636,6 +641,18 @@
                                                                 DNS-over-TLS
                                                             </label>
                                                         </div>
+                                                        <div class="radio">
+                                                            <label>
+                                                                <input type="radio" name="rdForwarderProtocol" id="rdForwarderProtocolHttps" value="Https">
+                                                                DNS-over-HTTPS
+                                                            </label>
+                                                        </div>
+                                                        <div class="radio">
+                                                            <label>
+                                                                <input type="radio" name="rdForwarderProtocol" id="rdForwarderProtocolHttpJsons" value="HttpsJson">
+                                                                DNS-over-HTTPS (JSON)
+                                                            </label>
+                                                        </div>
                                                     </div>
                                                 </div>
                                             </div>
diff --git a/DnsServerCore/www/js/main.js b/DnsServerCore/www/js/main.js
index dab96956..0e62a658 100644
--- a/DnsServerCore/www/js/main.js
+++ b/DnsServerCore/www/js/main.js
@@ -72,8 +72,21 @@ $(function () {
 
         if (itemText.indexOf("TLS") !== -1)
             $("#optDnsClientProtocol").val("TLS");
-        else if ($("#optDnsClientProtocol").val() === "TLS")
-            $("#optDnsClientProtocol").val("UDP");
+        else if (itemText.indexOf("HTTPS-JSON") !== -1)
+            $("#optDnsClientProtocol").val("HttpsJson");
+        else if (itemText.indexOf("HTTPS") !== -1)
+            $("#optDnsClientProtocol").val("Https");
+        else {
+            switch ($("#optDnsClientProtocol").val()) {
+                case "UDP":
+                case "TCP":
+                    break;
+
+                default:
+                    $("#optDnsClientProtocol").val("UDP");
+                    break;
+            }
+        }
     });
 
     $("#divNetworkProxy input").click(function () {
@@ -325,6 +338,14 @@ function loadDnsSettings() {
                     $("#rdForwarderProtocolTls").prop("checked", true);
                     break;
 
+                case "https":
+                    $("#rdForwarderProtocolHttps").prop("checked", true);
+                    break;
+
+                case "httpsjson":
+                    $("#rdForwarderProtocolHttpJsons").prop("checked", true);
+                    break;
+
                 default:
                     $("#rdForwarderProtocolUdp").prop("checked", true);
                     break;