diff --git a/server/src/interceptors/logging.interceptor.ts b/server/src/interceptors/logging.interceptor.ts index 9ad433b..e923ad8 100644 --- a/server/src/interceptors/logging.interceptor.ts +++ b/server/src/interceptors/logging.interceptor.ts @@ -9,8 +9,10 @@ import { Observable, tap } from "rxjs"; import { TraceLogger } from "../common/trace-logger"; export function redactAuthRequestBody(path: string, body: unknown): unknown { + const normalizedPath = path.toLowerCase().replace(/\/+$/, ""); if ( - !/^(?:\/api\/v1)?\/auth\/login$/.test(path) || + (normalizedPath !== "/auth/login" && + normalizedPath !== "/api/v1/auth/login") || !body || typeof body !== "object" || Array.isArray(body) diff --git a/server/test/logging.interceptor.spec.ts b/server/test/logging.interceptor.spec.ts index cfe4671..aa26192 100644 --- a/server/test/logging.interceptor.spec.ts +++ b/server/test/logging.interceptor.spec.ts @@ -1,4 +1,10 @@ -import { redactAuthRequestBody } from "../src/interceptors/logging.interceptor"; +import { CallHandler, ExecutionContext } from "@nestjs/common"; +import { of } from "rxjs"; +import { TraceLogger } from "../src/common/trace-logger"; +import { + LoggingInterceptor, + redactAuthRequestBody, +} from "../src/interceptors/logging.interceptor"; describe("redactAuthRequestBody", () => { it("redacts login passwords on local and API-prefixed route paths", () => { @@ -11,6 +17,46 @@ describe("redactAuthRequestBody", () => { username: "operator", password: "[REDACTED]", }); + expect(redactAuthRequestBody("/api/v1/auth/login/", body)).toEqual({ + username: "operator", + password: "[REDACTED]", + }); + expect(redactAuthRequestBody("/API/V1/AUTH/LOGIN/", body)).toEqual({ + username: "operator", + password: "[REDACTED]", + }); expect(redactAuthRequestBody("/api/v1/scenarios", body)).toBe(body); }); + + it("never logs a password received on the accepted trailing-slash login path", () => { + const loggedMessages: unknown[][] = []; + const debug = jest + .spyOn(TraceLogger.prototype, "debug") + .mockImplementation((...args: unknown[]) => { + loggedMessages.push(args); + }); + const context = { + switchToHttp: () => ({ + getRequest: () => ({ + method: "POST", + url: "/api/v1/auth/login/", + path: "/api/v1/auth/login/", + body: { username: "operator", password: "synthetic-login-secret" }, + }), + getResponse: () => ({ statusCode: 200 }), + }), + } as unknown as ExecutionContext; + const handler = { + handle: () => of({ user: { username: "operator" } }), + } as CallHandler; + + try { + new LoggingInterceptor().intercept(context, handler).subscribe(); + const output = JSON.stringify(loggedMessages); + expect(output).toContain("[REDACTED]"); + expect(output).not.toContain("synthetic-login-secret"); + } finally { + debug.mockRestore(); + } + }); });