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

Feature/remove hard requirements for mdc (#1811)

Browse Source 
* Remove hard requirements for MDCHandler dependencies

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>

---------

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-08-09 18:12:58 +03:00
committed by GitHub
parent 8c2d1037bb
commit e874cf5014
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,9 +38,9 @@ public class MDCHandler {
@Value("${hawkbit.logging.mdchandler.enabled:true}") @Value("${hawkbit.logging.mdchandler.enabled:true}")
private boolean mdcEnabled; private boolean mdcEnabled;
@Autowired @Autowired(required = false)
private SpringSecurityAuditorAware springSecurityAuditorAware; private SpringSecurityAuditorAware springSecurityAuditorAware = new SpringSecurityAuditorAware();
@Autowired @Autowired(required = false)
private SystemSecurityContext securityContext; private SystemSecurityContext securityContext;
/** /**
@@ -110,7 +110,7 @@ public class MDCHandler {
final String user = springSecurityAuditorAware final String user = springSecurityAuditorAware
.getCurrentAuditor() .getCurrentAuditor()
.filter(username -> !username.equals("system")) // null and system are the same - system user .filter(username -> !username.equals("system")) // null and system are the same - system user
.map(username -> (securityContext.isCurrentThreadSystemCode() ? "as " : "") + username) .map(username -> (securityContext != null && securityContext.isCurrentThreadSystemCode() ? "as " : "") + username)
.orElse(null); .orElse(null);
final String currentUser = MDC.get(MDC_KEY_USER); final String currentUser = MDC.get(MDC_KEY_USER);