lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix MDCHandler for servlets. Config enable -> enabled (#1808)

Browse Source 
Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-08-09 16:38:20 +03:00
committed by GitHub
parent 141d167a81
commit 9dd493d783
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MDCHandler.java
View File

@@ -36,7 +36,7 @@ public class MDCHandler {
private static final MDCHandler SINGLETON = new MDCHandler(); private static final MDCHandler SINGLETON = new MDCHandler();
@Value("${hawkbit.logging.mdchandler.enable:true}") @Value("${hawkbit.logging.mdchandler.enabled:true}")
private boolean mdcEnabled; private boolean mdcEnabled;
@Autowired @Autowired
private SpringSecurityAuditorAware springSecurityAuditorAware; private SpringSecurityAuditorAware springSecurityAuditorAware;
@@ -77,10 +77,6 @@ public class MDCHandler {
} }
public void addLoggingFilter(final HttpSecurity httpSecurity) { public void addLoggingFilter(final HttpSecurity httpSecurity) {
if (!mdcEnabled) {
return;
}
httpSecurity.addFilterBefore(new OncePerRequestFilter() { httpSecurity.addFilterBefore(new OncePerRequestFilter() {
@Override @Override
protected void doFilterInternal( protected void doFilterInternal(
@@ -103,8 +99,7 @@ public class MDCHandler {
throw we.toRuntimeException(); throw we.toRuntimeException();
} }
} catch (final Exception e) { } catch (final Exception e) {
// should never be here - if mdc is handler is enabled non runtime exceptions are // should never be here - if mdc is handler is enabled non-runtime exceptions are always wrapped
// always wrapped
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
@@ -114,6 +109,7 @@ public class MDCHandler {
private <T> T putUserAndCall(final Callable<T> callable) throws WrappedException { private <T> T putUserAndCall(final Callable<T> callable) throws WrappedException {
final String user = springSecurityAuditorAware final String user = springSecurityAuditorAware
.getCurrentAuditor() .getCurrentAuditor()
.filter(username -> !username.equals("system")) // null and system are the same - system user
.map(username -> (securityContext.isCurrentThreadSystemCode() ? "as " : "") + username) .map(username -> (securityContext.isCurrentThreadSystemCode() ? "as " : "") + username)
.orElse(null); .orElse(null);