feat: Ultra Protection mode to DNS settings with OHTTP support

browser/components/preferences/privacy.inc.xhtml

@@ -1227,7 +1227,7 @@
     <label><html:h2 id="dohGroupMessage" data-l10n-id="preferences-doh-group-message2"/></label>
     <vbox id="dohCategories">
       <radiogroup id="dohCategoryRadioGroup"
-                  preference="network.trr.mode" aria-labelledby="dohGroupMessage">
+                  aria-labelledby="dohGroupMessage">
         <vbox id="dohOptionDefault" class="privacy-detailedoption info-box-container">
           <hbox>
             <radio id="dohDefaultRadio"
@@ -1344,6 +1344,41 @@
             </vbox>
           </vbox>
         </vbox>
+        <vbox id="dohOptionUltra" class="privacy-detailedoption info-box-container">
+          <hbox>
+            <radio id="dohUltraRadio"
+                   value="ultra"
+                   data-l10n-id="preferences-doh-setting-ultra"
+                   flex="1"/>
+            <button id="dohUltraArrow"
+                    is="highlightable-button"
+                    class="arrowhead doh-expand-section"
+                    data-l10n-id="preferences-doh-expand-section"
+                    aria-expanded="false"/>
+          </hbox>
+          <vbox class="indent">
+            <label data-l10n-id="preferences-doh-ultra-desc"></label>
+            <vbox class="extra-information-label">
+              <label data-l10n-id="preferences-doh-ultra-fallback-mode"/>
+              <menulist id="dohUltraFallbackMode"
+                        sizetopopup="none">
+              </menulist>
+            </vbox>
+            <vbox class="privacy-extra-information">
+              <vbox class="indent">
+                <hbox class="extra-information-label">
+                  <label class="doh-label" data-l10n-id="preferences-doh-ultra-detailed-desc-1"/>
+                </hbox>
+                <hbox class="extra-information-label">
+                  <label class="doh-label" data-l10n-id="preferences-doh-ultra-detailed-desc-2"/>
+                </hbox>
+                <hbox class="extra-information-label">
+                  <label class="doh-label" data-l10n-id="preferences-doh-ultra-detailed-desc-3"/>
+                </hbox>
+              </vbox>
+            </vbox>
+          </vbox>
+        </vbox>
         <vbox id="dohOptionOff" class="privacy-detailedoption info-box-container">
           <hbox>
             <radio id="dohOffRadio"

browser/components/preferences/privacy.js

@@ -269,6 +269,7 @@ Preferences.addAll([
   { id: "network.trr.uri", type: "string" },
   { id: "network.trr.default_provider_uri", type: "string" },
   { id: "network.trr.custom_uri", type: "string" },
+  { id: "network.trr.use_ohttp", type: "bool" },
   { id: "doh-rollout.disable-heuristics", type: "bool" },
 ]);
 
@@ -786,30 +787,68 @@ var gPrivacyPane = {
     let defaultOption = document.getElementById("dohOptionDefault");
     let enabledOption = document.getElementById("dohOptionEnabled");
     let strictOption = document.getElementById("dohOptionStrict");
+    let ultraOption = document.getElementById("dohOptionUltra");
     let offOption = document.getElementById("dohOptionOff");
+    
+    // Clear all selections
     defaultOption.classList.remove("selected");
     enabledOption.classList.remove("selected");
     strictOption.classList.remove("selected");
+    ultraOption.classList.remove("selected");
     offOption.classList.remove("selected");
 
+    // Get the radiogroup and handle selection manually
+    let radioGroup = document.getElementById("dohCategoryRadioGroup");
+
+    // Check if Ultra Protection mode is enabled
+    let ohttpEnabled = Services.prefs.getBoolPref("network.trr.use_ohttp", false);
+    
     switch (value) {
       case Ci.nsIDNSService.MODE_NATIVEONLY:
         defaultOption.classList.add("selected");
+        if (radioGroup) radioGroup.value = "0";
         break;
       case Ci.nsIDNSService.MODE_TRRFIRST:
-        enabledOption.classList.add("selected");
+        if (ohttpEnabled) {
+          // Ultra Protection with fallback allowed
+          ultraOption.classList.add("selected");
+          if (radioGroup) radioGroup.value = "ultra";
+          // Update the fallback dropdown state
+          let fallbackDropdown = document.getElementById("dohUltraFallbackMode");
+          if (fallbackDropdown) {
+            fallbackDropdown.disabled = false;
+            fallbackDropdown.value = "fallback";
+          }
+        } else {
+          enabledOption.classList.add("selected");
+          if (radioGroup) radioGroup.value = "2";
+        }
         break;
       case Ci.nsIDNSService.MODE_TRRONLY:
-        strictOption.classList.add("selected");
+        // Ultra Protection is strict mode + OHttp enabled, or regular strict mode
+        if (ohttpEnabled) {
+          ultraOption.classList.add("selected");
+          if (radioGroup) radioGroup.value = "ultra";
+          // Update the fallback dropdown state
+          let fallbackDropdown = document.getElementById("dohUltraFallbackMode");
+          if (fallbackDropdown) {
+            fallbackDropdown.disabled = false;
+            fallbackDropdown.value = "no-fallback";
+          }
+        } else {
+          strictOption.classList.add("selected");
+          if (radioGroup) radioGroup.value = "3";
+        }
         break;
       case Ci.nsIDNSService.MODE_TRROFF:
         offOption.classList.add("selected");
+        if (radioGroup) radioGroup.value = "5";
         break;
       default:
         // The pref is set to a random value.
         // This shouldn't happen, but let's make sure off is selected.
         offOption.classList.add("selected");
-        document.getElementById("dohCategoryRadioGroup").selectedIndex = 3;
+        if (radioGroup) radioGroup.value = "5";
         break;
     }
 
@@ -836,6 +875,26 @@ var gPrivacyPane = {
       }
     }
 
