Compare commits

...

9 Commits

Author SHA1 Message Date
Mathis HERRIOT
8a146a2e1d chore: bump version to 1.10.1
All checks were successful
CI/CD Pipeline / Valider backend (push) Successful in 1m47s
CI/CD Pipeline / Valider frontend (push) Successful in 1m54s
CI/CD Pipeline / Valider documentation (push) Successful in 1m56s
CI/CD Pipeline / Déploiement en Production (push) Successful in 5m50s
2026-02-09 11:45:50 +01:00
Mathis HERRIOT
1ab6e1a969 refactor: adjust imports and streamline code for consistency
- Reorganized import statements in multiple files for better readability.
- Refined `auth.service` to remove unused `email` variable in `login` function.
- Cleaned up whitespace and formatting in `http-exception.filter.spec.ts`.
2026-02-09 11:45:12 +01:00
Mathis HERRIOT
e27a98ca89 chore: bump version to 1.10.0
Some checks failed
CI/CD Pipeline / Valider backend (push) Failing after 1m7s
CI/CD Pipeline / Valider frontend (push) Successful in 1m54s
CI/CD Pipeline / Valider documentation (push) Successful in 1m57s
CI/CD Pipeline / Déploiement en Production (push) Has been skipped
2026-02-09 11:28:22 +01:00
Mathis HERRIOT
7b22fd9a4e feat(environment): add Sentry DSN configuration to docker-compose files and .env example 2026-02-09 11:28:02 +01:00
Mathis HERRIOT
0706c47a33 feat(logging): hash IP addresses in logs and Sentry integration
- Implemented IP hashing using SHA256 in logs for enhanced privacy.
- Updated Sentry integration to hash IP addresses before sending events.
- Enhanced `AllExceptionsFilter` and `crawler-detection.middleware` to use hashed IPs in logs and error handling.
- Refined request logging in `auth.service` to include hashed email instead of plain text email.
2026-02-09 11:05:53 +01:00
Mathis HERRIOT
378c41ddb2 feat(app): enable trust proxy and update app initialization
- Activated `trust proxy` setting to retrieve real IP behind reverse proxies.
- Updated app initialization to use `NestExpressApplication`.
2026-02-09 10:55:11 +01:00
Mathis HERRIOT
65b161dfc6 chore: bump version to 1.9.7
All checks were successful
CI/CD Pipeline / Valider backend (push) Successful in 2m13s
CI/CD Pipeline / Valider frontend (push) Successful in 2m24s
CI/CD Pipeline / Valider documentation (push) Successful in 2m30s
CI/CD Pipeline / Déploiement en Production (push) Successful in 6m1s
2026-02-09 09:55:41 +01:00
Mathis HERRIOT
75dca88164 style(app): reformat import statements and improve logging structure
- Simplified and condensed import declarations in `app.module.ts`.
- Enhanced error logging format in `crawler-detection.middleware.ts` for better readability.
2026-02-09 09:54:23 +01:00
Mathis HERRIOT
fe7683f5b1 feat(cache): enhance error handling and logging for cache operations
- Added try-catch blocks to improve resilience in cache operations across services.
- Integrated detailed error logging for better debugging.
- Updated Redis reconnect strategy with exponential backoff and logging.
2026-02-09 09:52:40 +01:00
15 changed files with 191 additions and 33 deletions

View File

@@ -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

View File

@@ -1,6 +1,6 @@
{ {
"name": "@memegoat/backend", "name": "@memegoat/backend",
"version": "1.9.6", "version": "1.10.1",
"description": "", "description": "",
"author": "", "author": "",
"private": true, "private": true,

View File

@@ -1,5 +1,5 @@
import { CacheModule } from "@nestjs/cache-manager"; import { CacheModule } from "@nestjs/cache-manager";
import { MiddlewareConsumer, Module, NestModule } from "@nestjs/common"; import { Logger, MiddlewareConsumer, Module, NestModule } from "@nestjs/common";
import { ConfigModule, ConfigService } from "@nestjs/config"; import { ConfigModule, ConfigService } from "@nestjs/config";
import { ScheduleModule } from "@nestjs/schedule"; import { ScheduleModule } from "@nestjs/schedule";
import { ThrottlerModule } from "@nestjs/throttler"; import { ThrottlerModule } from "@nestjs/throttler";
@@ -70,12 +70,24 @@ import { UsersModule } from "./users/users.module";
isGlobal: true, isGlobal: true,
imports: [ConfigModule], imports: [ConfigModule],
inject: [ConfigService], inject: [ConfigService],
useFactory: async (config: ConfigService) => ({ useFactory: async (config: ConfigService) => {
store: await redisStore({ const logger = new Logger("RedisCache");
url: `redis://${config.get("REDIS_HOST")}:${config.get("REDIS_PORT")}`, return {
}), store: await redisStore({
ttl: 600, // 10 minutes url: `redis://${config.get("REDIS_HOST")}:${config.get("REDIS_PORT")}`,
}), socket: {
reconnectStrategy: (retries) => {
const delay = Math.min(retries * 50, 2000);
logger.warn(
`Redis connection lost. Retrying in ${delay}ms (attempt ${retries})`,
);
return delay;
},
},
}),
ttl: 600, // 10 minutes
};
},
}), }),
], ],
controllers: [AppController, HealthController], controllers: [AppController, HealthController],

