wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1216986 - Fix usage of nsIURI.host in password manager and prompt code to support IPv6. r=dolske,liuche,kanru

Browse Source
This commit is contained in:
Matthew Noorenberghe 2015-12-02 16:13:18 -08:00
parent 56610d1db6
commit 8cb6229298
8 changed files with 52 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dom/browser-element/BrowserElementPromptService.jsm
View File

@ -429,20 +429,12 @@ BrowserElementAuthPrompt.prototype = {
return [hostname, realm];
},
/**
* Strip out things like userPass and path for display.
*/
_getFormattedHostname : function(uri) {
let scheme = uri.scheme;
let hostname = scheme + "://" + uri.host;
// If the URI explicitly specified a port, only include it when
// it's not the default. (We never want "http://foo.com:80")
let port = uri.port;
if (port != -1) {
let handler = Services.io.getProtocolHandler(scheme);
if (port != handler.defaultPort)
hostname += ":" + port;
}
return hostname;
}
return uri.scheme + "://" + uri.hostPort;
},
};

32
mobile/android/components/LoginManagerPrompter.js
View File

@ -400,38 +400,6 @@ LoginManagerPrompter.prototype = {
}
return username.replace(/['"]/g, "");
},
/*
* _getFormattedHostname
*
* The aURI parameter may either be a string uri, or an nsIURI instance.
*
* Returns the hostname to use in a nsILoginInfo object (for example,
* "http://example.com").
*/
_getFormattedHostname : function (aURI) {
var uri;
if (aURI instanceof Ci.nsIURI) {
uri = aURI;
} else {
uri = Services.io.newURI(aURI, null, null);
}
var scheme = uri.scheme;
var hostname = scheme + "://" + uri.host;
// If the URI explicitly specified a port, only include it when
// it's not the default. (We never want "http://foo.com:80")
let port = uri.port;
if (port != -1) {
var handler = Services.io.getProtocolHandler(scheme);
if (port != handler.defaultPort)
hostname += ":" + port;
}
return hostname;
},
}; // end of LoginManagerPrompter implementation

16
mobile/android/components/PromptService.js
View File

