mirror of
https://github.com/bitwarden/browser
synced 2025-12-19 17:53:39 +00:00
[PM-15001] Replace throttle decorator (#15015)
* Add comments to AuditService Abstraction * Replace throttle usage with rxjs mergeMap with concurrent limit * Add test cases for audit service * Remove throttle
This commit is contained in:
81
libs/common/src/services/audit.service.spec.ts
Normal file
81
libs/common/src/services/audit.service.spec.ts
Normal file
@@ -0,0 +1,81 @@
|
||||
import { ApiService } from "../abstractions/api.service";
|
||||
import { CryptoFunctionService } from "../key-management/crypto/abstractions/crypto-function.service";
|
||||
import { ErrorResponse } from "../models/response/error.response";
|
||||
|
||||
import { AuditService } from "./audit.service";
|
||||
|
||||
jest.useFakeTimers();
|
||||
|
||||
// Polyfill global Request for Jest environment if not present
|
||||
if (typeof global.Request === "undefined") {
|
||||
global.Request = jest.fn((input: string | URL, init?: RequestInit) => {
|
||||
return { url: typeof input === "string" ? input : input.toString(), ...init };
|
||||
}) as any;
|
||||
}
|
||||
|
||||
describe("AuditService", () => {
|
||||
let auditService: AuditService;
|
||||
let mockCrypto: jest.Mocked<CryptoFunctionService>;
|
||||
let mockApi: jest.Mocked<ApiService>;
|
||||
|
||||
beforeEach(() => {
|
||||
mockCrypto = {
|
||||
hash: jest.fn().mockResolvedValue(Buffer.from("AABBCCDDEEFF", "hex")),
|
||||
} as unknown as jest.Mocked<CryptoFunctionService>;
|
||||
|
||||
mockApi = {
|
||||
nativeFetch: jest.fn().mockResolvedValue({
|
||||
text: jest.fn().mockResolvedValue(`CDDEEFF:4\nDDEEFF:2\n123456:1`),
|
||||
}),
|
||||
getHibpBreach: jest.fn(),
|
||||
} as unknown as jest.Mocked<ApiService>;
|
||||
|
||||
auditService = new AuditService(mockCrypto, mockApi, 2);
|
||||
});
|
||||
|
||||
it("should not exceed max concurrent passwordLeaked requests", async () => {
|
||||
const inFlight: string[] = [];
|
||||
const maxInFlight: number[] = [];
|
||||
|
||||
// Patch fetchLeakedPasswordCount to track concurrency
|
||||
const origFetch = (auditService as any).fetchLeakedPasswordCount.bind(auditService);
|
||||
jest
|
||||
.spyOn(auditService as any, "fetchLeakedPasswordCount")
|
||||
.mockImplementation(async (password: string) => {
|
||||
inFlight.push(password);
|
||||
maxInFlight.push(inFlight.length);
|
||||
// Simulate async work to allow concurrency limiter to take effect
|
||||
await new Promise((resolve) => setTimeout(resolve, 100));
|
||||
inFlight.splice(inFlight.indexOf(password), 1);
|
||||
return origFetch(password);
|
||||
});
|
||||
|
||||
const p1 = auditService.passwordLeaked("password1");
|
||||
const p2 = auditService.passwordLeaked("password2");
|
||||
const p3 = auditService.passwordLeaked("password3");
|
||||
const p4 = auditService.passwordLeaked("password4");
|
||||
|
||||
jest.advanceTimersByTime(250);
|
||||
|
||||
// Flush all pending timers and microtasks
|
||||
await jest.runAllTimersAsync();
|
||||
await Promise.all([p1, p2, p3, p4]);
|
||||
|
||||
// The max value in maxInFlight should not exceed 2 (the concurrency limit)
|
||||
expect(Math.max(...maxInFlight)).toBeLessThanOrEqual(2);
|
||||
expect((auditService as any).fetchLeakedPasswordCount).toHaveBeenCalledTimes(4);
|
||||
expect(mockCrypto.hash).toHaveBeenCalledTimes(4);
|
||||
expect(mockApi.nativeFetch).toHaveBeenCalledTimes(4);
|
||||
});
|
||||
|
||||
it("should return empty array for breachedAccounts on 404", async () => {
|
||||
mockApi.getHibpBreach.mockRejectedValueOnce({ statusCode: 404 } as ErrorResponse);
|
||||
const result = await auditService.breachedAccounts("user@example.com");
|
||||
expect(result).toEqual([]);
|
||||
});
|
||||
|
||||
it("should throw error for breachedAccounts on non-404 error", async () => {
|
||||
mockApi.getHibpBreach.mockRejectedValueOnce({ statusCode: 500 } as ErrorResponse);
|
||||
await expect(auditService.breachedAccounts("user@example.com")).rejects.toThrow();
|
||||
});
|
||||
});
|
||||
@@ -1,21 +1,58 @@
|
||||
import { Subject } from "rxjs";
|
||||
import { mergeMap } from "rxjs/operators";
|
||||
|
||||
import { ApiService } from "../abstractions/api.service";
|
||||
import { AuditService as AuditServiceAbstraction } from "../abstractions/audit.service";
|
||||
import { CryptoFunctionService } from "../key-management/crypto/abstractions/crypto-function.service";
|
||||
import { BreachAccountResponse } from "../models/response/breach-account.response";
|
||||
import { ErrorResponse } from "../models/response/error.response";
|
||||
import { throttle } from "../platform/misc/throttle";
|
||||
import { Utils } from "../platform/misc/utils";
|
||||
|
||||
const PwnedPasswordsApi = "https://api.pwnedpasswords.com/range/";
|
||||
|
||||
export class AuditService implements AuditServiceAbstraction {
|
||||
private passwordLeakedSubject = new Subject<{
|
||||
password: string;
|
||||
resolve: (count: number) => void;
|
||||
reject: (err: any) => void;
|
||||
}>();
|
||||
|
||||
constructor(
|
||||
private cryptoFunctionService: CryptoFunctionService,
|
||||
private apiService: ApiService,
|
||||
) {}
|
||||
private readonly maxConcurrent: number = 100, // default to 100, can be overridden
|
||||
) {
|
||||
this.maxConcurrent = maxConcurrent;
|
||||
this.passwordLeakedSubject
|
||||
.pipe(
|
||||
mergeMap(
|
||||
// Handle each password leak request, resolving or rejecting the associated promise.
|
||||
async (req) => {
|
||||
try {
|
||||
const count = await this.fetchLeakedPasswordCount(req.password);
|
||||
req.resolve(count);
|
||||
} catch (err) {
|
||||
req.reject(err);
|
||||
}
|
||||
},
|
||||
this.maxConcurrent, // Limit concurrent API calls
|
||||
),
|
||||
)
|
||||
.subscribe();
|
||||
}
|
||||
|
||||
@throttle(100, () => "passwordLeaked")
|
||||
async passwordLeaked(password: string): Promise<number> {
|
||||
return new Promise<number>((resolve, reject) => {
|
||||
this.passwordLeakedSubject.next({ password, resolve, reject });
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches the count of leaked passwords from the Pwned Passwords API.
|
||||
* @param password The password to check.
|
||||
* @returns A promise that resolves to the number of times the password has been leaked.
|
||||
*/
|
||||
protected async fetchLeakedPasswordCount(password: string): Promise<number> {
|
||||
const hashBytes = await this.cryptoFunctionService.hash(password, "sha1");
|
||||
const hash = Utils.fromBufferToHex(hashBytes).toUpperCase();
|
||||
const hashStart = hash.substr(0, 5);
|
||||
|
||||
Reference in New Issue
Block a user