Commit 9443f6ad authored by Richard Pospesel's avatar Richard Pospesel Committed by Pier Angelo Vendrame
Browse files

Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection 

This patch adds a new about:preferences#connection page which allows
modifying bridge, proxy, and firewall settings from within Tor Browser.
All of the functionality present in tor-launcher's Network
Configuration panel is present:

 - Setting built-in bridges
 - Requesting bridges from BridgeDB via moat
 - Using user-provided bridges
 - Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies
 - Setting firewall ports
 - Viewing and Copying Tor's logs
 - The Networking Settings in General preferences has been removed

Bug 40774: Update about:preferences page to match new UI designs
parent f120a2ea

browser/components/moz.build

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ DIRS += [ 
    "uitour",

    "urlbar",

    "torcircuit",

    "torpreferences",

]



DIRS += ["build"]

browser/components/preferences/main.inc.xhtml

+2 −1
Original line number Diff line number Diff line
@@ -803,12 +803,13 @@ 
<hbox id="networkProxyCategory"

      class="subcategory"

      hidden="true"

      data-hidden-from-search="true"

      data-category="paneGeneral">

  <html:h1 data-l10n-id="network-settings-title"/>

</hbox>



<!-- Network Settings-->

<groupbox id="connectionGroup" data-category="paneGeneral" hidden="true">

<groupbox id="connectionGroup" data-category="paneGeneral" data-hidden-from-search="true" hidden="true">

  <label class="search-header" hidden="true"><html:h2 data-l10n-id="network-settings-title"/></label>



  <hbox align="center"

browser/components/preferences/preferences.js

+9 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
/* import-globals-from findInPage.js */

/* import-globals-from /browser/base/content/utilityOverlay.js */

/* import-globals-from /toolkit/content/preferencesBindings.js */

/* import-globals-from ../torpreferences/content/connectionPane.js */



"use strict";
@@ -231,6 +232,14 @@ function init_all() { 
    register_module("paneSync", gSyncPane);

  }

  register_module("paneSearchResults", gSearchResultsPane);

  if (gConnectionPane.enabled) {

    document.getElementById("category-connection").hidden = false;

    register_module("paneConnection", gConnectionPane);

  } else {

    // Remove the pane from the DOM so it doesn't get incorrectly included in search results.

    document.getElementById("template-paneConnection").remove();

  }



  gSearchResultsPane.init();

  gMainPane.preInit();

browser/components/preferences/preferences.xhtml

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
  />



  <link rel="stylesheet" href="chrome://browser/content/securitylevel/securityLevelPreferences.css" />

  <link rel="stylesheet" href="chrome://browser/content/torpreferences/torPreferences.css" />



  <link rel="localization" href="branding/brand.ftl"/>

  <link rel="localization" href="browser/browser.ftl"/>
@@ -91,6 +92,7 @@ 
  <script src="chrome://browser/content/preferences/findInPage.js"/>

  <script src="chrome://browser/content/migration/migration-wizard.mjs" type="module"></script>

  <script type="module" src="chrome://browser/content/backup/backup-settings.mjs"></script>

  <script src="chrome://browser/content/torpreferences/bridgemoji/BridgeEmoji.js"/>

</head>



<html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -203,6 +205,8 @@ 
                      value="paneTranslations"

                      helpTopic="prefs-translations"/>



#include ../torpreferences/content/connectionCategory.inc.xhtml



      </richlistbox>



      <spacer flex="1"/>
@@ -254,6 +258,7 @@ 
#include sync.inc.xhtml

#include experimental.inc.xhtml

#include moreFromMozilla.inc.xhtml

#include ../torpreferences/content/connectionPane.xhtml

        </vbox>

      </vbox>

    </vbox>

browser/components/torpreferences/content/bridge-bot.svg

0 → 100644
+13 −0
Original line number Diff line number Diff line 
<svg width="40" height="44" viewBox="0 0 40 44" fill="none" xmlns="http://www.w3.org/2000/svg">

<path d="M37.1877 22.7584C38.7409 25.1504 38.9178 27.7923 37.5828 28.6591C36.2478 29.5259 33.9065 28.2895 32.3533 25.8975C30.8001 23.5055 30.6232 20.8637 31.9582 19.9969C33.2932 19.13 35.6345 20.3664 37.1877 22.7584Z" fill="#C069FF"/>