+    // Handle Ultra Protection mode (OHttp enabled with either TRR First or TRR Only)
+    if (ohttpEnabled && (value == Ci.nsIDNSService.MODE_TRRFIRST || value == Ci.nsIDNSService.MODE_TRRONLY)) {
+      // Ultra Protection mode - ensure OHttp is enabled
+      Services.prefs.setBoolPref("network.trr.use_ohttp", true);
+      // Enable the fallback dropdown
+      let fallbackDropdown = document.getElementById("dohUltraFallbackMode");
+      if (fallbackDropdown) {
+        fallbackDropdown.disabled = false;
+      }
+    } else if (!ohttpEnabled) {
+      // Not Ultra Protection - ensure OHttp is disabled
+      Services.prefs.setBoolPref("network.trr.use_ohttp", false);
+      // Disable the fallback dropdown when not in Ultra mode
+      let fallbackDropdown = document.getElementById("dohUltraFallbackMode");
+      if (fallbackDropdown) {
+        fallbackDropdown.disabled = true;
+        fallbackDropdown.value = "fallback";
+      }
+    }
+
     // Bug 1900672
     // When the mode is set to 5, clear the pref to ensure that
     // network.trr.uri is set to fallbackProviderURIwhen the mode is set to 2 or 3 afterwards
@@ -853,6 +912,7 @@ var gPrivacyPane = {
     setEventListener("dohDefaultArrow", "command", this.toggleExpansion);
     setEventListener("dohEnabledArrow", "command", this.toggleExpansion);
     setEventListener("dohStrictArrow", "command", this.toggleExpansion);
+    setEventListener("dohUltraArrow", "command", this.toggleExpansion);
 
     function modeButtonPressed(e) {
       // Clicking the active mode again should not generate another event
@@ -866,13 +926,53 @@ var gPrivacyPane = {
       });
     }
 
-    setEventListener("dohDefaultRadio", "command", modeButtonPressed);
+    setEventListener("dohDefaultRadio", "command", (e) => {
-    setEventListener("dohEnabledRadio", "command", modeButtonPressed);
+      // Default Protection: Use default mode and disable OHttp
-    setEventListener("dohStrictRadio", "command", modeButtonPressed);
+      Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_NATIVEONLY);
-    setEventListener("dohOffRadio", "command", modeButtonPressed);
+      Services.prefs.setBoolPref("network.trr.use_ohttp", false);
+      modeButtonPressed(e);
+    });
+    setEventListener("dohEnabledRadio", "command", (e) => {
+      // Enabled Protection: Use enabled mode and disable OHttp
+      Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRFIRST);
+      Services.prefs.setBoolPref("network.trr.use_ohttp", false);
+      modeButtonPressed(e);
+    });
+    setEventListener("dohStrictRadio", "command", (e) => {
+      // Strict Protection: Set TRR to strict mode but disable OHttp
+      Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRONLY);
+      Services.prefs.setBoolPref("network.trr.use_ohttp", false);
+      modeButtonPressed(e);
+    });
+    setEventListener("dohUltraRadio", "command", (e) => {
+      // Ultra Protection: Enable OHttp and set default mode
+      Services.prefs.setBoolPref("network.trr.use_ohttp", true);
+      let fallbackDropdown = document.getElementById("dohUltraFallbackMode");
+      if (fallbackDropdown) {
+        // Default to fallback allowed unless user previously selected no-fallback
+        if (fallbackDropdown.value === "no-fallback") {
+          Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRONLY);
+        } else {
+          fallbackDropdown.value = "fallback";
+          Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRFIRST);
+        }
+        fallbackDropdown.disabled = false;
+      } else {
+        // Fallback if dropdown not found
+        Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRFIRST);
+      }
+      modeButtonPressed(e);
+    });
+    setEventListener("dohOffRadio", "command", (e) => {
+      // Off Protection: Set TRR to off and disable OHttp
+      Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRROFF);
+      Services.prefs.setBoolPref("network.trr.use_ohttp", false);
+      modeButtonPressed(e);
+    });
 
     this.populateDoHResolverList("dohEnabled");
     this.populateDoHResolverList("dohStrict");
