[ISSUE #5852] Don't create PlainAccessValidator when aclEnable is false (#5854)

This commit is contained in:
Oliver
2023-01-13 16:41:37 +08:00
committed by GitHub
parent ddfee4b4d8
commit 329193463c
2 changed files with 2 additions and 3 deletions
@@ -28,7 +28,6 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.apache.rocketmq.acl.AccessValidator;
import org.apache.rocketmq.acl.plain.PlainAccessValidator;
import org.apache.rocketmq.client.exception.MQClientException;
import org.apache.rocketmq.common.constant.LoggerName;
import org.apache.rocketmq.common.future.FutureTaskExt;
@@ -258,8 +257,6 @@ public class RemotingProtocolServer implements StartAndShutdown, RemotingProxyOu
};
List<AccessValidator> accessValidatorList = new ArrayList<>();
accessValidatorList.add(new PlainAccessValidator());
// add pipeline
// the last pipe add will execute at the first
return pipeline.pipe(new AuthenticationPipeline(accessValidatorList));
@@ -21,6 +21,7 @@ import io.netty.channel.ChannelHandlerContext;
import java.util.List;
import org.apache.rocketmq.acl.AccessResource;
import org.apache.rocketmq.acl.AccessValidator;
import org.apache.rocketmq.acl.plain.PlainAccessValidator;
import org.apache.rocketmq.proxy.common.ProxyContext;
import org.apache.rocketmq.proxy.config.ConfigurationManager;
import org.apache.rocketmq.proxy.config.ProxyConfig;
@@ -37,6 +38,7 @@ public class AuthenticationPipeline implements RequestPipeline {
public void execute(ChannelHandlerContext ctx, RemotingCommand request, ProxyContext context) throws Exception {
ProxyConfig config = ConfigurationManager.getProxyConfig();
if (config.isEnableACL()) {
accessValidatorList.add(new PlainAccessValidator());
for (AccessValidator accessValidator : accessValidatorList) {
AccessResource accessResource = accessValidator.parse(request, context.getRemoteAddress());
accessValidator.validate(accessResource);