Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-03-22 15:19:15 +01:00
Code Issues Projects Releases Wiki Activity

[EC-598] feat: add automatic default timeouts

Browse Source
This commit is contained in:
Andreas Coroiu 2023-01-31 13:42:09 +01:00
parent c7e7ce832b
commit e981a1b0f2
No known key found for this signature in database
GPG Key ID: E70B5FFC81DFEC1A
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/browser/src/services/fido2/browser-fido2-user-interface.service.ts
View File

@ -188,4 +188,8 @@ export class BrowserFido2UserInterfaceService implements Fido2UserInterfaceServi
return false;
}
private setAbortTimeout(abortController: AbortController) {
return setTimeout(() => abortController.abort());
}
}

28
libs/common/src/services/fido2/fido2.service.ts
View File

@ -23,6 +23,9 @@ import { joseToDer } from "./ecdsa-utils";
// We support self-signing, but Google won't accept it.
// TODO: Look into supporting self-signed packed format.
const STANDARD_ATTESTATION_FORMAT: "none" | "packed" = "none";
const DEFAULT_TIMEOUT = 120000;
const MIN_TIMEOUT = 30000;
const MAX_TIMEOUT = 600000;
interface BitCredential {
credentialId: CredentialId;
@ -46,8 +49,13 @@ export class Fido2Service implements Fido2ServiceAbstraction {
async createCredential(
params: CredentialRegistrationParams,
abortController?: AbortController
abortController = new AbortController()
): Promise<CredentialRegistrationResult> {
// Comment: Timeouts could potentially be implemented using decorators.
// But since I try to use decorators a little as possible and only
// for the most generic solutions, I'm gonne leave this as is untill peer review.
const timeout = setAbortTimeout(abortController);
const presence = await this.fido2UserInterfaceService.confirmNewCredential(
{
credentialName: params.rp.name,
@ -115,6 +123,8 @@ export class Fido2Service implements Fido2ServiceAbstraction {
})
);
clearTimeout(timeout);
return {
credentialId: Fido2Utils.bufferToString(credentialId.raw),
clientDataJSON: Fido2Utils.bufferToString(clientData),
@ -127,8 +137,9 @@ export class Fido2Service implements Fido2ServiceAbstraction {
async assertCredential(
params: CredentialAssertParams,
abortController?: AbortController
abortController = new AbortController()
): Promise<CredentialAssertResult> {
const timeout = setAbortTimeout(abortController);
let credential: BitCredential | undefined;
if (params.allowedCredentialIds && params.allowedCredentialIds.length > 0) {
@ -185,6 +196,8 @@ export class Fido2Service implements Fido2ServiceAbstraction {
privateKey: credential.keyValue,
});
clearTimeout(timeout);
return {
credentialId: credential.credentialId.encoded,
clientDataJSON: Fido2Utils.bufferToString(clientData),
@ -194,10 +207,7 @@ export class Fido2Service implements Fido2ServiceAbstraction {
};
}
private async getCredential(
allowedCredentialIds: string[],
abortController?: AbortController
): Promise<BitCredential | undefined> {
private async getCredential(allowedCredentialIds: string[]): Promise<BitCredential | undefined> {
let cipher: Cipher | undefined;
for (const allowedCredential of allowedCredentialIds) {
cipher = await this.cipherService.get(allowedCredential);
@ -414,3 +424,9 @@ function authDataFlags(options: Flags): number {
return flags;
}
function setAbortTimeout(abortController: AbortController, timeout = DEFAULT_TIMEOUT): number {
// TODO: Set different timeouts depending on `userVerification` value
const clampedTimeout = Math.max(MIN_TIMEOUT, Math.min(timeout, MAX_TIMEOUT));
return window.setTimeout(() => abortController.abort(), clampedTimeout);
}