Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0a0e70b273 | ||
|
|
449cfcd6c5 | ||
|
|
966a1f793a | ||
|
|
d1f6969dc7 |
@@ -1,5 +1,19 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [2.3.0](https://git.personal.ksv741.ru/WealthLedger/backend/compare/v2.2.0...v2.3.0) (2026-10-24)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* log unhandled errors and pretty dev output (WealthLedger/backend[#120](https://git.personal.ksv741.ru/WealthLedger/backend/issues/120)) ([#126](https://git.personal.ksv741.ru/WealthLedger/backend/issues/126)) ([966a1f7](https://git.personal.ksv741.ru/WealthLedger/backend/commit/966a1f793aa2087cce3e47750e0017f78315bd64))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* persist refresh cookie across browser restarts (WealthLedger/backend[#123](https://git.personal.ksv741.ru/WealthLedger/backend/issues/123)) ([d1f6969](https://git.personal.ksv741.ru/WealthLedger/backend/commit/d1f6969dc7c22ae3cf7396bccdbf0cea2f61db2e))
|
||||||
|
|
||||||
|
### Maintenance
|
||||||
|
|
||||||
|
* **deps:** update non-major dependencies [#11](https://git.personal.ksv741.ru/WealthLedger/backend/issues/11) ([449cfcd](https://git.personal.ksv741.ru/WealthLedger/backend/commit/449cfcd6c5a91307012bb3a640c8255ba243cbf5))
|
||||||
|
|
||||||
## [2.2.0](https://git.personal.ksv741.ru/WealthLedger/backend/compare/v2.1.0...v2.2.0) (2026-10-18)
|
## [2.2.0](https://git.personal.ksv741.ru/WealthLedger/backend/compare/v2.1.0...v2.2.0) (2026-10-18)
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM node:24.21.0-bookworm-slim AS base
|
FROM node:24.22.1-bookworm-slim AS base
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
FROM base AS dependencies
|
FROM base AS dependencies
|
||||||
|
|||||||
+1
-1
@@ -37,7 +37,7 @@ export default defineConfig(
|
|||||||
linterOptions: { reportUnusedDisableDirectives: 'error' },
|
linterOptions: { reportUnusedDisableDirectives: 'error' },
|
||||||
settings: {
|
settings: {
|
||||||
'import-x/resolver-next': [createTypeScriptImportResolver()],
|
'import-x/resolver-next': [createTypeScriptImportResolver()],
|
||||||
'node': { tryExtensions: ['.ts', '.js', '.json', '.node'], version: '24.21.0' },
|
'node': { tryExtensions: ['.ts', '.js', '.json', '.node'], version: '24.22.1' },
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
'curly': ['error', 'multi-line'],
|
'curly': ['error', 'multi-line'],
|
||||||
|
|||||||
Generated
+1033
-1293
File diff suppressed because it is too large
Load Diff
+49
-39
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "wealth-ledger-backend",
|
"name": "wealth-ledger-backend",
|
||||||
"version": "2.2.0",
|
"version": "2.3.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"author": "",
|
"author": "",
|
||||||
"private": true,
|
"private": true,
|
||||||
"license": "UNLICENSED",
|
"license": "UNLICENSED",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "v24.21.0"
|
"node": "v24.22.1"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "prisma generate && nest build",
|
"build": "prisma generate && nest build",
|
||||||
@@ -39,17 +39,17 @@
|
|||||||
"test:lint": "node --test test/eslint-config.cjs"
|
"test:lint": "node --test test/eslint-config.cjs"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@grpc/grpc-js": "1.14.5",
|
"@grpc/grpc-js": "1.14.6",
|
||||||
"@grpc/proto-loader": "0.8.1",
|
"@grpc/proto-loader": "0.8.1",
|
||||||
"@nestjs/common": "12.0.1",
|
"@nestjs/common": "12.2.0",
|
||||||
"@nestjs/config": "12.0.0",
|
"@nestjs/config": "12.0.1",
|
||||||
"@nestjs/core": "12.0.1",
|
"@nestjs/core": "12.2.0",
|
||||||
"@nestjs/jwt": "12.0.1",
|
"@nestjs/jwt": "12.0.3",
|
||||||
"@nestjs/passport": "12.0.0",
|
"@nestjs/passport": "12.0.0",
|
||||||
"@nestjs/platform-express": "12.0.1",
|
"@nestjs/platform-express": "12.2.0",
|
||||||
"@nestjs/swagger": "12.0.1",
|
"@nestjs/swagger": "12.0.4",
|
||||||
"@prisma/adapter-better-sqlite3": "7.10.0",
|
"@prisma/adapter-better-sqlite3": "7.10.1",
|
||||||
"@prisma/client": "7.10.0",
|
"@prisma/client": "7.10.1",
|
||||||
"bcrypt": "6.0.0",
|
"bcrypt": "6.0.0",
|
||||||
"better-sqlite3": "12.11.1",
|
"better-sqlite3": "12.11.1",
|
||||||
"cheerio": "1.2.0",
|
"cheerio": "1.2.0",
|
||||||
@@ -57,67 +57,77 @@
|
|||||||
"class-validator": "0.15.1",
|
"class-validator": "0.15.1",
|
||||||
"cookie-parser": "1.4.7",
|
"cookie-parser": "1.4.7",
|
||||||
"dotenv": "17.4.2",
|
"dotenv": "17.4.2",
|
||||||
"lru-cache": "11.5.2",
|
"lru-cache": "11.5.3",
|
||||||
"nestjs-pino": "5.1.0",
|
"nestjs-pino": "5.3.1",
|
||||||
"passport": "0.7.0",
|
"passport": "0.7.0",
|
||||||
"passport-jwt": "4.0.1",
|
"passport-jwt": "4.0.1",
|
||||||
"pino-http": "11.0.0",
|
"pino-http": "11.0.0",
|
||||||
"prisma": "7.10.0",
|
"prisma": "7.10.1",
|
||||||
"reflect-metadata": "0.2.2",
|
"reflect-metadata": "0.2.2",
|
||||||
"rxjs": "7.8.2"
|
"rxjs": "7.8.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@commitlint/cli": "21.2.2",
|
"@commitlint/cli": "21.2.4",
|
||||||
"@commitlint/config-conventional": "21.2.2",
|
"@commitlint/config-conventional": "21.2.4",
|
||||||
"@darraghor/eslint-plugin-nestjs-typed": "7.5.6",
|
"@darraghor/eslint-plugin-nestjs-typed": "7.5.8",
|
||||||
"@eslint/js": "10.0.1",
|
"@eslint/js": "10.0.1",
|
||||||
"@nestjs/cli": "12.0.0",
|
"@nestjs/cli": "12.0.10",
|
||||||
"@nestjs/schematics": "12.0.1",
|
"@nestjs/schematics": "12.0.10",
|
||||||
"@nestjs/testing": "12.0.1",
|
"@nestjs/testing": "12.2.0",
|
||||||
"@release-it/conventional-changelog": "12.0.0",
|
"@release-it/conventional-changelog": "12.0.2",
|
||||||
"@stylistic/eslint-plugin": "5.10.0",
|
"@stylistic/eslint-plugin": "5.10.0",
|
||||||
"@types/bcrypt": "6.0.0",
|
"@types/bcrypt": "6.0.0",
|
||||||
"@types/cookie-parser": "1.4.10",
|
"@types/cookie-parser": "1.4.10",
|
||||||
"@types/express": "5.0.6",
|
"@types/express": "5.0.6",
|
||||||
"@types/jest": "30.0.0",
|
"@types/jest": "30.0.0",
|
||||||
"@types/node": "24.13.4",
|
"@types/node": "24.19.2",
|
||||||
"@types/passport-jwt": "4.0.1",
|
"@types/passport-jwt": "4.0.1",
|
||||||
"@types/supertest": "7.2.1",
|
"@types/supertest": "7.2.1",
|
||||||
"conventional-changelog-conventionalcommits": "10.4.0",
|
"conventional-changelog-conventionalcommits": "10.4.1",
|
||||||
"eslint": "10.11.0",
|
"eslint": "10.13.0",
|
||||||
"eslint-import-resolver-typescript": "4.4.5",
|
"eslint-import-resolver-typescript": "4.4.5",
|
||||||
"eslint-plugin-import-x": "4.17.1",
|
"eslint-plugin-import-x": "4.17.1",
|
||||||
"eslint-plugin-jest": "29.16.6",
|
"eslint-plugin-jest": "29.17.0",
|
||||||
"eslint-plugin-n": "18.4.0",
|
"eslint-plugin-n": "18.5.0",
|
||||||
"eslint-plugin-perfectionist": "5.12.1",
|
"eslint-plugin-perfectionist": "5.13.0",
|
||||||
"eslint-plugin-regexp": "3.3.1",
|
"eslint-plugin-regexp": "3.3.1",
|
||||||
"eslint-plugin-security": "4.1.0",
|
"eslint-plugin-security": "4.2.0",
|
||||||
"eslint-plugin-sonarjs": "4.2.1",
|
"eslint-plugin-sonarjs": "4.2.2",
|
||||||
"globals": "17.12.0",
|
"globals": "17.13.0",
|
||||||
"jest": "30.5.1",
|
"jest": "30.5.2",
|
||||||
"release-it": "21.0.2",
|
"pino-pretty": "13.2.0",
|
||||||
"supertest": "7.2.2",
|
"release-it": "21.1.1",
|
||||||
"ts-jest": "29.4.12",
|
"supertest": "7.3.1",
|
||||||
|
"ts-jest": "29.4.15",
|
||||||
"ts-loader": "9.6.2",
|
"ts-loader": "9.6.2",
|
||||||
"ts-node": "10.9.2",
|
"ts-node": "10.9.2",
|
||||||
"tsconfig-paths": "4.2.0",
|
"tsconfig-paths": "4.2.0",
|
||||||
"typescript": "6.0.3",
|
"typescript": "6.0.3",
|
||||||
"typescript-eslint": "8.70.1"
|
"typescript-eslint": "8.72.0"
|
||||||
},
|
},
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"proxy-addr": "2.0.8",
|
"proxy-addr": "2.0.8",
|
||||||
|
"express": {
|
||||||
|
"body-parser": "2.4.0"
|
||||||
|
},
|
||||||
"@nestjs/platform-express": {
|
"@nestjs/platform-express": {
|
||||||
"multer": "2.4.0"
|
"multer": "2.5.0"
|
||||||
|
},
|
||||||
|
"ajv": {
|
||||||
|
"fast-uri": "3.1.9"
|
||||||
},
|
},
|
||||||
"@prisma/config@7.10.0": {
|
"@prisma/config@7.10.0": {
|
||||||
"deepmerge-ts": "8.0.2"
|
"deepmerge-ts": "8.0.2"
|
||||||
},
|
},
|
||||||
"release-it": {
|
"release-it": {
|
||||||
"basic-ftp": "6.2.1",
|
"basic-ftp": "6.2.3",
|
||||||
"undici": "7.29.1"
|
"undici": "7.30.1"
|
||||||
|
},
|
||||||
|
"socks": {
|
||||||
|
"ip-address": "10.7.4"
|
||||||
},
|
},
|
||||||
"prisma": {
|
"prisma": {
|
||||||
"mysql2": "3.24.4"
|
"mysql2": "3.24.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"jest": {
|
"jest": {
|
||||||
|
|||||||
@@ -1,24 +1,29 @@
|
|||||||
import { ArgumentsHost } from '@nestjs/common';
|
import { ArgumentsHost, BadRequestException } from '@nestjs/common';
|
||||||
|
|
||||||
|
import { StructuredLogger } from '../logging/structured-logger.service';
|
||||||
import { HttpExceptionFilter } from './http-exception.filter';
|
import { HttpExceptionFilter } from './http-exception.filter';
|
||||||
|
|
||||||
describe('HttpExceptionFilter', () => {
|
describe('HttpExceptionFilter', () => {
|
||||||
it('does not expose internal error details', () => {
|
const setup = () => {
|
||||||
const status = jest.fn().mockReturnThis();
|
const status = jest.fn().mockReturnThis();
|
||||||
const type = jest.fn().mockReturnThis();
|
const type = jest.fn().mockReturnThis();
|
||||||
const json = jest.fn();
|
const json = jest.fn();
|
||||||
const locals: Record<string, unknown> = {};
|
const locals: Record<string, unknown> = {};
|
||||||
const filter = new HttpExceptionFilter();
|
const logger = { event: jest.fn() };
|
||||||
|
const filter = new HttpExceptionFilter(logger as unknown as StructuredLogger);
|
||||||
const host = {
|
const host = {
|
||||||
switchToHttp: () => ({
|
switchToHttp: () => ({
|
||||||
getResponse: () => ({ status, type, json, locals }),
|
getResponse: () => ({ status, type, json, locals }),
|
||||||
}),
|
}),
|
||||||
} as unknown as ArgumentsHost;
|
} as unknown as ArgumentsHost;
|
||||||
|
return { filter, host, status, type, json, locals, logger };
|
||||||
|
};
|
||||||
|
|
||||||
filter.catch(
|
it('logs unhandled errors with name and stack frames but never the message', () => {
|
||||||
new Error('operation failed\npassword: SYNTHETIC_AUDIT_SECRET'),
|
const { filter, host, status, type, json, locals, logger } = setup();
|
||||||
host,
|
const error = new Error('operation failed\npassword: SYNTHETIC_AUDIT_SECRET');
|
||||||
);
|
|
||||||
|
filter.catch(error, host);
|
||||||
|
|
||||||
expect(status).toHaveBeenCalledWith(500);
|
expect(status).toHaveBeenCalledWith(500);
|
||||||
expect(type).toHaveBeenCalledWith('application/problem+json');
|
expect(type).toHaveBeenCalledWith('application/problem+json');
|
||||||
@@ -27,6 +32,29 @@ describe('HttpExceptionFilter', () => {
|
|||||||
code: 'INTERNAL_SERVER_ERROR',
|
code: 'INTERNAL_SERVER_ERROR',
|
||||||
});
|
});
|
||||||
expect(locals.publicErrorCode).toBe('INTERNAL_SERVER_ERROR');
|
expect(locals.publicErrorCode).toBe('INTERNAL_SERVER_ERROR');
|
||||||
expect(locals.errorStack).toBeUndefined();
|
expect(logger.event).toHaveBeenCalledTimes(1);
|
||||||
|
const [level, event, fields] = logger.event.mock.calls[0] as [string, string, Record<string, unknown>];
|
||||||
|
expect(level).toBe('error');
|
||||||
|
expect(event).toBe('http.request.unhandled');
|
||||||
|
expect(fields).toMatchObject({ code: 'INTERNAL_SERVER_ERROR', errorName: 'Error' });
|
||||||
|
expect(JSON.stringify(fields)).not.toContain('SYNTHETIC_AUDIT_SECRET');
|
||||||
|
expect(String(fields['errorStack']).split('\n').every((line) => line.startsWith(' at '))).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('logs field pointers without values for validation errors', () => {
|
||||||
|
const { filter, host, status, logger, locals } = setup();
|
||||||
|
const exception = new BadRequestException({
|
||||||
|
message: [
|
||||||
|
{ property: 'amount', constraints: { isPositive: 'amount must be positive' }, value: -42 },
|
||||||
|
{ property: 'amount', constraints: { min: 'amount too small' }, value: -42 },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
filter.catch(exception, host);
|
||||||
|
|
||||||
|
expect(status).toHaveBeenCalledWith(400);
|
||||||
|
expect(locals.invalidFields).toBe('#/amount');
|
||||||
|
expect(logger.event).not.toHaveBeenCalled();
|
||||||
|
expect(JSON.stringify(locals)).not.toContain('-42');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -10,9 +10,12 @@ import {
|
|||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
|
|
||||||
import { HttpErrorCode } from '../error-code';
|
import { HttpErrorCode } from '../error-code';
|
||||||
|
import { StructuredLogger } from '../logging/structured-logger.service';
|
||||||
|
|
||||||
@Catch()
|
@Catch()
|
||||||
export class HttpExceptionFilter implements ExceptionFilter {
|
export class HttpExceptionFilter implements ExceptionFilter {
|
||||||
|
constructor(private readonly logger: StructuredLogger) {}
|
||||||
|
|
||||||
catch(exception: unknown, host: ArgumentsHost): void {
|
catch(exception: unknown, host: ArgumentsHost): void {
|
||||||
const context = host.switchToHttp();
|
const context = host.switchToHttp();
|
||||||
const response = context.getResponse<Response>();
|
const response = context.getResponse<Response>();
|
||||||
@@ -31,6 +34,18 @@ export class HttpExceptionFilter implements ExceptionFilter {
|
|||||||
: this.codeFor(status, payload);
|
: this.codeFor(status, payload);
|
||||||
response.locals ??= {};
|
response.locals ??= {};
|
||||||
response.locals.publicErrorCode = code;
|
response.locals.publicErrorCode = code;
|
||||||
|
if (isValidation) {
|
||||||
|
response.locals.invalidFields = [
|
||||||
|
...new Set(
|
||||||
|
this.validationErrors(
|
||||||
|
(payload as { message: ValidationError[] }).message,
|
||||||
|
).map((error) => error.pointer),
|
||||||
|
),
|
||||||
|
].join(',');
|
||||||
|
}
|
||||||
|
if (!(exception instanceof HttpException)) {
|
||||||
|
this.logUnhandled(exception, code);
|
||||||
|
}
|
||||||
response
|
response
|
||||||
.status(status)
|
.status(status)
|
||||||
.type('application/problem+json')
|
.type('application/problem+json')
|
||||||
@@ -47,6 +62,20 @@ export class HttpExceptionFilter implements ExceptionFilter {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ponytail: stack содержит текст message в первой строке; оставляем только кадры, message не пишем.
|
||||||
|
private logUnhandled(exception: unknown, code: string): void {
|
||||||
|
const error = exception instanceof Error ? exception : undefined;
|
||||||
|
const frames = (error?.stack ?? '')
|
||||||
|
.split('\n')
|
||||||
|
.filter((line) => line.startsWith(' at '))
|
||||||
|
.join('\n');
|
||||||
|
this.logger.event('error', 'http.request.unhandled', {
|
||||||
|
code,
|
||||||
|
errorName: error?.name ?? typeof exception,
|
||||||
|
errorStack: frames,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
private codeFor(status: number, payload: unknown): string {
|
private codeFor(status: number, payload: unknown): string {
|
||||||
if (typeof payload === 'object' && payload !== null && 'code' in payload) {
|
if (typeof payload === 'object' && payload !== null && 'code' in payload) {
|
||||||
const code = (payload as { code?: unknown }).code;
|
const code = (payload as { code?: unknown }).code;
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ function completion(request: Request, response: Response, value: { responseTime:
|
|||||||
status: response.statusCode,
|
status: response.statusCode,
|
||||||
durationMs: Math.round(value.responseTime),
|
durationMs: Math.round(value.responseTime),
|
||||||
...(typeof response.locals.publicErrorCode === 'string' ? { code: response.locals.publicErrorCode } : {}),
|
...(typeof response.locals.publicErrorCode === 'string' ? { code: response.locals.publicErrorCode } : {}),
|
||||||
|
...(typeof response.locals.invalidFields === 'string' ? { invalidFields: response.locals.invalidFields } : {}),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -31,6 +32,10 @@ export function loggingOptions(config: ConfigService<Environment, true>): Option
|
|||||||
return {
|
return {
|
||||||
level: config.getOrThrow('LOG_LEVEL'),
|
level: config.getOrThrow('LOG_LEVEL'),
|
||||||
messageKey: 'message',
|
messageKey: 'message',
|
||||||
|
// ponytail: development-only pretty output; production never loads pino-pretty.
|
||||||
|
...(process.env['NODE_ENV'] === 'development'
|
||||||
|
? { transport: { target: 'pino-pretty', options: { colorize: true, singleLine: true, messageKey: 'message' } } }
|
||||||
|
: {}),
|
||||||
genReqId: (_request, response) => {
|
genReqId: (_request, response) => {
|
||||||
const id = randomUUID();
|
const id = randomUUID();
|
||||||
response.setHeader('X-Request-ID', id);
|
response.setHeader('X-Request-ID', id);
|
||||||
|
|||||||
@@ -14,9 +14,12 @@ const allowedFields = new Set([
|
|||||||
'count',
|
'count',
|
||||||
'durationMs',
|
'durationMs',
|
||||||
'environment',
|
'environment',
|
||||||
|
'errorName',
|
||||||
|
'errorStack',
|
||||||
'found',
|
'found',
|
||||||
'grpcCode',
|
'grpcCode',
|
||||||
'headersReceived',
|
'headersReceived',
|
||||||
|
'invalidFields',
|
||||||
'method',
|
'method',
|
||||||
'networkMs',
|
'networkMs',
|
||||||
'operation',
|
'operation',
|
||||||
|
|||||||
+1
-1
@@ -37,7 +37,7 @@ export function configureApp(app: INestApplication): void {
|
|||||||
exceptionFactory: (message) => new BadRequestException({ message }),
|
exceptionFactory: (message) => new BadRequestException({ message }),
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
app.useGlobalFilters(new HttpExceptionFilter());
|
app.useGlobalFilters(new HttpExceptionFilter(app.get(StructuredLogger)));
|
||||||
app.enableShutdownHooks();
|
app.enableShutdownHooks();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import { AuthenticationResult, AuthUser, RefreshPayload } from './auth.types';
|
|||||||
const EXPECTED_ROTATED_SESSIONS = 1;
|
const EXPECTED_ROTATED_SESSIONS = 1;
|
||||||
|
|
||||||
const PASSWORD_HASH_ROUNDS = 12;
|
const PASSWORD_HASH_ROUNDS = 12;
|
||||||
const REFRESH_TTL_MS = 604_800_000;
|
export const REFRESH_TTL_MS = 604_800_000;
|
||||||
|
|
||||||
const ACCESS_TTL = '15m';
|
const ACCESS_TTL = '15m';
|
||||||
const REFRESH_TTL = '7d';
|
const REFRESH_TTL = '7d';
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import {
|
|||||||
|
|
||||||
import { ApiProblemResponses } from '../../../common/decorators/api-safe-error-response.decorator';
|
import { ApiProblemResponses } from '../../../common/decorators/api-safe-error-response.decorator';
|
||||||
import { HttpErrorCode } from '../../../common/error-code';
|
import { HttpErrorCode } from '../../../common/error-code';
|
||||||
import { AuthService } from '../application/auth.service';
|
import { AuthService, REFRESH_TTL_MS } from '../application/auth.service';
|
||||||
import { AccessPayload, AuthenticationResult } from '../application/auth.types';
|
import { AccessPayload, AuthenticationResult } from '../application/auth.types';
|
||||||
import { LoginDto, RegisterDto } from './auth.dto';
|
import { LoginDto, RegisterDto } from './auth.dto';
|
||||||
import { JwtAuthGuard } from './jwt-auth.guard';
|
import { JwtAuthGuard } from './jwt-auth.guard';
|
||||||
@@ -134,6 +134,7 @@ export class AuthController {
|
|||||||
sameSite: 'lax' as const,
|
sameSite: 'lax' as const,
|
||||||
secure: process.env['NODE_ENV'] !== 'development',
|
secure: process.env['NODE_ENV'] !== 'development',
|
||||||
path: COOKIE_PATH,
|
path: COOKIE_PATH,
|
||||||
|
maxAge: REFRESH_TTL_MS,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+46
-18
@@ -32,6 +32,7 @@ describe('Authentication (e2e)', () => {
|
|||||||
pinoHttp: {
|
pinoHttp: {
|
||||||
...loggingOptions(config),
|
...loggingOptions(config),
|
||||||
level: 'info',
|
level: 'info',
|
||||||
|
transport: undefined,
|
||||||
stream: { write: (line: string) => logs.push(JSON.parse(line) as Record<string, unknown>) },
|
stream: { write: (line: string) => logs.push(JSON.parse(line) as Record<string, unknown>) },
|
||||||
},
|
},
|
||||||
assignResponse: true,
|
assignResponse: true,
|
||||||
@@ -131,6 +132,9 @@ describe('Authentication (e2e)', () => {
|
|||||||
.filter((attribute) => !attribute.startsWith('Expires='))
|
.filter((attribute) => !attribute.startsWith('Expires='))
|
||||||
.sort((a, b) => a.localeCompare(b));
|
.sort((a, b) => a.localeCompare(b));
|
||||||
const host = ['HttpOnly', 'Path=/api/v1/auth', 'SameSite=Lax'];
|
const host = ['HttpOnly', 'Path=/api/v1/auth', 'SameSite=Lax'];
|
||||||
|
// Persistent for the Session lifetime (7 days), otherwise the browser drops it on restart.
|
||||||
|
const persistent = [...host, 'Max-Age=604800'];
|
||||||
|
const sorted = (items: string[]) => [...items].sort((a, b) => a.localeCompare(b));
|
||||||
const login = async () => {
|
const login = async () => {
|
||||||
const registration = await request(app.getHttpServer())
|
const registration = await request(app.getHttpServer())
|
||||||
.post('/api/v1/auth/register')
|
.post('/api/v1/auth/register')
|
||||||
@@ -150,7 +154,7 @@ describe('Authentication (e2e)', () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
it('issues, rotates and clears it HttpOnly, Lax, path-scoped, host-only and Secure in production', async () => {
|
it('issues and rotates it persistent (Max-Age) HttpOnly, Lax, path-scoped, host-only and Secure in production, and clears it', async () => {
|
||||||
await inEnvironment('production', async () => {
|
await inEnvironment('production', async () => {
|
||||||
const issued = await login();
|
const issued = await login();
|
||||||
const rotated = await request(app.getHttpServer())
|
const rotated = await request(app.getHttpServer())
|
||||||
@@ -162,16 +166,20 @@ describe('Authentication (e2e)', () => {
|
|||||||
.set('Cookie', rotated.headers['set-cookie'][0])
|
.set('Cookie', rotated.headers['set-cookie'][0])
|
||||||
.expect(204);
|
.expect(204);
|
||||||
|
|
||||||
// Exact set: any added Domain/Max-Age or a dropped flag fails.
|
// Exact set: any added Domain, changed Max-Age or dropped flag fails.
|
||||||
for (const cookie of [issued, rotated.headers['set-cookie'][0], cleared.headers['set-cookie'][0]]) {
|
for (const cookie of [issued, rotated.headers['set-cookie'][0]]) {
|
||||||
expect(attributes(cookie)).toEqual([...host, 'Secure'].sort((a, b) => a.localeCompare(b)));
|
expect(attributes(cookie)).toEqual(sorted([...persistent, 'Secure']));
|
||||||
}
|
}
|
||||||
|
// Clearing must not carry Max-Age; Express expires it with a past Expires.
|
||||||
|
const clearedCookie = cleared.headers['set-cookie'][0];
|
||||||
|
expect(attributes(clearedCookie)).toEqual(sorted([...host, 'Secure']));
|
||||||
|
expect(clearedCookie).toContain('Expires=Thu, 01 Jan 1970');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('drops only Secure in development and keeps every other attribute', async () => {
|
it('drops only Secure in development and keeps every other attribute', async () => {
|
||||||
await inEnvironment('development', async () => {
|
await inEnvironment('development', async () => {
|
||||||
expect(attributes(await login())).toEqual(host);
|
expect(attributes(await login())).toEqual(sorted(persistent));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -532,7 +540,14 @@ describe('Authentication (e2e)', () => {
|
|||||||
'X-Request-ID',
|
'X-Request-ID',
|
||||||
);
|
);
|
||||||
expect(logs.filter((entry) => entry.requestId === response.headers['x-request-id'])).toEqual([
|
expect(logs.filter((entry) => entry.requestId === response.headers['x-request-id'])).toEqual([
|
||||||
expect.objectContaining({ level: 40, message: 'http.request.completed', status: 401, code: 'UNAUTHORIZED' }),
|
expect.objectContaining({
|
||||||
|
level: 40,
|
||||||
|
message: 'http.request.completed',
|
||||||
|
method: 'GET',
|
||||||
|
route: '/api/v1/auth/me',
|
||||||
|
status: 401,
|
||||||
|
code: 'UNAUTHORIZED',
|
||||||
|
}),
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -544,7 +559,7 @@ describe('Authentication (e2e)', () => {
|
|||||||
new Error('operation failed\npassword: SYNTHETIC_AUDIT_SECRET'),
|
new Error('operation failed\npassword: SYNTHETIC_AUDIT_SECRET'),
|
||||||
);
|
);
|
||||||
|
|
||||||
const response = await request(app.getHttpServer())
|
await request(app.getHttpServer())
|
||||||
.post('/api/v1/auth/login')
|
.post('/api/v1/auth/login')
|
||||||
.set('X-Request-ID', clientRequestId)
|
.set('X-Request-ID', clientRequestId)
|
||||||
.send({ email: 'user@example.com', password: 'a secure password' })
|
.send({ email: 'user@example.com', password: 'a secure password' })
|
||||||
@@ -554,17 +569,30 @@ describe('Authentication (e2e)', () => {
|
|||||||
expect(body).toEqual({ status: 500, code: 'INTERNAL_SERVER_ERROR' }),
|
expect(body).toEqual({ status: 500, code: 'INTERNAL_SERVER_ERROR' }),
|
||||||
);
|
);
|
||||||
|
|
||||||
const completed = logs.filter((entry) => entry.requestId === response.headers['x-request-id']);
|
expect(logs).toEqual(
|
||||||
expect(completed).toEqual([
|
expect.arrayContaining([
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
requestId: response.headers['x-request-id'],
|
method: 'POST',
|
||||||
clientRequestId,
|
route: '/api/v1/auth/login',
|
||||||
status: 500,
|
status: 500,
|
||||||
code: 'INTERNAL_SERVER_ERROR',
|
code: 'INTERNAL_SERVER_ERROR',
|
||||||
level: 50,
|
level: 50,
|
||||||
message: 'http.request.completed',
|
message: 'http.request.completed',
|
||||||
}),
|
}),
|
||||||
]);
|
]),
|
||||||
|
);
|
||||||
|
expect(logs).toEqual(
|
||||||
|
expect.arrayContaining([
|
||||||
|
expect.objectContaining({
|
||||||
|
clientRequestId,
|
||||||
|
code: 'INTERNAL_SERVER_ERROR',
|
||||||
|
level: 50,
|
||||||
|
message: 'http.request.unhandled',
|
||||||
|
errorName: 'Error',
|
||||||
|
errorStack: expect.stringContaining(' at ') as unknown,
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
);
|
||||||
expect(JSON.stringify(logs)).not.toContain(
|
expect(JSON.stringify(logs)).not.toContain(
|
||||||
'SYNTHETIC_AUDIT_SECRET',
|
'SYNTHETIC_AUDIT_SECRET',
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user