@ -798,19 +798,11 @@ var PromptUtils = {
aAuthInfo.password = password;
},
/**
* Strip out things like userPass and path for display.
*/
getFormattedHostname : function pu_getFormattedHostname(uri) {
let scheme = uri.scheme;
let hostname = scheme + "://" + uri.host;
// If the URI explicitly specified a port, only include it when
// it's not the default. (We never want "http://foo.com:80")
let port = uri.port;
if (port != -1) {
let handler = Services.io.getProtocolHandler(scheme);
if (port != handler.defaultPort)
hostname += ":" + port;
}
return hostname;
return uri.scheme + "://" + uri.hostPort;
},
fireDialogEvent: function(aDomWin, aEventName) {

25
toolkit/components/passwordmgr/LoginManagerContent.jsm
View File

@ -1149,41 +1149,30 @@ var LoginManagerContent = {
};
var LoginUtils = {
/*
* _getPasswordOrigin
*
/**
* Get the parts of the URL we want for identification.
* Strip out things like the userPass portion
*/
_getPasswordOrigin : function (uriString, allowJS) {
_getPasswordOrigin(uriString, allowJS) {
var realm = "";
try {
var uri = Services.io.newURI(uriString, null, null);
if (allowJS && uri.scheme == "javascript")
return "javascript:"
realm = uri.scheme + "://" + uri.host;
// If the URI explicitly specified a port, only include it when
// it's not the default. (We never want "http://foo.com:80")
var port = uri.port;
if (port != -1) {
var handler = Services.io.getProtocolHandler(uri.scheme);
if (port != handler.defaultPort)
realm += ":" + port;
}
return "javascript:";
realm = uri.scheme + "://" + uri.hostPort;
} catch (e) {
// bug 159484 - disallow url types that don't support a hostPort.
// (although we handle "javascript:..." as a special case above.)
log("Couldn't parse origin for", uriString);
log("Couldn't parse origin for", uriString, e);
realm = null;
}
return realm;
},
_getActionOrigin : function (form) {
_getActionOrigin(form) {
var uriString = form.action;
// A blank or missing action submits to where it came from.

20
toolkit/components/passwordmgr/nsLoginManagerPrompter.js
View File

@ -1567,35 +1567,21 @@ LoginManagerPrompter.prototype = {
},
/*
* _getFormattedHostname
*
/**
* The aURI parameter may either be a string uri, or an nsIURI instance.
*
* Returns the hostname to use in a nsILoginInfo object (for example,
* "http://example.com").
*/
_getFormattedHostname : function (aURI) {
var uri;
let uri;
if (aURI instanceof Ci.nsIURI) {
uri = aURI;
} else {
uri = Services.io.newURI(aURI, null, null);
}
var scheme = uri.scheme;
var hostname = scheme + "://" + uri.host;
// If the URI explicitly specified a port, only include it when
// it's not the default. (We never want "http://foo.com:80")
var port = uri.port;
if (port != -1) {
var handler = Services.io.getProtocolHandler(scheme);
if (port != handler.defaultPort)
hostname += ":" + port;
}
return hostname;
return uri.scheme + "://" + uri.hostPort;
},

28
toolkit/components/passwordmgr/test/unit/test_getPasswordOrigin.js Normal file
View File

@ -0,0 +1,28 @@
/*
* Test for LoginUtils._getPasswordOrigin
*/
"use strict";
const LMCBackstagePass = Cu.import("resource://gre/modules/LoginManagerContent.jsm");
const TESTCASES = [
["javascript:void(0);", null],
["javascript:void(0);", "javascript:", true],
["chrome://MyAccount", null],
["data:text/html,example", null],
["http://username:password@example.com:80/foo?bar=baz#fragment", "http://example.com", true],
["http://127.0.0.1:80/foo", "http://127.0.0.1"],
["http://[::1]:80/foo", "http://[::1]"],
["http://example.com:8080/foo", "http://example.com:8080"],
["http://127.0.0.1:8080/foo", "http://127.0.0.1:8080", true],
["http://[::1]:8080/foo", "http://[::1]:8080"],
["https://example.com:443/foo", "https://example.com"],
["https://[::1]:443/foo", "https://[::1]"],
["https://[::1]:8443/foo", "https://[::1]:8443"],
["ftp://username:password@[::1]:2121/foo", "ftp://[::1]:2121"],
];
for (let [input, expected, allowJS] of TESTCASES) {
let actual = LMCBackstagePass.LoginUtils._getPasswordOrigin(input, allowJS);
Assert.strictEqual(actual, expected, "Checking: " + input);
}

1
toolkit/components/passwordmgr/test/unit/xpcshell.ini
View File

@ -22,6 +22,7 @@ run-if = buildapp == "browser"
[test_disabled_hosts.js]
[test_getFormFields.js]
[test_getPasswordFields.js]
[test_getPasswordOrigin.js]
[test_legacy_empty_formSubmitURL.js]
[test_legacy_validation.js]
[test_logins_change.js]

18
toolkit/components/prompts/src/nsPrompter.js
View File

@ -204,21 +204,11 @@ var PromptUtilsTemp = {
authInfo.password = password;
},
// Copied from login manager
/**
* Strip out things like userPass and path for display.
*/
getFormattedHostname : function (uri) {
let scheme = uri.scheme;
let hostname = scheme + "://" + uri.host;
// If the URI explicitly specified a port, only include it when
// it's not the default. (We never want "http://foo.com:80")
let port = uri.port;
if (port != -1) {
let handler = Services.io.getProtocolHandler(scheme);
if (port != handler.defaultPort)
hostname += ":" + port;
}
return hostname;
return uri.scheme + "://" + uri.hostPort;
},
// Copied from login manager