From 8c334e8fa604a0bc0963af46d991c9cd428d614c Mon Sep 17 00:00:00 2001
From: fyr77 <js@jakobsenkl.pw>
Date: Sun, 10 Jan 2021 17:34:11 +0100
Subject: [PATCH] add wifi and interface exclusion

---
 js/tool.js | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 tool.html  | 25 ++++++++++++++++++++++-
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/js/tool.js b/js/tool.js
index 1bfdaae..d4276e7 100644
--- a/js/tool.js
+++ b/js/tool.js
@@ -75,6 +75,7 @@ function saveDynamicDataToFile() {
             break;
         }
     }
+    var exclWifi = document.getElementById("exclWifi");
         
     var fileString = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
     fileString += "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n";
@@ -96,6 +97,46 @@ function saveDynamicDataToFile() {
     }
     fileString += "<string>" + document.getElementById("serverUrl").value + "</string>\n";
     fileString += "</dict>\n";
+    fileString += "<key>OnDemandRules</key>\n";
+    if (exclWifi.value != "") {
+        fileString += "<array>\n";
+        fileString += "<dict>\n";
+        fileString += "<key>Action</key>\n";
+        fileString += "<string>Disconnect</string>\n";
+        fileString += "<key>SSIDMatch</key>\n"
+        fileString += "<array>\n";
+        exclWifi.value.split(/\s*,\s*/).forEach(function(wifiString) {
+            console.log(wifiString);
+            fileString += "<string>" + wifiString + "</string>\n";
+        });
+        fileString += "</array>\n";
+        fileString += "</dict>\n";
+        fileString += "<dict>\n";
+        fileString += "<key>Action</key>\n";
+        fileString += "<string>Connect</string>\n";
+        fileString += "</dict>\n";
+    }
+    if (document.getElementById("useWifi").checked) {
+        fileString += "<dict>\n";
+        fileString += "<key>Action</key>\n";
+        fileString += "<string>Connect</string>\n";
+        fileString += "<key>InterfaceTypeMatch</key>\n";
+        fileString += "<string>WiFi</string>\n";
+        fileString += "</dict>\n";
+    }
+    if (document.getElementById("useCell").checked) {
+        fileString += "<dict>\n";
+        fileString += "<key>Action</key>\n";
+        fileString += "<string>Connect</string>\n";
+        fileString += "<key>InterfaceTypeMatch</key>\n";
+        fileString += "<string>Cellular</string>\n";
+        fileString += "</dict>\n";
+    }
+    fileString += "<dict>\n";
+    fileString += "<key>Action</key>\n";
+    fileString += "<string>Disconnect</string>\n";
+    fileString += "</dict>\n";
+    fileString += "</array>\n";
     fileString += "<key>PayloadDescription</key>\n";
     fileString += "<string>Configures device to use " + provName + " Encrypted DNS over " + encValue + "</string>\n";
     fileString += "<key>PayloadDisplayName</key>\n";
@@ -109,7 +150,12 @@ function saveDynamicDataToFile() {
     fileString += "<key>PayloadVersion</key>\n";
     fileString += "<integer>1</integer>\n";
     fileString += "<key>ProhibitDisablement</key>\n";
-    fileString += "<false/>\n";
+    if (document.getElementById("lockProfile").checked) {
+        fileString += "<true/>\n";
+    }
+    else {
+        fileString += "<false/>\n";
+    }
     fileString += "</dict>\n";
     fileString += "</array>\n";
     fileString += "<key>PayloadDescription</key>\n";
@@ -165,4 +211,15 @@ function loadPremade() {
     dns1v6.value = getCookie("dns1v6");
     dns2v6.value = getCookie("dns2v6");
     serverUrl.value = getCookie("serverUrl");
+}
+function accordion() {
+    var adv = document.getElementById("advanced_container");
+    if (adv.className.indexOf("w3-show") == -1) {
+        adv.className += " w3-show";
+        adv.previousElementSibling.className = adv.previousElementSibling.className.replace("w3-dark-grey", "w3-black");
+    }
+    else {
+        adv.className = adv.className.replace(" w3-show", "");
+        adv.previousElementSibling.className = adv.previousElementSibling.className.replace("w3-black", "w3-dark-grey");
+    }
 }
\ No newline at end of file
diff --git a/tool.html b/tool.html
index 17d72b9..309e3f9 100644
--- a/tool.html
+++ b/tool.html
@@ -52,7 +52,30 @@
             <label for="serverUrl" id="dohdotServerLabel">DoH server URL:</label>
             <input type="text" id="serverUrl" placeholder="https://example.com/query" required>
         </p>
-        <input type="submit" class="button1" value="Download profile">
+        <input type="button" onclick="accordion()" class="w3-button w3-dark-grey w3-left-align" value="Advanced">
+        <div id="advanced_container" class="w3-hide w3-container">
+            <p>
+                <label for="exclWifi" class="optional">Excluded Wi-Fi Networks:</label>
+                <input type="text" id="exclWifi" placeholder="MyHomeNetwork, Silence of the LANs">
+                <span style="color: grey">Enter a comma-separated list of Wi-Fi networks (SSID) on which the encrypted DNS will be disabled.</span>
+            </p>
+            <p>
+                Interfaces to use encrypted DNS on: 
+                <label for="useWifi">Wi-Fi</label>
+                <input type="checkbox" id="useWifi" checked>
+                <label for="useCell">Cellular</label>
+                <input type="checkbox" id="useCell" checked>
+                <br>
+                <span style="color: grey">Untick to disable encrypted DNS when using WiFi/Cellular.</span>
+            </p>
+            <p>
+                <label for="lockProfile">Prohibit Disablement</label>
+                <input type="checkbox" id="lockProfile">
+                <br>
+                <span style="color: grey">Prohibit users from removing the profile. Only available on supervised devices.</span>
+            </p>
+        </div>
+        <p><input type="submit" class="button1" value="Download profile"></p>
     </form>
 </body>
 </html>
\ No newline at end of file