Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e27a98ca89
|
||
|
|
7b22fd9a4e
|
||
|
|
0706c47a33
|
||
|
|
378c41ddb2
|
@@ -42,6 +42,7 @@ DOMAIN_NAME=localhost
|
|||||||
|
|
||||||
ENABLE_CORS=false
|
ENABLE_CORS=false
|
||||||
CORS_DOMAIN_NAME=localhost
|
CORS_DOMAIN_NAME=localhost
|
||||||
|
SENTRY_DSN=
|
||||||
|
|
||||||
# Media Limits (in KB)
|
# Media Limits (in KB)
|
||||||
MAX_IMAGE_SIZE_KB=512
|
MAX_IMAGE_SIZE_KB=512
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@memegoat/backend",
|
"name": "@memegoat/backend",
|
||||||
"version": "1.9.7",
|
"version": "1.10.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"author": "",
|
"author": "",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
|||||||
@@ -103,10 +103,9 @@ export class AuthService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async login(dto: LoginDto, userAgent?: string, ip?: string) {
|
async login(dto: LoginDto, userAgent?: string, ip?: string) {
|
||||||
this.logger.log(`Login attempt for email: ${dto.email}`);
|
const emailHash = await this.hashingService.hashEmail(dto.email);
|
||||||
|
this.logger.log(`Login attempt for email hash: ${emailHash}`);
|
||||||
const { email, password } = dto;
|
const { email, password } = dto;
|
||||||
|
|
||||||
const emailHash = await this.hashingService.hashEmail(email);
|
|
||||||
const user = await this.usersService.findByEmailHash(emailHash);
|
const user = await this.usersService.findByEmailHash(emailHash);
|
||||||
|
|
||||||
if (!user) {
|
if (!user) {
|
||||||
|
|||||||
88
backend/src/common/filters/http-exception.filter.spec.ts
Normal file
88
backend/src/common/filters/http-exception.filter.spec.ts
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
import { ArgumentsHost, HttpException, HttpStatus } from "@nestjs/common";
|
||||||
|
import { Test, TestingModule } from "@nestjs/testing";
|
||||||
|
import * as Sentry from "@sentry/nestjs";
|
||||||
|
import { AllExceptionsFilter } from "./http-exception.filter";
|
||||||
|
|
||||||
|
jest.mock("@sentry/nestjs", () => ({
|
||||||
|
captureException: jest.fn(),
|
||||||
|
withScope: jest.fn((callback) => {
|
||||||
|
const scope = {
|
||||||
|
setUser: jest.fn(),
|
||||||
|
setTag: jest.fn(),
|
||||||
|
setExtra: jest.fn(),
|
||||||
|
};
|
||||||
|
callback(scope);
|
||||||
|
return scope;
|
||||||
|
}),
|
||||||
|
}));
|
||||||
|
|
||||||
|
describe("AllExceptionsFilter", () => {
|
||||||
|
let filter: AllExceptionsFilter;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
providers: [AllExceptionsFilter],
|
||||||
|
}).compile();
|
||||||
|
|
||||||
|
filter = module.get<AllExceptionsFilter>(AllExceptionsFilter);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should hash the IP address and send it to Sentry for 500 errors", () => {
|
||||||
|
const mockResponse = {
|
||||||
|
status: jest.fn().mockReturnThis(),
|
||||||
|
json: jest.fn().mockReturnThis(),
|
||||||
|
};
|
||||||
|
const mockRequest = {
|
||||||
|
url: "/test",
|
||||||
|
method: "GET",
|
||||||
|
ip: "127.0.0.1",
|
||||||
|
user: { sub: "user-123" },
|
||||||
|
};
|
||||||
|
const mockArgumentsHost = {
|
||||||
|
switchToHttp: () => ({
|
||||||
|
getResponse: () => mockResponse,
|
||||||
|
getRequest: () => mockRequest,
|
||||||
|
}),
|
||||||
|
} as ArgumentsHost;
|
||||||
|
|
||||||
|
const exception = new Error("Internal Server Error");
|
||||||
|
|
||||||
|
filter.catch(exception, mockArgumentsHost);
|
||||||
|
|
||||||
|
expect(mockResponse.status).toHaveBeenCalledWith(HttpStatus.INTERNAL_SERVER_ERROR);
|
||||||
|
expect(Sentry.withScope).toHaveBeenCalled();
|
||||||
|
|
||||||
|
// Vérifier que captureException a été appelé (via withScope)
|
||||||
|
expect(Sentry.captureException).toHaveBeenCalledWith(exception);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should include hashed IP in logs", () => {
|
||||||
|
const loggerSpy = jest.spyOn((filter as any).logger, "warn");
|
||||||
|
const mockResponse = {
|
||||||
|
status: jest.fn().mockReturnThis(),
|
||||||
|
json: jest.fn().mockReturnThis(),
|
||||||
|
};
|
||||||
|
const mockRequest = {
|
||||||
|
url: "/test",
|
||||||
|
method: "GET",
|
||||||
|
ip: "1.2.3.4",
|
||||||
|
};
|
||||||
|
const mockArgumentsHost = {
|
||||||
|
switchToHttp: () => ({
|
||||||
|
getResponse: () => mockResponse,
|
||||||
|
getRequest: () => mockRequest,
|
||||||
|
}),
|
||||||
|
} as ArgumentsHost;
|
||||||
|
|
||||||
|
const exception = new HttpException("Bad Request", HttpStatus.BAD_REQUEST);
|
||||||
|
|
||||||
|
filter.catch(exception, mockArgumentsHost);
|
||||||
|
|
||||||
|
expect(mockResponse.status).toHaveBeenCalledWith(HttpStatus.BAD_REQUEST);
|
||||||
|
|
||||||
|
// L'IP 1.2.3.4 hachée en SHA256 contient un hash de 64 caractères
|
||||||
|
const logCall = loggerSpy.mock.calls[0][0];
|
||||||
|
expect(logCall).toMatch(/[a-f0-9]{64}/);
|
||||||
|
expect(logCall).not.toContain("1.2.3.4");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -6,6 +6,7 @@ import {
|
|||||||
HttpStatus,
|
HttpStatus,
|
||||||
Logger,
|
Logger,
|
||||||
} from "@nestjs/common";
|
} from "@nestjs/common";
|
||||||
|
import { createHash } from "node:crypto";
|
||||||
import * as Sentry from "@sentry/nestjs";
|
import * as Sentry from "@sentry/nestjs";
|
||||||
import { Request, Response } from "express";
|
import { Request, Response } from "express";
|
||||||
|
|
||||||
@@ -39,6 +40,11 @@ export class AllExceptionsFilter implements ExceptionFilter {
|
|||||||
const userId = request.user?.sub || request.user?.id;
|
const userId = request.user?.sub || request.user?.id;
|
||||||
const userPart = userId ? `[User: ${userId}] ` : "";
|
const userPart = userId ? `[User: ${userId}] ` : "";
|
||||||
|
|
||||||
|
const ip = request.ip || "unknown";
|
||||||
|
const hashedIp = createHash("sha256")
|
||||||
|
.update(ip as string)
|
||||||
|
.digest("hex");
|
||||||
|
|
||||||
const errorResponse = {
|
const errorResponse = {
|
||||||
statusCode: status,
|
statusCode: status,
|
||||||
timestamp: new Date().toISOString(),
|
timestamp: new Date().toISOString(),
|
||||||
@@ -51,14 +57,20 @@ export class AllExceptionsFilter implements ExceptionFilter {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (status === HttpStatus.INTERNAL_SERVER_ERROR) {
|
if (status === HttpStatus.INTERNAL_SERVER_ERROR) {
|
||||||
|
Sentry.withScope((scope) => {
|
||||||
|
scope.setUser({
|
||||||
|
id: userId,
|
||||||
|
ip_address: hashedIp,
|
||||||
|
});
|
||||||
Sentry.captureException(exception);
|
Sentry.captureException(exception);
|
||||||
|
});
|
||||||
this.logger.error(
|
this.logger.error(
|
||||||
`${userPart}${request.method} ${request.url} - Error: ${exception instanceof Error ? exception.message : "Unknown error"}`,
|
`${userPart}${hashedIp} ${request.method} ${request.url} - Error: ${exception instanceof Error ? exception.message : "Unknown error"}`,
|
||||||
exception instanceof Error ? exception.stack : "",
|
exception instanceof Error ? exception.stack : "",
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
this.logger.warn(
|
this.logger.warn(
|
||||||
`${userPart}${request.method} ${request.url} - Status: ${status} - Message: ${JSON.stringify(message)}`,
|
`${userPart}${hashedIp} ${request.method} ${request.url} - Status: ${status} - Message: ${JSON.stringify(message)}`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { CACHE_MANAGER } from "@nestjs/cache-manager";
|
import { CACHE_MANAGER } from "@nestjs/cache-manager";
|
||||||
import { Inject, Injectable, Logger, NestMiddleware } from "@nestjs/common";
|
import { Inject, Injectable, Logger, NestMiddleware } from "@nestjs/common";
|
||||||
import type { Cache } from "cache-manager";
|
import type { Cache } from "cache-manager";
|
||||||
|
import { createHash } from "node:crypto";
|
||||||
import type { NextFunction, Request, Response } from "express";
|
import type { NextFunction, Request, Response } from "express";
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@@ -48,11 +49,15 @@ export class CrawlerDetectionMiddleware implements NestMiddleware {
|
|||||||
const { method, url, ip } = req;
|
const { method, url, ip } = req;
|
||||||
const userAgent = req.get("user-agent") || "unknown";
|
const userAgent = req.get("user-agent") || "unknown";
|
||||||
|
|
||||||
|
const hashedIp = createHash("sha256")
|
||||||
|
.update(ip as string)
|
||||||
|
.digest("hex");
|
||||||
|
|
||||||
// Vérifier si l'IP est bannie
|
// Vérifier si l'IP est bannie
|
||||||
try {
|
try {
|
||||||
const isBanned = await this.cacheManager.get(`banned_ip:${ip}`);
|
const isBanned = await this.cacheManager.get(`banned_ip:${ip}`);
|
||||||
if (isBanned) {
|
if (isBanned) {
|
||||||
this.logger.warn(`Banned IP attempt: ${ip} -> ${method} ${url}`);
|
this.logger.warn(`Banned IP attempt: ${hashedIp} -> ${method} ${url}`);
|
||||||
res.status(403).json({
|
res.status(403).json({
|
||||||
message: "Access denied: Your IP has been temporarily banned.",
|
message: "Access denied: Your IP has been temporarily banned.",
|
||||||
});
|
});
|
||||||
@@ -60,7 +65,7 @@ export class CrawlerDetectionMiddleware implements NestMiddleware {
|
|||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.logger.error(
|
this.logger.error(
|
||||||
`Error checking ban status for IP ${ip}: ${error.message}`,
|
`Error checking ban status for IP ${hashedIp}: ${error.message}`,
|
||||||
);
|
);
|
||||||
// On continue même en cas d'erreur Redis pour ne pas bloquer les utilisateurs légitimes
|
// On continue même en cas d'erreur Redis pour ne pas bloquer les utilisateurs légitimes
|
||||||
}
|
}
|
||||||
@@ -76,14 +81,14 @@ export class CrawlerDetectionMiddleware implements NestMiddleware {
|
|||||||
|
|
||||||
if (isSuspiciousPath || isBotUserAgent) {
|
if (isSuspiciousPath || isBotUserAgent) {
|
||||||
this.logger.warn(
|
this.logger.warn(
|
||||||
`Potential crawler detected: [${ip}] ${method} ${url} - User-Agent: ${userAgent}`,
|
`Potential crawler detected: [${hashedIp}] ${method} ${url} - User-Agent: ${userAgent}`,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Bannir l'IP pour 24h via Redis
|
// Bannir l'IP pour 24h via Redis
|
||||||
try {
|
try {
|
||||||
await this.cacheManager.set(`banned_ip:${ip}`, true, 86400000);
|
await this.cacheManager.set(`banned_ip:${ip}`, true, 86400000);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.logger.error(`Error banning IP ${ip}: ${error.message}`);
|
this.logger.error(`Error banning IP ${hashedIp}: ${error.message}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
|
import { createHash } from "node:crypto";
|
||||||
import { Logger, ValidationPipe } from "@nestjs/common";
|
import { Logger, ValidationPipe } from "@nestjs/common";
|
||||||
import { ConfigService } from "@nestjs/config";
|
import { ConfigService } from "@nestjs/config";
|
||||||
import { NestFactory } from "@nestjs/core";
|
import { NestFactory } from "@nestjs/core";
|
||||||
|
import { NestExpressApplication } from "@nestjs/platform-express";
|
||||||
import * as Sentry from "@sentry/nestjs";
|
import * as Sentry from "@sentry/nestjs";
|
||||||
import { nodeProfilingIntegration } from "@sentry/profiling-node";
|
import { nodeProfilingIntegration } from "@sentry/profiling-node";
|
||||||
import helmet from "helmet";
|
import helmet from "helmet";
|
||||||
@@ -8,10 +10,13 @@ import { AppModule } from "./app.module";
|
|||||||
import { AllExceptionsFilter } from "./common/filters/http-exception.filter";
|
import { AllExceptionsFilter } from "./common/filters/http-exception.filter";
|
||||||
|
|
||||||
async function bootstrap() {
|
async function bootstrap() {
|
||||||
const app = await NestFactory.create(AppModule);
|
const app = await NestFactory.create<NestExpressApplication>(AppModule);
|
||||||
const configService = app.get(ConfigService);
|
const configService = app.get(ConfigService);
|
||||||
const logger = new Logger("Bootstrap");
|
const logger = new Logger("Bootstrap");
|
||||||
|
|
||||||
|
// Activer trust proxy pour récupérer l'IP réelle derrière un reverse proxy
|
||||||
|
app.set("trust proxy", true);
|
||||||
|
|
||||||
const sentryDsn = configService.get<string>("SENTRY_DSN");
|
const sentryDsn = configService.get<string>("SENTRY_DSN");
|
||||||
if (sentryDsn) {
|
if (sentryDsn) {
|
||||||
Sentry.init({
|
Sentry.init({
|
||||||
@@ -20,6 +25,15 @@ async function bootstrap() {
|
|||||||
tracesSampleRate: 1.0,
|
tracesSampleRate: 1.0,
|
||||||
profilesSampleRate: 1.0,
|
profilesSampleRate: 1.0,
|
||||||
sendDefaultPii: false, // RGPD
|
sendDefaultPii: false, // RGPD
|
||||||
|
beforeSend(event) {
|
||||||
|
// Hachage de l'IP utilisateur pour Sentry si elle est présente
|
||||||
|
if (event.user?.ip_address) {
|
||||||
|
event.user.ip_address = createHash("sha256")
|
||||||
|
.update(event.user.ip_address)
|
||||||
|
.digest("hex");
|
||||||
|
}
|
||||||
|
return event;
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ services:
|
|||||||
ENABLE_CORS: ${ENABLE_CORS:-true}
|
ENABLE_CORS: ${ENABLE_CORS:-true}
|
||||||
CLAMAV_HOST: memegoat-clamav
|
CLAMAV_HOST: memegoat-clamav
|
||||||
CLAMAV_PORT: 3310
|
CLAMAV_PORT: 3310
|
||||||
|
SENTRY_DSN: ${SENTRY_DSN}
|
||||||
MAX_IMAGE_SIZE_KB: 1024
|
MAX_IMAGE_SIZE_KB: 1024
|
||||||
MAX_GIF_SIZE_KB: 4096
|
MAX_GIF_SIZE_KB: 4096
|
||||||
|
|
||||||
|
|||||||
@@ -98,6 +98,7 @@ services:
|
|||||||
ENABLE_CORS: ${ENABLE_CORS:-true}
|
ENABLE_CORS: ${ENABLE_CORS:-true}
|
||||||
CLAMAV_HOST: clamav
|
CLAMAV_HOST: clamav
|
||||||
CLAMAV_PORT: 3310
|
CLAMAV_PORT: 3310
|
||||||
|
SENTRY_DSN: ${SENTRY_DSN}
|
||||||
|
|
||||||
clamav:
|
clamav:
|
||||||
image: clamav/clamav:1.4
|
image: clamav/clamav:1.4
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@memegoat/frontend",
|
"name": "@memegoat/frontend",
|
||||||
"version": "1.9.7",
|
"version": "1.10.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@memegoat/source",
|
"name": "@memegoat/source",
|
||||||
"version": "1.9.7",
|
"version": "1.10.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"version:get": "cmake -P version.cmake GET",
|
"version:get": "cmake -P version.cmake GET",
|
||||||
|
|||||||
Reference in New Issue
Block a user