Add tenant to security context when audit log (#2885)
Signed-off-by: vasilchev <vasil.ilchev@bosch.com>
This commit is contained in:
@@ -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,16 +51,18 @@ 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()) : ""));
|
||||||
switch (level) {
|
AccessContext.asTenant(tenant, () -> {
|
||||||
case INFO:
|
switch (level) {
|
||||||
auditLogger.info(logMessage);
|
case INFO:
|
||||||
break;
|
auditLogger.info(logMessage);
|
||||||
case WARN:
|
break;
|
||||||
auditLogger.warn(logMessage);
|
case WARN:
|
||||||
break;
|
auditLogger.warn(logMessage);
|
||||||
case ERROR:
|
break;
|
||||||
auditLogger.error(logMessage);
|
case ERROR:
|
||||||
break;
|
auditLogger.error(logMessage);
|
||||||
}
|
break;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user