bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 14:23:32 +00:00
Code Issues Releases Wiki Activity

Add backwards compatability for new local hashing method (#407)

Browse Source 
* Add backwards compatability for existing keyHash

* Minor changes for review comments
This commit is contained in:
Thomas Rittson
2021-06-14 14:35:58 -07:00
committed by GitHub
parent d2ca46b6f5
commit d63ee1858d
5 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
angular/src/components/lock.component.ts
View File

@@ -112,27 +112,25 @@ export class LockComponent implements OnInit {
}
} else {
const key = await this.cryptoService.makeKey(this.masterPassword, this.email, kdf, kdfIterations);
const localKeyHash = await this.cryptoService.hashPassword(this.masterPassword, key,
HashPurpose.LocalAuthorization);
const storedKeyHash = await this.cryptoService.getKeyHash();
let passwordValid = false;
if (localKeyHash != null) {
const storedKeyHash = await this.cryptoService.getKeyHash();
if (storedKeyHash != null) {
passwordValid = storedKeyHash === localKeyHash;
} else {
const request = new PasswordVerificationRequest();
const serverKeyHash = await this.cryptoService.hashPassword(this.masterPassword, key,
HashPurpose.ServerAuthorization);
request.masterPasswordHash = serverKeyHash;
try {
this.formPromise = this.apiService.postAccountVerifyPassword(request);
await this.formPromise;
passwordValid = true;
await this.cryptoService.setKeyHash(localKeyHash);
} catch { }
}
if (storedKeyHash != null) {
passwordValid = await this.cryptoService.compareAndUpdateKeyHash(this.masterPassword, key);
} else {
const request = new PasswordVerificationRequest();
const serverKeyHash = await this.cryptoService.hashPassword(this.masterPassword, key,
HashPurpose.ServerAuthorization);
request.masterPasswordHash = serverKeyHash;
try {
this.formPromise = this.apiService.postAccountVerifyPassword(request);
await this.formPromise;
passwordValid = true;
const localKeyHash = await this.cryptoService.hashPassword(this.masterPassword, key,
HashPurpose.LocalAuthorization);
await this.cryptoService.setKeyHash(localKeyHash);
} catch { }
}
if (passwordValid) {