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

Bug 1016051 - Support adding a username to a password-only login upon capture. r=MattN 

--HG--
extra : commitid : 7PkYp0BwkYn
extra : rebase_source : c62b60f10dbe6adbc5b7140fe8e1ae85be9ae264
extra : amend_source : bc59f9ae6c7610d844f1845acf06fa34386a2bd6
This commit is contained in:
Bernardo P. Rittmeyer 2015-09-16 01:04:00 +02:00
Родитель 7a2a05eba6
Коммит 1bca3c2ed3
6 изменённых файлов: 97 добавлений и 53 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
toolkit/components/passwordmgr/LoginManagerParent.jsm
Просмотреть файл

@ -523,6 +523,10 @@ var LoginManagerParent = {
log("...passwords differ, prompting to change.");
prompter = getPrompter();
prompter.promptToChangePassword(existingLogin, formLogin);
} else if (!existingLogin.username && formLogin.username) {
log("...empty username update, prompting to change.");
prompter = getPrompter();
prompter.promptToChangePassword(existingLogin, formLogin);
} else {
recordLoginUse(existingLogin);
}

4
toolkit/components/passwordmgr/nsILoginManagerPrompter.idl
Просмотреть файл

@ -41,8 +41,8 @@ interface nsILoginManagerPrompter : nsISupports {
void promptToSavePassword(in nsILoginInfo aLogin);
/**
* Ask the user if they want to change a login's password. If the
* user consents, modifyLogin() will be called.
* Ask the user if they want to change a login's password or username.
* If the user consents, modifyLogin() will be called.
*
* @param aOldLogin
* The existing login (with the old password).

6
toolkit/components/passwordmgr/nsILoginMetaInfo.idl
Просмотреть файл

@ -40,8 +40,10 @@ interface nsILoginMetaInfo : nsISupports {
attribute unsigned long long timeLastUsed;
/**
* The time, in Unix Epoch milliseconds, when the login's password was
* last modified.
* The time, in Unix Epoch milliseconds, when the login was last modified.
*
* Contrary to what the name may suggest, this attribute takes into account
* not only the password but also the username attribute.
*/
attribute unsigned long long timePasswordChanged;

116
toolkit/components/passwordmgr/nsLoginManagerPrompter.js
Просмотреть файл

@ -377,18 +377,18 @@ LoginManagerPrompter.prototype = {
// If we didn't find an existing login, or if the username
// changed, save as a new login.
let newLogin = Cc["@mozilla.org/login-manager/loginInfo;1"].
createInstance(Ci.nsILoginInfo);
newLogin.init(hostname, null, realm,
aUsername.value, aPassword.value, "", "");
if (!selectedLogin) {
// add as new
this.log("New login seen for " + realm);
var newLogin = Cc["@mozilla.org/login-manager/loginInfo;1"].
createInstance(Ci.nsILoginInfo);
newLogin.init(hostname, null, realm,
aUsername.value, aPassword.value, "", "");
this._pwmgr.addLogin(newLogin);
} else if (aPassword.value != selectedLogin.password) {
// update password
this.log("Updating password for " + realm);
this._updateLogin(selectedLogin, aPassword.value);
this._updateLogin(selectedLogin, newLogin);
} else {
this.log("Login unchanged, no further action needed.");
this._updateLogin(selectedLogin);
@ -604,14 +604,14 @@ LoginManagerPrompter.prototype = {
// If we didn't find an existing login, or if the username
// changed, save as a new login.
let newLogin = Cc["@mozilla.org/login-manager/loginInfo;1"].
createInstance(Ci.nsILoginInfo);
newLogin.init(hostname, null, httpRealm,
username, password, "", "");
if (!selectedLogin) {
this.log("New login seen for " + username +
" @ " + hostname + " (" + httpRealm + ")");
var newLogin = Cc["@mozilla.org/login-manager/loginInfo;1"].
createInstance(Ci.nsILoginInfo);
newLogin.init(hostname, null, httpRealm,
username, password, "", "");
var notifyObj = this._getPopupNote() || notifyBox;
if (notifyObj)
this._showSaveLoginNotification(notifyObj, newLogin);
@ -625,10 +625,9 @@ LoginManagerPrompter.prototype = {
var notifyObj = this._getPopupNote() || notifyBox;
if (notifyObj)
this._showChangeLoginNotification(notifyObj,
selectedLogin, password);
selectedLogin, newLogin);
else
this._updateLogin(selectedLogin, password);
this._updateLogin(selectedLogin, newLogin);
} else {
this.log("Login unchanged, no further action needed.");
this._updateLogin(selectedLogin);
@ -825,7 +824,7 @@ LoginManagerPrompter.prototype = {
let foundLogins = Services.logins.findLogins({}, login.hostname,
login.formSubmitURL,
login.httpRealm);
let logins = foundLogins.filter(l => l.username == login.username);
let logins = this._filterUpdatableLogins(login, foundLogins);
let msgNames = (logins.length == 0) ? saveMsgNames : changeMsgNames;
// Update the label based on whether this will be a new login or not.
@ -918,7 +917,8 @@ LoginManagerPrompter.prototype = {
let foundLogins = Services.logins.findLogins({}, login.hostname,
login.formSubmitURL,
login.httpRealm);
let logins = foundLogins.filter(l => l.username == login.username);
let logins = this._filterUpdatableLogins(login, foundLogins);
if (logins.length == 0) {
// The original login we have been provided with might have its own
// metadata, but we don't want it propagated to the newly created one.
@ -930,11 +930,12 @@ LoginManagerPrompter.prototype = {
login.usernameField,
login.passwordField));
} else if (logins.length == 1) {
if (logins[0].password == login.password) {
if (logins[0].password == login.password &&
logins[0].username == login.username) {
// We only want to touch the login's use count and last used time.
this._updateLogin(logins[0], null);
this._updateLogin(logins[0]);
} else {
this._updateLogin(logins[0], login.password);
this._updateLogin(logins[0], login);
}
} else {
Cu.reportError("Unexpected match of multiple logins.");
@ -1192,25 +1193,27 @@ LoginManagerPrompter.prototype = {
},
/*
* promptToChangePassword
*
* Called when we think we detect a password change for an existing
* login, when the form being submitted contains multiple password
* fields.
/**
* Called when we think we detect a password or username change for
* an existing login, when the form being submitted contains multiple
* password fields.
*
* @param {nsILoginInfo} aOldLogin
* The old login we may want to update.
* @param {nsILoginInfo} aNewLogin
* The new login from the page form.
*/
promptToChangePassword : function (aOldLogin, aNewLogin) {
var notifyObj = this._getPopupNote() || this._getNotifyBox();
promptToChangePassword(aOldLogin, aNewLogin) {
let notifyObj = this._getPopupNote() || this._getNotifyBox();
if (notifyObj)
if (notifyObj) {
this._showChangeLoginNotification(notifyObj, aOldLogin,
aNewLogin.password);
else
this._showChangeLoginDialog(aOldLogin, aNewLogin.password);
aNewLogin);
} else {
this._showChangeLoginDialog(aOldLogin, aNewLogin);
}
},
/*
* _showChangeLoginNotification
*
@ -1218,8 +1221,15 @@ LoginManagerPrompter.prototype = {
*
* @param aNotifyObj
* A notification box or a popup notification.
*
* @param aOldLogin
* The stored login we want to update.
*
* @param aNewLogin
* The login object with the changes we want to make.
*
*/
_showChangeLoginNotification : function (aNotifyObj, aOldLogin, aNewPassword) {
_showChangeLoginNotification(aNotifyObj, aOldLogin, aNewLogin) {
var changeButtonText =
this._getLocalizedString("notifyBarUpdateButtonText");
var changeButtonAccessKey =
@ -1238,7 +1248,8 @@ LoginManagerPrompter.prototype = {
// Notification is a PopupNotification
if (aNotifyObj == this._getPopupNote()) {
aOldLogin.password = aNewPassword;
aOldLogin.password = aNewLogin.password;
aOldLogin.username = aNewLogin.username;
this._showLoginCaptureDoorhanger(aOldLogin, "password-change");
} else {
var dontChangeButtonText =
@ -1252,7 +1263,7 @@ LoginManagerPrompter.prototype = {
accessKey: changeButtonAccessKey,
popup: null,
callback: function(aNotifyObj, aButton) {
self._updateLogin(aOldLogin, aNewPassword);
self._updateLogin(aOldLogin, aNewLogin);
}
},
@ -1279,7 +1290,7 @@ LoginManagerPrompter.prototype = {
* Shows the Change Password dialog.
*
*/
_showChangeLoginDialog : function (aOldLogin, aNewPassword) {
_showChangeLoginDialog(aOldLogin, aNewLogin) {
const buttonFlags = Ci.nsIPrompt.STD_YES_NO_BUTTONS;
var dialogText;
@ -1301,7 +1312,7 @@ LoginManagerPrompter.prototype = {
null, {});
if (ok) {
this.log("Updating password for user " + aOldLogin.username);
this._updateLogin(aOldLogin, aNewPassword);
this._updateLogin(aOldLogin, aNewLogin);
}
},
@ -1337,7 +1348,7 @@ LoginManagerPrompter.prototype = {
// Now that we know which login to use, modify its password.
var selectedLogin = logins[selectedIndex.value];
this.log("Updating password for user " + selectedLogin.username);
this._updateLogin(selectedLogin, aNewLogin.password);
this._updateLogin(selectedLogin, aNewLogin);
}
},
@ -1349,15 +1360,13 @@ LoginManagerPrompter.prototype = {
/*
* _updateLogin
*/
_updateLogin : function (login, newPassword) {
_updateLogin(login, aNewLogin = null) {
var now = Date.now();
var propBag = Cc["@mozilla.org/hash-property-bag;1"].
createInstance(Ci.nsIWritablePropertyBag);
if (newPassword) {
propBag.setProperty("password", newPassword);
if (aNewLogin) {
propBag.setProperty("password", aNewLogin.password);
propBag.setProperty("username", aNewLogin.username);
// Explicitly set the password change time here (even though it would
// be changed automatically), to ensure that it's exactly the same
// value as timeLastUsed.
@ -1720,7 +1729,28 @@ LoginManagerPrompter.prototype = {
this.context = null;
}
};
}
},
/**
* This function looks for existing logins that can be updated
* to match a submitted login, instead of creating a new one.
*
* Given a login and a loginList, it filters the login list
* to find every login with either the same username as aLogin
* or with the same password as aLogin and an empty username
* so the user can add a username.
*
* @param {nsILoginInfo} aLogin
* login to use as filter.
* @param {nsILoginInfo[]} aLoginList
* Array of logins to filter.
* @returns {nsILoginInfo[]} the filtered array of logins.
*/
_filterUpdatableLogins(aLogin, aLoginList) {
return aLoginList.filter(l => l.username == aLogin.username ||
(l.password == aLogin.password &&
!l.username));
},
}; // end of LoginManagerPrompter implementation

13
toolkit/components/passwordmgr/test/notification_common.js
Просмотреть файл

@ -33,15 +33,22 @@ function getPopupNotifications(aWindow) {
}
/*
* getPopup
/**
* Checks if we have a password popup notification
* of the right type and with the right label.
*
* @returns the found password popup notification.
*/
function getPopup(aPopupNote, aKind) {
ok(true, "Looking for " + aKind + " popup notification");
var notification = aPopupNote.getNotification("password");
if (notification) {
is(notification.options.passwordNotificationType, aKind);
is(notification.options.passwordNotificationType, aKind, "Notification type matches.");
if (aKind == "password-change") {
is(notification.mainAction.label, "Update", "Main action label matches update doorhanger.");
} else if (aKind == "password-save") {
is(notification.mainAction.label, "Remember", "Main action label matches save doorhanger.");
}
}
return notification;
}

7
toolkit/components/passwordmgr/test/test_notifications.html
Просмотреть файл

@ -246,11 +246,12 @@ function checkTest() {
break;
case 13:
// Check for no notification popup when existing pw-only login matches form.
// Check for update popup when existing pw-only login matches form.
is(gotUser, "notifyu1", "Checking submitted username");
is(gotPass, "notifyp1", "Checking submitted password");
popup = getPopup(popupNotifications, "password-save");
ok(!popup, "checking for no notification popup");
popup = getPopup(popupNotifications, "password-change");
ok(popup, "checking for notification popup");
popup.remove();
pwmgr.removeLogin(login2);
// Add login for the next test