Skip to content

Add tenant to security context when audit log #2885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avgustinmm merged 1 commit into from
Jan 27, 2026
Merged

Add tenant to security context when audit log #2885

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions hawkbit-core/src/main/java/org/eclipse/hawkbit/audit/AuditLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.context.AccessContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -50,16 +51,18 @@ private static void logMessage(
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 Logger auditLogger = LoggerFactory.getLogger("AUDIT" + (entity != null ? ("." + entity.toUpperCase()) : ""));
switch (level) {
case INFO:
auditLogger.info(logMessage);
break;
case WARN:
auditLogger.warn(logMessage);
break;
case ERROR:
auditLogger.error(logMessage);
break;
}
AccessContext.asTenant(tenant, () -> {
switch (level) {
case INFO:
auditLogger.info(logMessage);
break;
case WARN:
auditLogger.warn(logMessage);
break;
case ERROR:
auditLogger.error(logMessage);
break;
}
});
}
}
Loading