opensource/rocketmq
3
0
Fork 0
mirror of https://github.com/apache/rocketmq.git synced 2026-09-19 02:23:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ISSUE #7955] Don't set default auth metadata provider (#7956)

Browse Source
This commit is contained in:
dingshuangxi888
2024-03-25 17:15:40 +08:00
committed by GitHub
parent 402d31a1b8
commit d1cc7428da
7 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
auth/src/main/java/org/apache/rocketmq/auth/authentication/chain/DefaultAuthenticationHandler.java
+3
View File
@@ -45,6 +45,9 @@ public class DefaultAuthenticationHandler implements Handler<DefaultAuthenticati
}
protected CompletableFuture<User> getUser(DefaultAuthenticationContext context) {
if (this.authenticationMetadataProvider == null) {
throw new AuthenticationException("The authenticationMetadataProvider is not configured");
}
if (StringUtils.isEmpty(context.getUsername())) {
throw new AuthenticationException("username cannot be null.");
}
auth/src/main/java/org/apache/rocketmq/auth/authentication/factory/AuthenticationFactory.java
+7 -5
View File
@@ -31,7 +31,6 @@ import org.apache.rocketmq.auth.authentication.manager.AuthenticationMetadataMan
import org.apache.rocketmq.auth.authentication.provider.AuthenticationMetadataProvider;
import org.apache.rocketmq.auth.authentication.provider.AuthenticationProvider;
import org.apache.rocketmq.auth.authentication.provider.DefaultAuthenticationProvider;
import org.apache.rocketmq.auth.authentication.provider.LocalAuthenticationMetadataProvider;
import org.apache.rocketmq.auth.authentication.strategy.AuthenticationStrategy;
import org.apache.rocketmq.auth.authentication.strategy.StatelessAuthenticationStrategy;
import org.apache.rocketmq.auth.config.AuthConfig;
@@ -78,10 +77,11 @@ public class AuthenticationFactory {
}
return computeIfAbsent(METADATA_PROVIDER_PREFIX + config.getConfigName(), key -> {
try {
Class<? extends AuthenticationMetadataProvider> clazz = LocalAuthenticationMetadataProvider.class;
if (StringUtils.isNotBlank(config.getAuthenticationMetadataProvider())) {
clazz = (Class<? extends AuthenticationMetadataProvider>) Class.forName(config.getAuthenticationMetadataProvider());
if (StringUtils.isBlank(config.getAuthenticationMetadataProvider())) {
return null;
}
Class<? extends AuthenticationMetadataProvider> clazz = (Class<? extends AuthenticationMetadataProvider>)
Class.forName(config.getAuthenticationMetadataProvider());
AuthenticationMetadataProvider result = clazz.getDeclaredConstructor().newInstance();
result.initialize(config, metadataService);
return result;
@@ -142,7 +142,9 @@ public class AuthenticationFactory {
}
if (result == null) {
result = function.apply(key);
INSTANCE_MAP.put(key, result);
if (result != null) {
INSTANCE_MAP.put(key, result);
}
}
}
}
auth/src/main/java/org/apache/rocketmq/auth/authentication/manager/AuthenticationMetadataManagerImpl.java
+8 -8
View File
@@ -206,17 +206,17 @@ public class AuthenticationMetadataManagerImpl implements AuthenticationMetadata
result.completeExceptionally(throwable);
}
private AuthorizationMetadataProvider getAuthorizationMetadataProvider() {
if (authenticationMetadataProvider == null) {
throw new IllegalStateException("The authenticationMetadataProvider is not configured");
}
return authorizationMetadataProvider;
}
private AuthenticationMetadataProvider getAuthenticationMetadataProvider() {
if (authorizationMetadataProvider == null) {
throw new IllegalStateException("The authorizationMetadataProvider is not configured");
throw new IllegalStateException("The authenticationMetadataProvider is not configured");
}
return authenticationMetadataProvider;
}
private AuthorizationMetadataProvider getAuthorizationMetadataProvider() {
if (authenticationMetadataProvider == null) {
throw new IllegalStateException("The authorizationMetadataProvider is not configured");
}
return authorizationMetadataProvider;
}
}
auth/src/main/java/org/apache/rocketmq/auth/authorization/chain/AclAuthorizationHandler.java
+4 -1
View File
@@ -54,7 +54,10 @@ public class AclAuthorizationHandler implements Handler<DefaultAuthorizationCont
@Override
public CompletableFuture<Void> handle(DefaultAuthorizationContext context,
HandlerChain<DefaultAuthorizationContext, CompletableFuture<Void>> chain) {
return authorizationMetadataProvider.getAcl(context.getSubject()).thenAccept(acl -> {
if (this.authorizationMetadataProvider == null) {
throw new AuthorizationException("The authorizationMetadataProvider is not configured");
}
return this.authorizationMetadataProvider.getAcl(context.getSubject()).thenAccept(acl -> {
if (acl == null) {
throwException(context, "no matched policies.");
}
auth/src/main/java/org/apache/rocketmq/auth/authorization/chain/UserAuthorizationHandler.java
+3
View File
@@ -54,6 +54,9 @@ public class UserAuthorizationHandler implements Handler<DefaultAuthorizationCon
}
private CompletableFuture<User> getUser(Subject subject) {
if (this.authenticationMetadataProvider == null) {
throw new AuthorizationException("The authenticationMetadataProvider is not configured");
}
User user = (User) subject;
return authenticationMetadataProvider.getUser(user.getUsername()).thenApply(result -> {
if (result == null) {
auth/src/main/java/org/apache/rocketmq/auth/authorization/factory/AuthorizationFactory.java
+10 -8
View File
@@ -19,9 +19,9 @@ package org.apache.rocketmq.auth.authorization.factory;
import com.google.protobuf.GeneratedMessageV3;
import io.grpc.Metadata;
import io.netty.channel.ChannelHandlerContext;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.Map;
import java.util.function.Function;
import java.util.function.Supplier;
import org.apache.commons.lang3.StringUtils;
@@ -32,7 +32,6 @@ import org.apache.rocketmq.auth.authorization.manager.AuthorizationMetadataManag
import org.apache.rocketmq.auth.authorization.provider.AuthorizationMetadataProvider;
import org.apache.rocketmq.auth.authorization.provider.AuthorizationProvider;
import org.apache.rocketmq.auth.authorization.provider.DefaultAuthorizationProvider;
import org.apache.rocketmq.auth.authorization.provider.LocalAuthorizationMetadataProvider;
import org.apache.rocketmq.auth.authorization.strategy.AuthorizationStrategy;
import org.apache.rocketmq.auth.authorization.strategy.StatelessAuthorizationStrategy;
import org.apache.rocketmq.auth.config.AuthConfig;
@@ -40,7 +39,7 @@ import org.apache.rocketmq.remoting.protocol.RemotingCommand;
public class AuthorizationFactory {
private static final ConcurrentMap<String, Object> INSTANCE_MAP = new ConcurrentHashMap<>();
private static final Map<String, Object> INSTANCE_MAP = new HashMap<>();
private static final String PROVIDER_PREFIX = "PROVIDER_";
private static final String METADATA_PROVIDER_PREFIX = "METADATA_PROVIDER_";
private static final String EVALUATOR_PREFIX = "EVALUATOR_";
@@ -80,10 +79,11 @@ public class AuthorizationFactory {
}
return computeIfAbsent(METADATA_PROVIDER_PREFIX + config.getConfigName(), key -> {
try {
Class<? extends AuthorizationMetadataProvider> clazz = LocalAuthorizationMetadataProvider.class;
if (StringUtils.isNotBlank(config.getAuthorizationMetadataProvider())) {
clazz = (Class<? extends AuthorizationMetadataProvider>) Class.forName(config.getAuthorizationMetadataProvider());
if (StringUtils.isBlank(config.getAuthorizationMetadataProvider())) {
return null;
}
Class<? extends AuthorizationMetadataProvider> clazz = (Class<? extends AuthorizationMetadataProvider>)
Class.forName(config.getAuthorizationMetadataProvider());
AuthorizationMetadataProvider result = clazz.getDeclaredConstructor().newInstance();
result.initialize(config, metadataService);
return result;
@@ -145,7 +145,9 @@ public class AuthorizationFactory {
}
if (result == null) {
result = function.apply(key);
INSTANCE_MAP.put(key, result);
if (result != null) {
INSTANCE_MAP.put(key, result);
}
}
}
}
auth/src/main/java/org/apache/rocketmq/auth/authorization/manager/AuthorizationMetadataManagerImpl.java
+7 -7
View File
@@ -268,17 +268,17 @@ public class AuthorizationMetadataManagerImpl implements AuthorizationMetadataMa
return result;
}
private AuthenticationMetadataProvider getAuthenticationMetadataProvider() {
if (authorizationMetadataProvider == null) {
throw new IllegalStateException("The authenticationMetadataProvider is not configured.");
}
return authenticationMetadataProvider;
}
private AuthorizationMetadataProvider getAuthorizationMetadataProvider() {
if (authenticationMetadataProvider == null) {
throw new IllegalStateException("The authenticationMetadataProvider is not configured.");
}
return authorizationMetadataProvider;
}
private AuthenticationMetadataProvider getAuthenticationMetadataProvider() {
if (authorizationMetadataProvider == null) {
throw new IllegalStateException("The authorizationMetadataProvider is not configured.");
}
return authenticationMetadataProvider;
}
}