Bug 1574475 - Remove FTP proxy code r=necko-reviewers,preferences-reviewers,mixedpuppy,mkaply,dragana

valenting · valenting · commit 89d37d1ea1c4 · 2021-04-28T09:33:46.000Z
Differential Revision: https://phabricator.services.mozilla.com/D111248
diff --git a/browser/components/enterprisepolicies/helpers/ProxyPolicies.jsm b/browser/components/enterprisepolicies/helpers/ProxyPolicies.jsm
@@ -72,6 +72,10 @@ var ProxyPolicies = {
       );
     }
 
+    if (param.FTPProxy) {
+      log.warn("FTPProxy support was removed in bug 1574475");
+    }
+
     function setProxyHostAndPort(type, address) {
       let url;
       try {
@@ -96,14 +100,10 @@ var ProxyPolicies = {
       // network code. That pref only controls if the checkbox is checked, and
       // then we must manually set the other values.
       if (param.UseHTTPProxyForAllProtocols) {
-        param.FTPProxy = param.SSLProxy = param.SOCKSProxy = param.HTTPProxy;
+        param.SSLProxy = param.SOCKSProxy = param.HTTPProxy;
       }
     }
 
-    if (param.FTPProxy) {
-      setProxyHostAndPort("ftp", param.FTPProxy);
-    }
-
     if (param.SSLProxy) {
       setProxyHostAndPort("ssl", param.SSLProxy);
     }
diff --git a/browser/components/enterprisepolicies/tests/xpcshell/test_proxy.js b/browser/components/enterprisepolicies/tests/xpcshell/test_proxy.js
@@ -79,15 +79,13 @@ add_task(async function test_proxy_addresses() {
     policies: {
       Proxy: {
         HTTPProxy: "http.proxy.example.com:10",
-        FTPProxy: "ftp.proxy.example.com:20",
         SSLProxy: "ssl.proxy.example.com:30",
         SOCKSProxy: "socks.proxy.example.com:40",
       },
     },
   });
 
   checkProxyPref("http", "http.proxy.example.com", 10);
-  checkProxyPref("ftp", "ftp.proxy.example.com", 20);
   checkProxyPref("ssl", "ssl.proxy.example.com", 30);
   checkProxyPref("socks", "socks.proxy.example.com", 40);
 
@@ -97,6 +95,8 @@ add_task(async function test_proxy_addresses() {
     policies: {
       Proxy: {
         HTTPProxy: "http.proxy.example.com:10",
+        // FTP support was removed in bug 1574475
+        // Setting an FTPProxy should result in a warning but should not fail
         FTPProxy: "ftp.proxy.example.com:20",
         SSLProxy: "ssl.proxy.example.com:30",
         SOCKSProxy: "socks.proxy.example.com:40",
@@ -106,7 +106,18 @@ add_task(async function test_proxy_addresses() {
   });
 
   checkProxyPref("http", "http.proxy.example.com", 10);
-  checkProxyPref("ftp", "http.proxy.example.com", 10);
   checkProxyPref("ssl", "http.proxy.example.com", 10);
   checkProxyPref("socks", "http.proxy.example.com", 10);
+
+  // Make sure the FTPProxy setting did nothing
+  Assert.equal(
+    Preferences.has("network.proxy.ftp"),
+    false,
+    "network.proxy.ftp should not be set"
+  );
+  Assert.equal(
+    Preferences.has("network.proxy.ftp_port"),
+    false,
+    "network.proxy.ftp_port should not be set"
+  );
 });
diff --git a/browser/components/preferences/dialogs/connection.js b/browser/components/preferences/dialogs/connection.js
@@ -19,8 +19,6 @@ Preferences.addAll([
   { id: "network.proxy.type", type: "int" },
   { id: "network.proxy.http", type: "string" },
   { id: "network.proxy.http_port", type: "int" },
-  { id: "network.proxy.ftp", type: "string" },
-  { id: "network.proxy.ftp_port", type: "int" },
   { id: "network.proxy.ssl", type: "string" },
   { id: "network.proxy.ssl_port", type: "int" },
   { id: "network.proxy.socks", type: "string" },
@@ -31,8 +29,6 @@ Preferences.addAll([
   { id: "network.proxy.share_proxy_settings", type: "bool" },
   { id: "signon.autologin.proxy", type: "bool" },
   { id: "pref.advanced.proxies.disable_button.reload", type: "bool" },
-  { id: "network.proxy.backup.ftp", type: "string" },
-  { id: "network.proxy.backup.ftp_port", type: "int" },
   { id: "network.proxy.backup.ssl", type: "string" },
   { id: "network.proxy.backup.ssl_port", type: "int" },
   { id: "network.trr.mode", type: "int" },
@@ -137,7 +133,7 @@ var gConnectionsDialog = {
     );
 
     // If the port is 0 and the proxy server is specified, focus on the port and cancel submission.
-    for (let prefName of ["http", "ssl", "ftp", "socks"]) {
+    for (let prefName of ["http", "ssl", "socks"]) {
       let proxyPortPref = Preferences.get(
         "network.proxy." + prefName + "_port"
       );
@@ -159,26 +155,15 @@ var gConnectionsDialog = {
 
     // In the case of a shared proxy preference, backup the current values and update with the HTTP value
     if (shareProxiesPref.value) {
-      var proxyPrefs = ["ssl", "ftp"];
-      for (var i = 0; i < proxyPrefs.length; ++i) {
-        var proxyServerURLPref = Preferences.get(
-          "network.proxy." + proxyPrefs[i]
-        );
-        var proxyPortPref = Preferences.get(
-          "network.proxy." + proxyPrefs[i] + "_port"
-        );
-        var backupServerURLPref = Preferences.get(
-          "network.proxy.backup." + proxyPrefs[i]
-        );
-        var backupPortPref = Preferences.get(
-          "network.proxy.backup." + proxyPrefs[i] + "_port"
-        );
-        backupServerURLPref.value =
-          backupServerURLPref.value || proxyServerURLPref.value;
-        backupPortPref.value = backupPortPref.value || proxyPortPref.value;
-        proxyServerURLPref.value = httpProxyURLPref.value;
-        proxyPortPref.value = httpProxyPortPref.value;
-      }
+      var proxyServerURLPref = Preferences.get("network.proxy.ssl");
+      var proxyPortPref = Preferences.get("network.proxy.ssl_port");
+      var backupServerURLPref = Preferences.get("network.proxy.backup.ssl");
+      var backupPortPref = Preferences.get("network.proxy.backup.ssl_port");
+      backupServerURLPref.value =
+        backupServerURLPref.value || proxyServerURLPref.value;
+      backupPortPref.value = backupPortPref.value || proxyPortPref.value;
+      proxyServerURLPref.value = httpProxyURLPref.value;
+      proxyPortPref.value = httpProxyPortPref.value;
     }
 
     this.sanitizeNoProxiesPref();
@@ -266,7 +251,7 @@ var gConnectionsDialog = {
     var shareProxiesPref = Preferences.get(
       "network.proxy.share_proxy_settings"
     );
-    var proxyPrefs = ["ssl", "ftp", "socks"];
+    var proxyPrefs = ["ssl", "socks"];
     for (var i = 0; i < proxyPrefs.length; ++i) {
       var proxyServerURLPref = Preferences.get(
         "network.proxy." + proxyPrefs[i]
@@ -627,12 +612,6 @@ var gConnectionsDialog = {
     setSyncFromPrefListener("networkProxySSL_Port", () =>
       this.readProxyProtocolPref("ssl", true)
     );
-    setSyncFromPrefListener("networkProxyFTP", () =>
-      this.readProxyProtocolPref("ftp", false)
-    );
-    setSyncFromPrefListener("networkProxyFTP_Port", () =>
-      this.readProxyProtocolPref("ftp", true)
-    );
     setSyncFromPrefListener("networkProxySOCKS", () =>
       this.readProxyProtocolPref("socks", false)
     );
diff --git a/browser/components/preferences/dialogs/connection.xhtml b/browser/components/preferences/dialogs/connection.xhtml
@@ -82,17 +82,6 @@
                         preference="network.proxy.ssl_port"/>
           </hbox>
         </html:div>
-        <html:div class="proxy-grid-row">
-          <hbox pack="end">
-            <label data-l10n-id="connection-proxy-ftp" control="networkProxyFTP"/>
-          </hbox>
-          <hbox align="center">
-            <html:input id="networkProxyFTP" type="text" style="-moz-box-flex: 1;" preference="network.proxy.ftp"/>
-            <label data-l10n-id="connection-proxy-ftp-port" control="networkProxyFTP_Port"/>
-            <html:input id="networkProxyFTP_Port" class="proxy-port-input" hidespinbuttons="true" type="number" min="0" max="65535" size="5"
-                        preference="network.proxy.ftp_port"/>
-          </hbox>
-        </html:div>
         <separator class="thin"/>
         <html:div class="proxy-grid-row">
           <hbox pack="end">
diff --git a/browser/components/preferences/extensionControlled.js b/browser/components/preferences/extensionControlled.js
@@ -44,8 +44,6 @@ const API_PROXY_PREFS = [
   "network.proxy.http",
   "network.proxy.http_port",
   "network.proxy.share_proxy_settings",
-  "network.proxy.ftp",
-  "network.proxy.ftp_port",
   "network.proxy.ssl",
   "network.proxy.ssl_port",
   "network.proxy.socks",
diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
@@ -708,7 +708,6 @@
                 connection-proxy-option-manual.label,
                 connection-proxy-http,
                 connection-proxy-https,
-                connection-proxy-ftp,
                 connection-proxy-http-port,
                 connection-proxy-socks,
                 connection-proxy-socks4,
diff --git a/browser/components/preferences/tests/browser_connection_bug388287.js b/browser/components/preferences/tests/browser_connection_bug388287.js
@@ -17,7 +17,7 @@ function test() {
   registerCleanupFunction(function() {
     Services.prefs.setIntPref("network.proxy.type", oldNetworkProxyType);
     Services.prefs.clearUserPref("network.proxy.share_proxy_settings");
-    for (let proxyType of ["http", "ssl", "ftp", "socks"]) {
+    for (let proxyType of ["http", "ssl", "socks"]) {
       Services.prefs.clearUserPref("network.proxy." + proxyType);
       Services.prefs.clearUserPref("network.proxy." + proxyType + "_port");
       if (proxyType == "http") {
@@ -37,7 +37,7 @@ function test() {
    */
   open_preferences(async function tabOpened(aContentWindow) {
     let dialog, dialogClosingPromise, dialogElement;
-    let proxyTypePref, sharePref, httpPref, httpPortPref, ftpPref, ftpPortPref;
+    let proxyTypePref, sharePref, httpPref, httpPortPref;
 
     // Convenient function to reset the variables for the new window
     async function setDoc() {
@@ -63,8 +63,6 @@ function test() {
       sharePref = dialog.Preferences.get("network.proxy.share_proxy_settings");
       httpPref = dialog.Preferences.get("network.proxy.http");
       httpPortPref = dialog.Preferences.get("network.proxy.http_port");
-      ftpPref = dialog.Preferences.get("network.proxy.ftp");
-      ftpPortPref = dialog.Preferences.get("network.proxy.ftp_port");
     }
 
     // This batch of tests should not close the dialog
@@ -79,13 +77,10 @@ function test() {
 
     // Testing HTTP port 0 + FTP port 80 with share off
     sharePref.value = false;
-    ftpPref.value = "localhost";
-    ftpPortPref.value = 80;
     dialogElement.acceptDialog();
 
     // Testing HTTP port 80 + FTP port 0 with share off
     httpPortPref.value = 80;
-    ftpPortPref.value = 0;
     dialogElement.acceptDialog();
 
     // From now on, the dialog should close since we are giving it legitimate inputs.
@@ -94,17 +89,14 @@ function test() {
 
     // Both ports 80, share on
     httpPortPref.value = 80;
-    ftpPortPref.value = 80;
     dialogElement.acceptDialog();
 
     // HTTP 80, FTP 0, with share on
     await setDoc();
     proxyTypePref.value = 1;
     sharePref.value = true;
-    ftpPref.value = "localhost";
     httpPref.value = "localhost";
     httpPortPref.value = 80;
-    ftpPortPref.value = 0;
     dialogElement.acceptDialog();
 
     // HTTP host empty, port 0 with share on
diff --git a/browser/components/preferences/tests/browser_proxy_backup.js b/browser/components/preferences/tests/browser_proxy_backup.js
@@ -15,7 +15,7 @@ function test() {
     Services.prefs.setIntPref("network.proxy.type", oldNetworkProxyType);
     Services.prefs.clearUserPref("browser.preferences.instantApply");
     Services.prefs.clearUserPref("network.proxy.share_proxy_settings");
-    for (let proxyType of ["http", "ssl", "ftp", "socks"]) {
+    for (let proxyType of ["http", "ssl", "socks"]) {
       Services.prefs.clearUserPref("network.proxy." + proxyType);
       Services.prefs.clearUserPref("network.proxy." + proxyType + "_port");
       if (proxyType == "http") {
diff --git a/browser/locales/en-US/browser/preferences/connection.ftl b/browser/locales/en-US/browser/preferences/connection.ftl
@@ -44,11 +44,6 @@ connection-proxy-https = HTTPS Proxy
 connection-proxy-ssl-port = Port
     .accesskey = o
 
-connection-proxy-ftp = FTP Proxy
-    .accesskey = F
-connection-proxy-ftp-port = Port
-    .accesskey = r
-
 connection-proxy-socks = SOCKS Host
     .accesskey = C
 connection-proxy-socks-port = Port
diff --git a/netwerk/base/nsIProtocolHandler.idl b/netwerk/base/nsIProtocolHandler.idl
@@ -107,7 +107,7 @@ interface nsIProtocolHandler : nsISupports
 
     /**
      * standard full URI with authority component and concept of relative
-     * URIs (http, ftp, ...)
+     * URIs (http, ...)
      */
     const unsigned long URI_STD = 0;
 
@@ -136,7 +136,7 @@ interface nsIProtocolHandler : nsISupports
 
     /**
      * This protocol handler can be proxied using a http proxy (e.g., http,
-     * ftp, etc.).  nsIIOService::newChannelFromURI will feed URIs from this
+     * etc.).  nsIIOService::newChannelFromURI will feed URIs from this
      * protocol handler to the HTTP protocol handler instead.  This flag is
      * ignored if ALLOWS_PROXY is not set.
      */
diff --git a/netwerk/base/nsProtocolProxyService.cpp b/netwerk/base/nsProtocolProxyService.cpp
@@ -769,7 +769,6 @@ nsProtocolProxyService::nsProtocolProxyService()
     : mFilterLocalHosts(false),
       mProxyConfig(PROXYCONFIG_DIRECT),
       mHTTPProxyPort(-1),
-      mFTPProxyPort(-1),
       mHTTPSProxyPort(-1),
       mSOCKSProxyPort(-1),
       mSOCKSProxyVersion(4),
@@ -1004,12 +1003,6 @@ void nsProtocolProxyService::PrefsChanged(nsIPrefBranch* prefBranch,
   if (!pref || !strcmp(pref, PROXY_PREF("ssl_port")))
     proxy_GetIntPref(prefBranch, PROXY_PREF("ssl_port"), mHTTPSProxyPort);
 
-  if (!pref || !strcmp(pref, PROXY_PREF("ftp")))
-    proxy_GetStringPref(prefBranch, PROXY_PREF("ftp"), mFTPProxyHost);
-
-  if (!pref || !strcmp(pref, PROXY_PREF("ftp_port")))
-    proxy_GetIntPref(prefBranch, PROXY_PREF("ftp_port"), mFTPProxyPort);
-
   if (!pref || !strcmp(pref, PROXY_PREF("socks")))
     proxy_GetStringPref(prefBranch, PROXY_PREF("socks"), mSOCKSProxyTarget);
 
@@ -2206,12 +2199,6 @@ nsresult nsProtocolProxyService::Resolve_Internal(nsIChannel* channel,
     host = &mHTTPSProxyHost;
     type = kProxyType_HTTP;
     port = mHTTPSProxyPort;
-  } else if (!mFTPProxyHost.IsEmpty() && mFTPProxyPort > 0 &&
-             !(flags & RESOLVE_IGNORE_URI_SCHEME) &&
-             info.scheme.EqualsLiteral("ftp")) {
-    host = &mFTPProxyHost;
-    type = kProxyType_HTTP;
-    port = mFTPProxyPort;
   } else if (!mSOCKSProxyTarget.IsEmpty() &&
              (IsHostLocalTarget(mSOCKSProxyTarget) || mSOCKSProxyPort > 0)) {
     host = &mSOCKSProxyTarget;
diff --git a/netwerk/base/nsProtocolProxyService.h b/netwerk/base/nsProtocolProxyService.h
@@ -377,9 +377,6 @@ class nsProtocolProxyService final : public nsIProtocolProxyService2,
   nsCString mHTTPProxyHost;
   int32_t mHTTPProxyPort;
 
-  nsCString mFTPProxyHost;
-  int32_t mFTPProxyPort;
-
   nsCString mHTTPSProxyHost;
   int32_t mHTTPSProxyPort;
 
diff --git a/netwerk/test/unit/test_bug1177909.js b/netwerk/test/unit/test_bug1177909.js
@@ -22,7 +22,7 @@ XPCOMUtils.defineLazyGetter(this, "systemSettings", function() {
       if (aPort != -1) {
         return "SOCKS5 http://localhost:9050";
       }
-      if (aScheme == "http" || aScheme == "ftp") {
+      if (aScheme == "http") {
         return "PROXY http://localhost:8080";
       }
       if (aScheme == "https") {
@@ -85,15 +85,6 @@ add_task(async function testHttpsProxy() {
   equal(pi.type, "https", "Expected proxy type to be https");
 });
 
-if (Services.prefs.getBoolPref("network.ftp.enabled")) {
-  add_task(async function testFtpProxy() {
-    let pi = await TestProxyTypeByURI("ftp://ftp.mozilla.org/");
-    equal(pi.host, "localhost", "Expected proxy host to be localhost");
-    equal(pi.port, 8080, "Expected proxy port to be 8080");
-    equal(pi.type, "http", "Expected proxy type to be http");
-  });
-}
-
 add_task(async function testSocksProxy() {
   let pi = await TestProxyTypeByURI("http://www.mozilla.org:1234/");
   equal(pi.host, "localhost", "Expected proxy host to be localhost");
diff --git a/toolkit/components/extensions/parent/ext-proxy.js b/toolkit/components/extensions/parent/ext-proxy.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_proxy_config.js b/toolkit/components/extensions/test/xpcshell/test_ext_proxy_config.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_proxy_listener.js b/toolkit/components/extensions/test/xpcshell/test_proxy_listener.js

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,10 @@ var ProxyPolicies = {`
`72`	`72`	`);`
`73`	`73`	`}`
`74`	`74`
	`75`	`+ if (param.FTPProxy) {`
	`76`	`+ log.warn("FTPProxy support was removed in bug 1574475");`
	`77`	`+ }`
	`78`	`+`
`75`	`79`	`function setProxyHostAndPort(type, address) {`
`76`	`80`	`let url;`
`77`	`81`	`try {`
`@@ -96,14 +100,10 @@ var ProxyPolicies = {`
`96`	`100`	`// network code. That pref only controls if the checkbox is checked, and`
`97`	`101`	`// then we must manually set the other values.`
`98`	`102`	`if (param.UseHTTPProxyForAllProtocols) {`
`99`		`- param.FTPProxy = param.SSLProxy = param.SOCKSProxy = param.HTTPProxy;`
	`103`	`+ param.SSLProxy = param.SOCKSProxy = param.HTTPProxy;`
`100`	`104`	`}`
`101`	`105`	`}`
`102`	`106`
`103`		`- if (param.FTPProxy) {`
`104`		`- setProxyHostAndPort("ftp", param.FTPProxy);`
`105`		`- }`
`106`		`-`
`107`	`107`	`if (param.SSLProxy) {`
`108`	`108`	`setProxyHostAndPort("ssl", param.SSLProxy);`
`109`	`109`	`}`