<path d="M2.81234 22.7584C1.25915 25.1504 1.08224 27.7923 2.41721 28.6591C3.75217 29.5259 6.09349 28.2895 7.64668 25.8975C9.19987 23.5055 9.37678 20.8637 8.04181 19.9969C6.70685 19.13 4.36553 20.3664 2.81234 22.7584Z" fill="#C069FF"/>

<path d="M32.2002 19.4754C33.9149 19.4754 35.3181 20.8678 35.1823 22.5772C34.7579 27.9186 33.2458 32.9181 30.8541 36.7668C28.0043 41.3527 24.1391 43.9291 20.1088 43.9291C16.0785 43.9291 12.2133 41.3527 9.36344 36.7668C6.97177 32.9181 5.45965 27.9186 5.03525 22.5772C4.89944 20.8678 6.30265 19.4754 8.0174 19.4754L32.2002 19.4754Z" fill="#C069FF"/>

<path d="M28.4375 32.1121C28.4375 27.4522 24.6599 23.6746 20 23.6746C15.3401 23.6746 11.5625 27.4522 11.5625 32.1121V33.5139H12.8809V32.1121C12.8809 28.1803 16.0682 24.9929 20 24.9929C23.9318 24.9929 27.1191 28.1803 27.1191 32.1121V33.5139H28.4375V32.1121Z" fill="#15141A"/>

<path d="M25.9062 32.1121C25.9062 28.8501 23.2619 26.2058 20 26.2058C16.7381 26.2058 14.0937 28.8501 14.0937 32.1121L14.0936 33.5139H15.412L15.4121 32.1121C15.4121 29.5782 17.4662 27.5242 20 27.5242C22.5338 27.5242 24.5879 29.5782 24.5879 32.1121L24.588 33.5139H25.9064L25.9062 32.1121Z" fill="#15141A"/>

<path d="M20 28.7371C21.864 28.7371 23.375 30.2481 23.375 32.1121L23.3753 33.5139H22.0569L22.0566 32.1121C22.0566 30.9762 21.1359 30.0554 20 30.0554C18.8642 30.0554 17.9434 30.9762 17.9434 32.1121L17.9431 33.5139H16.6247V32.1121C16.6247 30.2481 18.136 28.7371 20 28.7371Z" fill="#15141A"/>

<path d="M8.9145 17.8162C7.19975 17.8162 5.78665 16.4193 6.02668 14.7215C6.53221 11.1456 7.9061 7.82078 9.99195 5.21826C12.6698 1.87706 16.3018 -1.07451e-07 20.0889 0C23.8759 1.07451e-07 27.5079 1.87706 30.1858 5.21826C32.2716 7.82078 33.6455 11.1456 34.151 14.7215C34.3911 16.4193 32.978 17.8162 31.2632 17.8162H8.9145Z" fill="#C069FF"/>

<path d="M13.1064 15.1091C11.3916 15.1091 9.96814 13.7048 10.3139 12.0252C10.7578 9.86855 11.6634 7.87853 12.956 6.27814C14.8477 3.93602 17.4134 2.62024 20.0887 2.62024C22.7639 2.62024 25.3296 3.93602 27.2213 6.27814C28.514 7.87853 29.4195 9.86855 29.8635 12.0252C30.2092 13.7048 28.7857 15.1091 27.071 15.1091H13.1064Z" fill="#EBD0FF"/>

<path d="M17.5125 6.81215C17.5125 7.58388 16.9065 8.2095 16.1589 8.2095C15.4112 8.2095 14.8052 7.58388 14.8052 6.81215C14.8052 6.04041 15.4112 5.41479 16.1589 5.41479C16.9065 5.41479 17.5125 6.04041 17.5125 6.81215Z" fill="#15141A"/>

<path d="M25.1981 6.81215C25.1981 7.58388 24.592 8.2095 23.8444 8.2095C23.0968 8.2095 22.4907 7.58388 22.4907 6.81215C22.4907 6.04041 23.0968 5.41479 23.8444 5.41479C24.592 5.41479 25.1981 6.04041 25.1981 6.81215Z" fill="#15141A"/>

<path fill-rule="evenodd" clip-rule="evenodd" d="M22.4395 9.01993L22.4044 9.11353C21.5971 11.2673 18.526 11.1951 17.8208 9.0058L18.427 8.81052C18.9472 10.4254 21.2125 10.4787 21.808 8.88998L21.8431 8.79639L22.4395 9.01993Z" fill="#15141A"/>

</svg>