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

Refactor TenantAware - remove TenantRunner and replace with standard Runnable / Callable (#2755)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-10-14 16:36:42 +03:00
committed by GitHub
parent 0a2f18fbad
commit 04cd9fb30d
14 changed files with 88 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java
View File

@@ -15,6 +15,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.Callable;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -106,12 +107,21 @@ public class SecurityContextTenantAware implements ContextAware {
}
@Override
public <T> T runAsTenant(final String tenant, final TenantRunner<T> tenantRunner) {
return runInContext(buildUserSecurityContext(tenant, SYSTEM_USER, SYSTEM_AUTHORITIES), tenantRunner::run);
@SuppressWarnings("java:S112") // java:S112 - it is generic class so a generic exception is fine
public <T> T runAsTenant(final String tenant, final Callable<T> callable) {
return runInContext(buildUserSecurityContext(tenant, SYSTEM_USER, SYSTEM_AUTHORITIES), () -> {
try {
return callable.call();
} catch (final RuntimeException e) {
throw e;
} catch (final Exception e) {
throw new RuntimeException(e);
}
});
}
@Override
public <T> T runAsTenantAsUser(final String tenant, final String username, final TenantRunner<T> tenantRunner) {
public void runAsTenantAsUser(final String tenant, final String username, final Runnable runnable) {
Objects.requireNonNull(tenant);
Objects.requireNonNull(username);
@@ -119,7 +129,10 @@ public class SecurityContextTenantAware implements ContextAware {
() -> authoritiesResolver.getUserAuthorities(tenant, username).stream()
.map(SimpleGrantedAuthority::new)
.toList());
return runInContext(buildUserSecurityContext(tenant, username, authorities), tenantRunner::run);
runInContext(buildUserSecurityContext(tenant, username, authorities), () -> {
runnable.run();
return null;
});
}
@Override
@@ -151,11 +164,11 @@ public class SecurityContextTenantAware implements ContextAware {
}
}
private static <T> T runAsSystem(final TenantRunner<T> tenantRunner) {
private static <T> T runAsSystem(final Callable<T> callable) {
final SecurityContext currentContext = SecurityContextHolder.getContext();
SystemSecurityContext.setSystemContext(currentContext);
try {
return MdcHandler.getInstance().callWithAuthRE(tenantRunner::run);
return MdcHandler.getInstance().callWithAuthRE(callable);
} finally {
SecurityContextHolder.setContext(currentContext);
}

11
hawkbit-security-core/src/test/java/org/eclipse/hawkbit/security/SystemCodeAuthenticationTest.java
View File

@@ -15,7 +15,9 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.List;
import java.util.concurrent.Callable;
import lombok.SneakyThrows;
import org.assertj.core.api.Assertions;
import org.eclipse.hawkbit.tenancy.TenantAware;
import org.junit.jupiter.api.Test;
@@ -39,14 +41,15 @@ class SystemCodeAuthenticationTest {
return "user";
}
@SneakyThrows
@Override
public <T> T runAsTenant(final String tenant, final TenantRunner<T> tenantRunner) {
return tenantRunner.run();
public <T> T runAsTenant(final String tenant, final Callable<T> callable) {
return callable.call();
}
@Override
public <T> T runAsTenantAsUser(final String tenant, final String username, final TenantRunner<T> tenantRunner) {
return tenantRunner.run();
public void runAsTenantAsUser(final String tenant, final String username, final Runnable runnable) {
runnable.run();
}
});