[rocketmq] branch develop updated: [ISSUE #5852] Don't create PlainAccessValidator when aclEnable is false (#5854)

[oliverwqcwrw]

This is an automated email from the ASF dual-hosted git repository.

oliverwqcwrw pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 329193463 [ISSUE #5852] Don't create PlainAccessValidator when 
aclEnable is false (#5854)
329193463 is described below

commit 329193463cfd47e62dd05b542234e6973110e12d
Author: Oliver <wqdyx...@163.com>
AuthorDate: Fri Jan 13 16:41:37 2023 +0800

    [ISSUE #5852] Don't create PlainAccessValidator when aclEnable is false 
(#5854)
---
 .../org/apache/rocketmq/proxy/remoting/RemotingProtocolServer.java     | 3 ---
 .../rocketmq/proxy/remoting/pipeline/AuthenticationPipeline.java       | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/RemotingProtocolServer.java
 
b/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/RemotingProtocolServer.java
index a7cc7af47..b5c749d3b 100644
--- 
a/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/RemotingProtocolServer.java
+++ 
b/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/RemotingProtocolServer.java
@@ -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));
diff --git 
a/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/pipeline/AuthenticationPipeline.java
 
b/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/pipeline/AuthenticationPipeline.java
index 4bcc1479d..8949353e4 100644
--- 
a/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/pipeline/AuthenticationPipeline.java
+++ 
b/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/pipeline/AuthenticationPipeline.java
@@ -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);