bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-11 05:43:41 +00:00
Code Issues Releases Wiki Activity

PM-19138: Add try-catch to desktop-autofill (#13964)

Browse Source
This commit is contained in:
Anders Åberg
2025-03-31 21:53:09 +02:00
committed by GitHub
parent 70661c014f
commit aeb3b9f94b
1 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
apps/desktop/src/autofill/services/desktop-autofill.service.ts
View File

@@ -147,7 +147,7 @@ export class DesktopAutofillService implements OnDestroy {
} }
listenIpc() { listenIpc() {
ipc.autofill.listenPasskeyRegistration((clientId, sequenceNumber, request, callback) => { ipc.autofill.listenPasskeyRegistration(async (clientId, sequenceNumber, request, callback) => {
this.logService.warning("listenPasskeyRegistration", clientId, sequenceNumber, request); this.logService.warning("listenPasskeyRegistration", clientId, sequenceNumber, request);
this.logService.warning( this.logService.warning(
"listenPasskeyRegistration2", "listenPasskeyRegistration2",
@@ -155,19 +155,19 @@ export class DesktopAutofillService implements OnDestroy {
); );
const controller = new AbortController(); const controller = new AbortController();
void this.fido2AuthenticatorService
.makeCredential( try {
const response = await this.fido2AuthenticatorService.makeCredential(
this.convertRegistrationRequest(request), this.convertRegistrationRequest(request),
{ windowXy: request.windowXy }, { windowXy: request.windowXy },
controller, controller,
) );
.then((response) => {
callback(null, this.convertRegistrationResponse(request, response)); callback(null, this.convertRegistrationResponse(request, response));
}) } catch (error) {
.catch((error) => { this.logService.error("listenPasskeyRegistration error", error);
this.logService.error("listenPasskeyRegistration error", error); callback(error, null);
callback(error, null); }
});
}); });
ipc.autofill.listenPasskeyAssertionWithoutUserInterface( ipc.autofill.listenPasskeyAssertionWithoutUserInterface(
@@ -179,55 +179,56 @@ export class DesktopAutofillService implements OnDestroy {
request, request,
); );
// For some reason the credentialId is passed as an empty array in the request, so we need to
// get it from the cipher. For that we use the recordIdentifier, which is the cipherId.
if (request.recordIdentifier && request.credentialId.length === 0) {
const activeUserId = await firstValueFrom(
this.accountService.activeAccount$.pipe(getOptionalUserId),
);
if (!activeUserId) {
this.logService.error("listenPasskeyAssertion error", "Active user not found");
callback(new Error("Active user not found"), null);
return;
}
const cipher = await this.cipherService.get(request.recordIdentifier, activeUserId);
if (!cipher) {
this.logService.error("listenPasskeyAssertion error", "Cipher not found");
callback(new Error("Cipher not found"), null);
return;
}
const decrypted = await cipher.decrypt(
await this.cipherService.getKeyForCipherKeyDecryption(cipher, activeUserId),
);
const fido2Credential = decrypted.login.fido2Credentials?.[0];
if (!fido2Credential) {
this.logService.error("listenPasskeyAssertion error", "Fido2Credential not found");
callback(new Error("Fido2Credential not found"), null);
return;
}
request.credentialId = Array.from(
parseCredentialId(decrypted.login.fido2Credentials?.[0].credentialId),
);
}
const controller = new AbortController(); const controller = new AbortController();
void this.fido2AuthenticatorService
.getAssertion( try {
// For some reason the credentialId is passed as an empty array in the request, so we need to
// get it from the cipher. For that we use the recordIdentifier, which is the cipherId.
if (request.recordIdentifier && request.credentialId.length === 0) {
const activeUserId = await firstValueFrom(
this.accountService.activeAccount$.pipe(getOptionalUserId),
);
if (!activeUserId) {
this.logService.error("listenPasskeyAssertion error", "Active user not found");
callback(new Error("Active user not found"), null);
return;
}
const cipher = await this.cipherService.get(request.recordIdentifier, activeUserId);
if (!cipher) {
this.logService.error("listenPasskeyAssertion error", "Cipher not found");
callback(new Error("Cipher not found"), null);
return;
}
const decrypted = await cipher.decrypt(
await this.cipherService.getKeyForCipherKeyDecryption(cipher, activeUserId),
);
const fido2Credential = decrypted.login.fido2Credentials?.[0];
if (!fido2Credential) {
this.logService.error("listenPasskeyAssertion error", "Fido2Credential not found");
callback(new Error("Fido2Credential not found"), null);
return;
}
request.credentialId = Array.from(
parseCredentialId(decrypted.login.fido2Credentials?.[0].credentialId),
);
}
const response = await this.fido2AuthenticatorService.getAssertion(
this.convertAssertionRequest(request), this.convertAssertionRequest(request),
{ windowXy: request.windowXy }, { windowXy: request.windowXy },
controller, controller,
) );
.then((response) => {
callback(null, this.convertAssertionResponse(request, response)); callback(null, this.convertAssertionResponse(request, response));
}) } catch (error) {
.catch((error) => { this.logService.error("listenPasskeyAssertion error", error);
this.logService.error("listenPasskeyAssertion error", error); callback(error, null);
callback(error, null); return;
}); }
}, },
); );
@@ -235,19 +236,18 @@ export class DesktopAutofillService implements OnDestroy {
this.logService.warning("listenPasskeyAssertion", clientId, sequenceNumber, request); this.logService.warning("listenPasskeyAssertion", clientId, sequenceNumber, request);
const controller = new AbortController(); const controller = new AbortController();
void this.fido2AuthenticatorService try {
.getAssertion( const response = await this.fido2AuthenticatorService.getAssertion(
this.convertAssertionRequest(request), this.convertAssertionRequest(request),
{ windowXy: request.windowXy }, { windowXy: request.windowXy },
controller, controller,
) );
.then((response) => {
callback(null, this.convertAssertionResponse(request, response)); callback(null, this.convertAssertionResponse(request, response));
}) } catch (error) {
.catch((error) => { this.logService.error("listenPasskeyAssertion error", error);
this.logService.error("listenPasskeyAssertion error", error); callback(error, null);
callback(error, null); }
});
}); });
} }