mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

Differential Revision: https://phabricator.services.mozilla.com/D111248
This commit is contained in:
Valentin Gosu 2021-04-22 13:41:34 +00:00
Родитель 7c9a639c26
Коммит 939b075a47
16 изменённых файлов: 51 добавлений и 155 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
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);
}

17
browser/components/enterprisepolicies/tests/xpcshell/test_proxy.js
Просмотреть файл

@ -79,7 +79,6 @@ 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",
},
@ -87,7 +86,6 @@ add_task(async function test_proxy_addresses() {
});
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"
);
});

43
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)
);

11
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">

2
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",

1
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,

12
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

2
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") {

5
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

4
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.
*/

13
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;

3
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;

11
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");

13
toolkit/components/extensions/parent/ext-proxy.js
Просмотреть файл

@ -31,7 +31,6 @@ const PROXY_TYPES_MAP = new Map([
const DEFAULT_PORTS = new Map([
["http", 80],
["ssl", 443],
["ftp", 21],
["socks", 1080],
]);
@ -42,8 +41,6 @@ ExtensionPreferencesManager.addSetting("proxy.settings", {
"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",
@ -68,7 +65,7 @@ ExtensionPreferencesManager.addSetting("proxy.settings", {
"network.http.proxy.respect-be-conservative": value.respectBeConservative,
};
for (let prop of ["http", "ftp", "ssl", "socks"]) {
for (let prop of ["http", "ssl", "socks"]) {
if (value[prop]) {
let url = new URL(`http://${value[prop]}`);
prefs[`network.proxy.${prop}`] = url.hostname;
@ -207,7 +204,7 @@ this.proxy = class extends ExtensionAPI {
);
}
for (let prop of ["http", "ftp", "ssl", "socks"]) {
for (let prop of ["http", "ssl", "socks"]) {
let host = Services.prefs.getCharPref(`network.proxy.${prop}`);
let port = Services.prefs.getIntPref(
`network.proxy.${prop}_port`
@ -263,12 +260,10 @@ this.proxy = class extends ExtensionAPI {
// Match what about:preferences does with proxy settings
// since the proxy service does not check the value
// of share_proxy_settings.
for (let prop of ["ftp", "ssl"]) {
value[prop] = value.http;
}
value.ssl = value.http;
}
for (let prop of ["http", "ftp", "ssl", "socks"]) {
for (let prop of ["http", "ssl", "socks"]) {
let host = value[prop];
if (host) {
try {

39
toolkit/components/extensions/test/xpcshell/test_ext_proxy_config.js
Просмотреть файл

@ -52,8 +52,6 @@ add_task(async function test_browser_settings() {
"network.proxy.http": "",
"network.proxy.http_port": 0,
"network.proxy.share_proxy_settings": false,
"network.proxy.ftp": "",
"network.proxy.ftp_port": 0,
"network.proxy.ssl": "",
"network.proxy.ssl_port": 0,
"network.proxy.socks": "",
@ -135,7 +133,6 @@ add_task(async function test_browser_settings() {
socksVersion: 5,
passthrough: "",
http: "",
ftp: "",
ssl: "",
socks: "",
respectBeConservative: true,
@ -232,15 +229,12 @@ add_task(async function test_browser_settings() {
{
proxyType: "manual",
http: "http://www.mozilla.org:8080",
ftp: "http://www.mozilla.org:1234",
httpProxyAll: true,
},
{
"network.proxy.type": proxySvc.PROXYCONFIG_MANUAL,
"network.proxy.http": "www.mozilla.org",
"network.proxy.http_port": 8080,
"network.proxy.ftp": "www.mozilla.org",
"network.proxy.ftp_port": 8080,
"network.proxy.ssl": "www.mozilla.org",
"network.proxy.ssl_port": 8080,
"network.proxy.share_proxy_settings": true,
@ -248,7 +242,6 @@ add_task(async function test_browser_settings() {
{
proxyType: "manual",
http: "www.mozilla.org:8080",
ftp: "www.mozilla.org:8080",
ssl: "www.mozilla.org:8080",
socks: "",
httpProxyAll: true,
@ -272,8 +265,6 @@ add_task(async function test_browser_settings() {
"network.proxy.http": "www.mozilla.org",
"network.proxy.http_port": 8080,
"network.proxy.share_proxy_settings": false,
"network.proxy.ftp": "www.mozilla.org",
"network.proxy.ftp_port": 8081,
"network.proxy.ssl": "www.mozilla.org",
"network.proxy.ssl_port": 8082,
"network.proxy.socks": "mozilla.org",
@ -281,6 +272,17 @@ add_task(async function test_browser_settings() {
"network.proxy.socks_version": 4,
"network.proxy.no_proxies_on": ".mozilla.org",
"network.http.proxy.respect-be-conservative": true,
},
{
proxyType: "manual",
http: "www.mozilla.org:8080",
httpProxyAll: false,
// ftp: "www.mozilla.org:8081", // This line should not be sent back
ssl: "www.mozilla.org:8082",
socks: "mozilla.org:8083",
socksVersion: 4,
passthrough: ".mozilla.org",
respectBeConservative: true,
}
);
@ -288,7 +290,6 @@ add_task(async function test_browser_settings() {
{
proxyType: "manual",
http: "http://www.mozilla.org",
ftp: "ftp://www.mozilla.org",
ssl: "https://www.mozilla.org",
socks: "mozilla.org",
socksVersion: 4,
@ -300,8 +301,6 @@ add_task(async function test_browser_settings() {
"network.proxy.http": "www.mozilla.org",
"network.proxy.http_port": 80,
"network.proxy.share_proxy_settings": false,
"network.proxy.ftp": "www.mozilla.org",
"network.proxy.ftp_port": 21,
"network.proxy.ssl": "www.mozilla.org",
"network.proxy.ssl_port": 443,
"network.proxy.socks": "mozilla.org",
@ -314,7 +313,6 @@ add_task(async function test_browser_settings() {
proxyType: "manual",
http: "www.mozilla.org:80",
httpProxyAll: false,
ftp: "www.mozilla.org:21",
ssl: "www.mozilla.org:443",
socks: "mozilla.org:1080",
socksVersion: 4,
@ -327,7 +325,6 @@ add_task(async function test_browser_settings() {
{
proxyType: "manual",
http: "http://www.mozilla.org:80",
ftp: "ftp://www.mozilla.org:21",
ssl: "https://www.mozilla.org:443",
socks: "mozilla.org:1080",
socksVersion: 4,
@ -339,8 +336,6 @@ add_task(async function test_browser_settings() {
"network.proxy.http": "www.mozilla.org",
"network.proxy.http_port": 80,
"network.proxy.share_proxy_settings": false,
"network.proxy.ftp": "www.mozilla.org",
"network.proxy.ftp_port": 21,
"network.proxy.ssl": "www.mozilla.org",
"network.proxy.ssl_port": 443,
"network.proxy.socks": "mozilla.org",
@ -353,7 +348,6 @@ add_task(async function test_browser_settings() {
proxyType: "manual",
http: "www.mozilla.org:80",
httpProxyAll: false,
ftp: "www.mozilla.org:21",
ssl: "www.mozilla.org:443",
socks: "mozilla.org:1080",
socksVersion: 4,
@ -366,7 +360,6 @@ add_task(async function test_browser_settings() {
{
proxyType: "manual",
http: "http://www.mozilla.org:80",
ftp: "ftp://www.mozilla.org:80",
ssl: "https://www.mozilla.org:80",
socks: "mozilla.org:80",
socksVersion: 4,
@ -378,8 +371,6 @@ add_task(async function test_browser_settings() {
"network.proxy.http": "www.mozilla.org",
"network.proxy.http_port": 80,
"network.proxy.share_proxy_settings": false,
"network.proxy.ftp": "www.mozilla.org",
"network.proxy.ftp_port": 80,
"network.proxy.ssl": "www.mozilla.org",
"network.proxy.ssl_port": 80,
"network.proxy.socks": "mozilla.org",
@ -392,7 +383,6 @@ add_task(async function test_browser_settings() {
proxyType: "manual",
http: "www.mozilla.org:80",
httpProxyAll: false,
ftp: "www.mozilla.org:80",
ssl: "www.mozilla.org:80",
socks: "mozilla.org:80",
socksVersion: 4,
@ -406,7 +396,6 @@ add_task(async function test_browser_settings() {
{
proxyType: "none",
http: "",
ftp: "",
ssl: "",
socks: "",
socksVersion: 5,
@ -417,8 +406,6 @@ add_task(async function test_browser_settings() {
"network.proxy.type": proxySvc.PROXYCONFIG_DIRECT,
"network.proxy.http": "",
"network.proxy.http_port": 0,
"network.proxy.ftp": "",
"network.proxy.ftp_port": 0,
"network.proxy.ssl": "",
"network.proxy.ssl_port": 0,
"network.proxy.socks": "",
@ -552,8 +539,6 @@ add_task(async function test_proxy_settings_permissions() {
"network.proxy.type",
"network.proxy.http",
"network.proxy.http_port",
"network.proxy.ftp",
"network.proxy.ftp_port",
"network.proxy.ssl",
"network.proxy.ssl_port",
"network.proxy.socks",
@ -589,7 +574,6 @@ add_task(async function test_proxy_settings_permissions() {
proxyType: "manual",
http: "www.mozilla.org:8080",
httpProxyAll: false,
ftp: "www.mozilla.org:8081",
ssl: "www.mozilla.org:8082",
socks: "mozilla.org:8083",
socksVersion: 4,
@ -607,7 +591,6 @@ add_task(async function test_proxy_settings_permissions() {
proxyType: "manual",
http: "www.mozilla.org:8080",
httpProxyAll: false,
ftp: "www.mozilla.org:8081",
ssl: "www.mozilla.org:8082",
socks: "mozilla.org:8083",
socksVersion: 4,

20
toolkit/components/extensions/test/xpcshell/test_proxy_listener.js
Просмотреть файл

@ -249,26 +249,7 @@ add_task(async function test_passthrough() {
await ext1.unload();
});
add_task(async function test_ftp() {
Services.prefs.setBoolPref("network.ftp.enabled", true);
let extension = await getExtension({
host: "1.2.3.4",
port: 8888,
type: "http",
});
let proxyInfo = await getProxyInfo("ftp://somewhere.mozilla.org/");
equal(proxyInfo.host, "1.2.3.4", `proxy host correct`);
equal(proxyInfo.port, "8888", `proxy port correct`);
equal(proxyInfo.type, "http", `proxy type correct`);
await extension.unload();
Services.prefs.clearUserPref("network.ftp.enabled");
});
add_task(async function test_ftp_disabled() {
Services.prefs.setBoolPref("network.ftp.enabled", false);
let extension = await getExtension({
host: "1.2.3.4",
port: 8888,
@ -284,7 +265,6 @@ add_task(async function test_ftp_disabled() {
);
await extension.unload();
Services.prefs.clearUserPref("network.ftp.enabled");
});
add_task(async function test_ws() {