[rocketmq] branch develop updated: [ISSUE #6612] Prevent redundant validator in accessValidatorList (#6615)

[yuzhou]

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

yuzhou 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 f9f7147676 [ISSUE #6612] Prevent redundant validator in 
accessValidatorList (#6615)
f9f7147676 is described below

commit f9f71476760534322cb6d62d938509aef8374d3b
Author: Ao Qiao <qiao...@foxmail.com>
AuthorDate: Tue Apr 18 23:30:50 2023 +0800

    [ISSUE #6612] Prevent redundant validator in accessValidatorList (#6615)
    
    * change map -> lambda
    
    * f
    
    * fix unit test
    
    * remove getTopicConfig function
    
    * Update MultiDispatchTest.java
    
    * Update CompactionStore.java
    
    * update
    
    * update test
    
    * update test
    
    * Update BatchConsumeMessageTest.java
    
    * Update BrokerController.java
    
    * Update BrokerController.java
    
    * check
    
    * Update BrokerController.java
    
    * Update BatchConsumeMessageTest.java
    
    * prevent redundant validator
    
    * fix
    
    * ci
    
    * ci
    
    * Update AuthenticationPipeline.java
    
    * Update RemotingProtocolServer.java
    
    * Update AuthenticationPipeline.java
    
    * Update RemotingProtocolServer.java
---
 .../java/org/apache/rocketmq/proxy/remoting/RemotingProtocolServer.java | 2 ++
 .../apache/rocketmq/proxy/remoting/pipeline/AuthenticationPipeline.java | 2 --
 2 files changed, 2 insertions(+), 2 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 85c9605620..82663f7cd4 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,6 +28,7 @@ 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,6 +259,7 @@ 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 8949353e45..4bcc1479dc 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,7 +21,6 @@ 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;
@@ -38,7 +37,6 @@ 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);