Add tenant to security context when audit log (#2885)

Signed-off-by: vasilchev <vasil.ilchev@bosch.com>
This commit is contained in:
Vasil Ilchev
2026-01-27 11:15:49 +02:00
committed by GitHub
parent ea1b4858dd
commit ef169245d4

View File

@@ -11,6 +11,7 @@ package org.eclipse.hawkbit.audit;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.context.AccessContext;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -50,6 +51,7 @@ public class AuditLogger {
final String tenant, final String username, final String entity, final String message, final AuditLog.Level level) { final String tenant, final String username, final String entity, final String message, final AuditLog.Level level) {
final String logMessage = String.format("[%s] User: %s, AccessContext: %s - %s", entity, username, tenant, message); final String logMessage = String.format("[%s] User: %s, AccessContext: %s - %s", entity, username, tenant, message);
final Logger auditLogger = LoggerFactory.getLogger("AUDIT" + (entity != null ? ("." + entity.toUpperCase()) : "")); final Logger auditLogger = LoggerFactory.getLogger("AUDIT" + (entity != null ? ("." + entity.toUpperCase()) : ""));
AccessContext.asTenant(tenant, () -> {
switch (level) { switch (level) {
case INFO: case INFO:
auditLogger.info(logMessage); auditLogger.info(logMessage);
@@ -61,5 +63,6 @@ public class AuditLogger {
auditLogger.error(logMessage); auditLogger.error(logMessage);
break; break;
} }
});
} }
} }