[ISSUE apache#8046] Fix authentication context build for no extFields (…

…apache#8102)
Jianing-Xu · May 9, 2024 · 89c1509 · 89c1509
1 parent ad02756
commit 89c1509
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.../org/apache/rocketmq/auth/authentication/builder/DefaultAuthenticationContextBuilder.java b/.../org/apache/rocketmq/auth/authentication/builder/DefaultAuthenticationContextBuilder.java
@@ -98,12 +98,12 @@ public DefaultAuthenticationContext build(Metadata metadata, GeneratedMessageV3
     @Override
     public DefaultAuthenticationContext build(ChannelHandlerContext context, RemotingCommand request) {
         HashMap<String, String> fields = request.getExtFields();
-        if (MapUtils.isEmpty(fields)) {
-            throw new AuthenticationException("authentication field is null.");
-        }
         DefaultAuthenticationContext result = new DefaultAuthenticationContext();
         result.setChannelId(context.channel().id().asLongText());
         result.setRpcCode(String.valueOf(request.getCode()));
+        if (MapUtils.isEmpty(fields)) {
+            return result;
+        }
         if (!fields.containsKey(SessionCredentials.ACCESS_KEY)) {
             return result;
         }

diff --git a/...va/org/apache/rocketmq/auth/authorization/builder/DefaultAuthorizationContextBuilder.java b/...va/org/apache/rocketmq/auth/authorization/builder/DefaultAuthorizationContextBuilder.java
@@ -40,6 +40,7 @@
 import java.util.HashMap;
 import java.util.List;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.acl.common.AclException;
@@ -160,6 +161,9 @@ public List<DefaultAuthorizationContext> build(ChannelHandlerContext context, Re
         List<DefaultAuthorizationContext> result = new ArrayList<>();
         try {
             HashMap<String, String> fields = command.getExtFields();
+            if (MapUtils.isEmpty(fields)) {
+                return result;
+            }
             Subject subject = null;
             if (fields.containsKey(SessionCredentials.ACCESS_KEY)) {
                 subject = User.of(fields.get(SessionCredentials.ACCESS_KEY));