Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 407567 - Can't add login with empty formSubmitURL and null httpRealm. r=gavin, a1.9=damons

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@251086 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dolske%mozilla.com 2008-05-02 07:54:54 +00:00
parent 0f92ae9659
commit 819bbcd228
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/toolkit/components/passwordmgr/src/nsLoginManager.js
View File

@ -363,8 +363,19 @@ LoginManager.prototype = {
if (login.password == null || login.password.length == 0)
throw "Can't add a login with a null or empty password.";
if (!login.httpRealm && !login.formSubmitURL)
if (login.formSubmitURL || login.formSubmitURL == "") {
// We have a form submit URL. Can't have a HTTP realm.
if (login.httpRealm != null)
throw "Can't add a login with both a httpRealm and formSubmitURL.";
} else if (login.httpRealm) {
// We have a HTTP realm. Can't have a form submit URL.
if (login.formSubmitURL != null)
throw "Can't add a login with both a httpRealm and formSubmitURL.";
} else {
// Need one or the other!
throw "Can't add a login without a httpRealm or formSubmitURL.";
}
// Look for an existing entry.
var logins = this.findLogins({}, login.hostname, login.formSubmitURL,

6
mozilla/toolkit/components/passwordmgr/test/unit/head_storage_legacy_1.js
View File

@ -81,15 +81,15 @@ const LoginTest = {
checkExpectedError : function (aExpectedError, aActualError) {
if (aExpectedError) {
if (!aActualError)
throw "Storage didn't throw as expected (" + aExpectedError + ")";
throw "Test didn't throw as expected (" + aExpectedError + ")";
if (!aExpectedError.test(aActualError))
throw "Storage threw (" + aActualError + "), not (" + aExpectedError;
throw "Test threw (" + aActualError + "), not (" + aExpectedError;
// We got the expected error, so make a note in the test log.
dump("...that error was expected.\n\n");
} else if (aActualError) {
throw "Component threw unexpected error: " + aActualError;
throw "Test threw unexpected error: " + aActualError;
}
},