View File

@@ -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);
const { email, password } = dto; this.logger.log(`Login attempt for email hash: ${emailHash}`);
const { 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) {

View File

@@ -15,8 +15,12 @@ export class CategoriesService {
) {} ) {}
private async clearCategoriesCache() { private async clearCategoriesCache() {
this.logger.log("Clearing categories cache"); try {
await this.cacheManager.del("categories/all"); this.logger.log("Clearing categories cache");
await this.cacheManager.del("categories/all");
} catch (error) {
this.logger.error(`Error clearing categories cache: ${error.message}`);
}
} }
async findAll() { async findAll() {

View File

@@ -0,0 +1,90 @@
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");
});
});

View File

@@ -1,3 +1,4 @@
import { createHash } from "node:crypto";
import { import {
ArgumentsHost, ArgumentsHost,
Catch, Catch,
@@ -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.captureException(exception); Sentry.withScope((scope) => {
scope.setUser({
id: userId,
ip_address: hashedIp,
});
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)}`,
); );
} }

View File

@@ -1,3 +1,4 @@
import { createHash } from "node:crypto";
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";
@@ -48,14 +49,25 @@ 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
const isBanned = await this.cacheManager.get(`banned_ip:${ip}`); try {
if (isBanned) { const isBanned = await this.cacheManager.get(`banned_ip:${ip}`);
this.logger.warn(`Banned IP attempt: ${ip} -> ${method} ${url}`); if (isBanned) {
res.status(403).json({ this.logger.warn(`Banned IP attempt: ${hashedIp} -> ${method} ${url}`);
message: "Access denied: Your IP has been temporarily banned.", res.status(403).json({
}); message: "Access denied: Your IP has been temporarily banned.",
return; });
return;
}
} catch (error) {
this.logger.error(
`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
} }
res.on("finish", async () => { res.on("finish", async () => {
@@ -69,11 +81,15 @@ 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
await this.cacheManager.set(`banned_ip:${ip}`, true, 86400000); try {
await this.cacheManager.set(`banned_ip:${ip}`, true, 86400000);
} catch (error) {
this.logger.error(`Error banning IP ${hashedIp}: ${error.message}`);
}
} }
} }
}); });

View File

@@ -34,8 +34,12 @@ export class ContentsService {
) {} ) {}
private async clearContentsCache() { private async clearContentsCache() {
this.logger.log("Clearing contents cache"); try {
await this.cacheManager.clear(); this.logger.log("Clearing contents cache");
await this.cacheManager.del("contents/all");
} catch (error) {
this.logger.error(`Error clearing contents cache: ${error.message}`);
}
} }
async getUploadUrl(userId: string, fileName: string) { async getUploadUrl(userId: string, fileName: string) {

View File

@@ -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;
},
}); });
} }

View File

@@ -33,8 +33,12 @@ export class UsersService {
) {} ) {}
private async clearUserCache(username?: string) { private async clearUserCache(username?: string) {
if (username) { try {
await this.cacheManager.del(`users/profile/${username}`); if (username) {
await this.cacheManager.del(`users/profile/${username}`);
}
} catch (error) {
this.logger.error(`Error clearing user cache: ${error.message}`);
} }
} }

View File

@@ -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

View File

@@ -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

View File

@@ -1,6 +1,6 @@
{ {
"name": "@memegoat/frontend", "name": "@memegoat/frontend",
"version": "1.9.6", "version": "1.10.1",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",

View File

@@ -1,6 +1,6 @@
{ {
"name": "@memegoat/source", "name": "@memegoat/source",
"version": "1.9.6", "version": "1.10.1",
"description": "", "description": "",
"scripts": { "scripts": {
"version:get": "cmake -P version.cmake GET", "version:get": "cmake -P version.cmake GET",