[rocketmq] branch develop updated: [ISSUE #6185]Fix It does not take effect when acl is enabled in the proxy

[zh...@apache.org]

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

zhouxzhan 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 f712bc873 [ISSUE #6185]Fix It does not take effect when acl is enabled in the proxy
f712bc873 is described below

commit f712bc873e70d046999b2d4940f41f0c8aa35267
Author: Oliver <wq...@163.com>
AuthorDate: Sun Feb 26 10:19:19 2023 +0800

    [ISSUE #6185]Fix It does not take effect when acl is enabled in the proxy
---
 .../main/java/org/apache/rocketmq/proxy/grpc/GrpcServerBuilder.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/GrpcServerBuilder.java b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/GrpcServerBuilder.java
index d496bfd10..63c00221c 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/GrpcServerBuilder.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/GrpcServerBuilder.java
@@ -38,6 +38,7 @@ import java.util.List;
 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.common.constant.LoggerName;
 import org.apache.rocketmq.common.utils.ServiceProvider;
 import org.apache.rocketmq.logging.org.slf4j.Logger;
@@ -157,6 +158,10 @@ public class GrpcServerBuilder {
     public GrpcServerBuilder configInterceptor() {
         // grpc interceptors, including acl, logging etc.
         List<AccessValidator> accessValidators = ServiceProvider.load(AccessValidator.class);
+        if (accessValidators.isEmpty()) {
+            log.info("ServiceProvider loaded no AccessValidator, using default org.apache.rocketmq.acl.plain.PlainAccessValidator");
+            accessValidators.add(new PlainAccessValidator());
+        }
         if (!accessValidators.isEmpty()) {
             this.serverBuilder.intercept(new AuthenticationInterceptor(accessValidators));
         }