Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-17 15:37:57 +01:00
Code Issues Projects Releases Wiki Activity

detech password changes with 2 equal passwords

Browse Source
This commit is contained in:
Kyle Spearrin 2018-09-07 08:01:50 -04:00
parent 768aab2bf8
commit d2e5c9b6ea
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/background/runtime.background.ts
View File

@ -316,10 +316,18 @@ export default class RuntimeBackground {
return;
}
let id: string = null;
const ciphers = await this.cipherService.getAllDecryptedForUrl(changeData.url);
if (changeData.currentPassword != null) {
const passwordMatches = ciphers.filter((c) => c.login.password === changeData.currentPassword);
if (passwordMatches.length === 1) {
this.addChangedPasswordToQueue(passwordMatches[0].id, loginDomain, changeData.newPassword, tab);
id = passwordMatches[0].id;
}
} else if (ciphers.length === 1) {
id = ciphers[0].id;
}
if (id != null) {
this.addChangedPasswordToQueue(id, loginDomain, changeData.newPassword, tab);
}
}

9
src/content/notificationBar.ts
View File

@ -351,6 +351,7 @@ document.addEventListener('DOMContentLoaded', (event) => {
let curPass: string = null;
let newPass: string = null;
let newPassOnly = false;
if (formData[i].passwordEls.length === 3 && passwords.length === 3) {
newPass = passwords[1];
if (passwords[0] !== newPass && newPass === passwords[2]) {
@ -359,6 +360,11 @@ document.addEventListener('DOMContentLoaded', (event) => {
curPass = passwords[2];
}
} else if (formData[i].passwordEls.length === 2 && passwords.length === 2) {
if (passwords[0] === passwords[1]) {
newPassOnly = true;
newPass = passwords[0];
curPass = null;
} else {
const buttonText = getButtonText(getSubmitButton(form, changePasswordButtonNames));
const matches = Array.from(changePasswordButtonContainsNames)
.filter((n) => buttonText.indexOf(n) > -1);
@ -367,8 +373,9 @@ document.addEventListener('DOMContentLoaded', (event) => {
newPass = passwords[1];
}
}
}
if (newPass != null && curPass != null) {
if (newPass != null && curPass != null || (newPassOnly && newPass != null)) {
processedForm(form);
sendPlatformMessage({
command: 'bgChangedPassword',