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

revert: [PR-13659] remove 2FA timeout logging and fix attempts

Browse Source 
This reverts two previous commits:
- PM-13659 - 2FA Timeout Log All the things (#12275)
- Auth/PM-13659 - 2FA Timeout - Attempted Fix (#12263)
This commit is contained in:
Alec Rippberger
2024-12-06 13:42:32 -06:00
committed by GitHub
parent d295825ff1
commit 69800d01ab
6 changed files with 9 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/auth/src/common/abstractions/login-strategy.service.ts
View File

@@ -14,8 +14,6 @@ import {
} from "../models/domain/login-credentials";
export abstract class LoginStrategyServiceAbstraction {
id: string;
/**
* The current strategy being used to authenticate.
* Emits null if the session has timed out.

53
libs/auth/src/common/services/login-strategies/login-strategy.service.ts
View File

@@ -7,7 +7,6 @@ import {
shareReplay,
Subscription,
BehaviorSubject,
tap,
} from "rxjs";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -32,7 +31,6 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { TaskSchedulerService, ScheduledTaskNames } from "@bitwarden/common/platform/scheduling";
import { GlobalState, GlobalStateProvider } from "@bitwarden/common/platform/state";
import { DeviceTrustServiceAbstraction } from "@bitwarden/common/src/auth/abstractions/device-trust.service.abstraction";
@@ -73,8 +71,6 @@ import {
const sessionTimeoutLength = 5 * 60 * 1000; // 5 minutes
export type Executor = (fn: () => void) => void;
export class LoginStrategyService implements LoginStrategyServiceAbstraction {
private sessionTimeoutSubscription: Subscription;
private currentAuthnTypeState: GlobalState<AuthenticationType | null>;
@@ -83,36 +79,7 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
private authRequestPushNotificationState: GlobalState<string>;
private twoFactorTimeoutSubject = new BehaviorSubject<boolean>(false);
twoFactorTimeout$: Observable<boolean> = this.twoFactorTimeoutSubject.asObservable().pipe(
// line 87 is the tap?
tap({
next: (value) => {
this.logService.info(
`LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} emmitted value: ${value}`,
);
},
error: (error: unknown) => {
this.logService.error(
`LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} errored with error: ${JSON.stringify(error)}`,
);
},
finalize: () => {
this.logService.info(
`LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} finalized`,
);
},
complete: () => {
this.logService.info(
`LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} completed`,
);
},
subscribe: () => {
this.logService.info(
`LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} subscribed`,
);
},
}),
);
twoFactorTimeout$: Observable<boolean> = this.twoFactorTimeoutSubject.asObservable();
private loginStrategy$: Observable<
| UserApiLoginStrategy
@@ -125,8 +92,6 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
currentAuthType$: Observable<AuthenticationType | null>;
id: string = Utils.newGuid();
constructor(
protected accountService: AccountService,
protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
@@ -153,7 +118,6 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
protected vaultTimeoutSettingsService: VaultTimeoutSettingsService,
protected kdfConfigService: KdfConfigService,
protected taskSchedulerService: TaskSchedulerService,
private authnSessionTimeoutExecutor: Executor = (fn) => fn(), // Default to no-op
) {
this.currentAuthnTypeState = this.stateProvider.get(CURRENT_LOGIN_STRATEGY_KEY);
this.loginStrategyCacheState = this.stateProvider.get(CACHE_KEY);
@@ -164,15 +128,12 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
this.taskSchedulerService.registerTaskHandler(
ScheduledTaskNames.loginStrategySessionTimeout,
async () => {
this.logService.info("Timeout executing for LoginStrategyService with id: " + this.id);
this.authnSessionTimeoutExecutor(async () => {
this.twoFactorTimeoutSubject.next(true);
try {
await this.clearCache();
} catch (e) {
this.logService.error("Failed to clear cache during session timeout", e);
}
});
this.twoFactorTimeoutSubject.next(true);
try {
await this.clearCache();
} catch (e) {
this.logService.error("Failed to clear cache during session timeout", e);
}
},
);