corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset ddcbb81610fd (bug 1355198) for Android test_ext_proxy.html bustage

Browse Source 
MozReview-Commit-ID: KetgckpyHea
This commit is contained in:
Phil Ringnalda
2017-04-26 20:38:36 -07:00
parent ac3e23f1eb
commit cc1b685ac9
2 changed files with 10 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
toolkit/components/extensions/ProxyScriptContext.jsm
View File

@@ -158,40 +158,27 @@ class ProxyScriptContext extends BaseContext {
if (!rule) { if (!rule) {
this.extension.emit("proxy-error", { this.extension.emit("proxy-error", {
message: "FindProxyForURL: Missing Proxy Rule", message: "FindProxyForURL: Expected Proxy Rule",
}); });
return null; return null;
} }
let parts = rule.split(/\s+/); let parts = rule.split(/\s+/);
if (!parts[0] || parts.length !== 2) {
if (!parts[0]) {
this.extension.emit("proxy-error", { this.extension.emit("proxy-error", {
message: "FindProxyForURL: Missing Proxy Rule", message: `FindProxyForURL: Invalid Proxy Rule: ${rule}`,
}); });
return null; return null;
} }
if (parts.length > 2) { parts[0] = parts[0].toLowerCase();
this.extension.emit("proxy-error", {
message: `FindProxyForURL: Too many arguments passed for proxy rule: "${rule}"`,
});
return null;
}
switch (parts[0].toLowerCase()) { switch (parts[0]) {
case PROXY_TYPES.PROXY: case PROXY_TYPES.PROXY:
case PROXY_TYPES.SOCKS: case PROXY_TYPES.SOCKS:
if (!parts[1]) { if (!parts[1]) {
this.extension.emit("proxy-error", { this.extension.emit("proxy-error", {
message: `FindProxyForURL: Missing argument for proxy type: "${parts[0]}"`, message: `FindProxyForURL: Missing argument for "${parts[0]}"`,
});
return null;
}
if (parts.length != 2) {
this.extension.emit("proxy-error", {
message: `FindProxyForURL: Too many arguments for proxy rule: "${rule}"`,
}); });
return null; return null;
} }
@@ -199,13 +186,13 @@ class ProxyScriptContext extends BaseContext {
let [host, port] = parts[1].split(":"); let [host, port] = parts[1].split(":");
if (!host || !port) { if (!host || !port) {
this.extension.emit("proxy-error", { this.extension.emit("proxy-error", {
message: `FindProxyForURL: Unable to parse host and port from proxy rule: "${rule}"`, message: `FindProxyForURL: Unable to parse argument for ${rule}`,
}); });
return null; return null;
} }
let type = PROXY_TYPES.SOCKS; let type = PROXY_TYPES.SOCKS;
if (parts[0].toLowerCase() == PROXY_TYPES.PROXY) { if (parts[0] == PROXY_TYPES.PROXY) {
type = PROXY_TYPES.HTTPS; type = PROXY_TYPES.HTTPS;
} }
@@ -213,11 +200,6 @@ class ProxyScriptContext extends BaseContext {
return ProxyService.newProxyInfo(type, host, port, 0, return ProxyService.newProxyInfo(type, host, port, 0,
PROXY_TIMEOUT_SEC, failoverProxy); PROXY_TIMEOUT_SEC, failoverProxy);
case PROXY_TYPES.DIRECT: case PROXY_TYPES.DIRECT:
if (parts.length != 1) {
this.extension.emit("proxy-error", {
message: `FindProxyForURL: Invalid argument for proxy type: "${parts[0]}"`,
});
}
return null; return null;
default: default:
this.extension.emit("proxy-error", { this.extension.emit("proxy-error", {

67
toolkit/components/extensions/test/mochitest/test_ext_proxy.html
View File

@@ -63,7 +63,7 @@ add_task(function* test_invalid_FindProxyForURL_type() {
}); });
}); });
add_task(function* test_invalid_FindProxyForURL_return_types() { add_task(function* test_invalid_FindProxyForURL_return_type() {
yield testProxyScript( yield testProxyScript(
() => { () => {
function FindProxyForURL() { function FindProxyForURL() {
@@ -79,70 +79,7 @@ add_task(function* test_invalid_FindProxyForURL_return_types() {
return "INVALID"; return "INVALID";
} }
}, { }, {
message: "FindProxyForURL: Unrecognized proxy type: \"INVALID\"", message: "FindProxyForURL: Invalid Proxy Rule: INVALID",
});
yield testProxyScript(
() => {
function FindProxyForURL() {
return "SOCKS";
}
}, {
message: "FindProxyForURL: Missing argument for proxy type: \"SOCKS\"",
});
yield testProxyScript(
() => {
function FindProxyForURL() {
return "PROXY 1.2.3.4:8080 EXTRA";
}
}, {
message: "FindProxyForURL: Too many arguments passed for proxy rule: \"PROXY 1.2.3.4:8080 EXTRA\"",
});
yield testProxyScript(
() => {
function FindProxyForURL() {
return "PROXY :";
}
}, {
message: "FindProxyForURL: Unable to parse host and port from proxy rule: \"PROXY :\"",
});
yield testProxyScript(
() => {
function FindProxyForURL() {
return "PROXY :8080";
}
}, {
message: "FindProxyForURL: Unable to parse host and port from proxy rule: \"PROXY :8080\"",
});
yield testProxyScript(
() => {
function FindProxyForURL() {
return "PROXY ::";
}
}, {
message: "FindProxyForURL: Unable to parse host and port from proxy rule: \"PROXY ::\"",
});
yield testProxyScript(
() => {
function FindProxyForURL() {
return "PROXY 1.2.3.4:";
}
}, {
message: "FindProxyForURL: Unable to parse host and port from proxy rule: \"PROXY 1.2.3.4:\"",
});
yield testProxyScript(
() => {
function FindProxyForURL() {
return "DIRECT 1.2.3.4:8080";
}
}, {
message: "FindProxyForURL: Invalid argument for proxy type: \"DIRECT\"",
}); });
}); });