+    this.populateUltraFallbackDropdown();
 
     Preferences.get("network.trr.uri").on("change", () => {
       gPrivacyPane.updateDoHResolverList("dohEnabled");
@@ -885,8 +985,20 @@ var gPrivacyPane = {
       "change",
       gPrivacyPane.highlightDoHCategoryAndUpdateStatus
     );
+    // Also listen for OHttp pref changes
+    Preferences.get("network.trr.use_ohttp").on(
+      "change", 
+      gPrivacyPane.highlightDoHCategoryAndUpdateStatus
+    );
+
+
+
+
     this.highlightDoHCategoryAndUpdateStatus();
     
+    // Initialize Ultra Protection checkbox state
+    this.initUltraProtectionState();
+
     Services.obs.addObserver(this, "network:trr-uri-changed");
     Services.obs.addObserver(this, "network:trr-mode-changed");
     Services.obs.addObserver(this, "network:trr-confirmation");
@@ -913,6 +1025,54 @@ var gPrivacyPane = {
     }
   },
 
+  populateUltraFallbackDropdown() {
+    let menu = document.getElementById("dohUltraFallbackMode");
+    if (!menu) return;
+
+    // populate the fallback options like provider dropdowns do
+    menu.removeAllItems();
+    
+    let fallbackItem = menu.appendItem("Allow fallback to system DNS if secure DNS fails", "fallback");
+    let noFallbackItem = menu.appendItem("Never fall back to system DNS (sites may not load if secure DNS fails)", "no-fallback");
+    
+    // Set initial selection
+    menu.value = "fallback";
+    
+    // Add event listener
+    menu.addEventListener("command", (e) => {
+      let ohttpEnabled = Services.prefs.getBoolPref("network.trr.use_ohttp", false);
+      let trrMode = Services.prefs.getIntPref("network.trr.mode", 0);
+      if (ohttpEnabled && (trrMode == Ci.nsIDNSService.MODE_TRRFIRST || trrMode == Ci.nsIDNSService.MODE_TRRONLY)) {
+        if (e.target.value === "no-fallback") {
+          // No fallback - switch to TRR Only mode
+          Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRONLY);
+        } else {
+          // Allow fallback - switch to TRR First mode
+          Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRFIRST);
+        }
+      }
+    });
+  },
+
+  initUltraProtectionState() {
+    // Initialize the Ultra Protection fallback dropdown state
+    let ohttpEnabled = Services.prefs.getBoolPref("network.trr.use_ohttp", false);
+    let trrMode = Services.prefs.getIntPref("network.trr.mode", 0);
+    let fallbackDropdown = document.getElementById("dohUltraFallbackMode");
+    
+    if (fallbackDropdown) {      
+      if (ohttpEnabled && (trrMode == Ci.nsIDNSService.MODE_TRRFIRST || trrMode == Ci.nsIDNSService.MODE_TRRONLY)) {
+        // Ultra Protection is active
+        fallbackDropdown.disabled = false;
+        fallbackDropdown.value = (trrMode == Ci.nsIDNSService.MODE_TRRONLY) ? "no-fallback" : "fallback";
+      } else {
+        // Ultra Protection is not active
+        fallbackDropdown.disabled = true;
+        fallbackDropdown.value = "fallback";
+      }
+    }
+  },
+
   initWebAuthn() {
     document.getElementById("openWindowsPasskeySettings").hidden =
       !Services.prefs.getBoolPref(

waterfox/browser/components/preferences/content/general.js

@@ -82,10 +82,7 @@ const _gMainPaneOverlay = {
       }
       document.initialized = true;
     }
-    this.setEventListener("enableObliviousDns", "click", () => {
+
-      const value = document.getElementById("enableObliviousDns").checked ? 2 : 0;
-      Services.prefs.setIntPref("network.trr.mode", value);
-    });
   },
 
   tocGenerate() {

waterfox/browser/components/preferences/content/preferences-other.xhtml

@@ -83,10 +83,6 @@
 
         <!-- DNS -->
         <groupbox id="dohBox">
-            <hbox id="obliviousDns" data-subcategory="doh" insertbefore="dohCategories">
-                <checkbox id="enableObliviousDns" class="tail-with-learn-more" data-l10n-id="enable-dooh"
-                    preference="network.trr.use_ohttp" flex="1" />
-            </hbox>
         </groupbox>
     </vbox>
 </overlay>

waterfox/browser/components/preferences/content/privacy.js

@@ -36,10 +36,7 @@ const _gPrivacyPaneOverlay = {
       javascriptPermissions.getAttribute("preference")
     ).value;
 
-    const obliviousDns = document.getElementById("enableObliviousDns");
+
-    obliviousDns.checked = Preferences.get(
-      obliviousDns.getAttribute("preference")
-    ).value;
   },
 
   /**