[ISSUE #8259] fix parse ipv6 address in haproxy (#8260)

* fix parse ipv6 from address in haproxy * more
apache · Sep 12, 2024 · 5eced11 · 5eced11
1 parent ba8148f
commit 5eced11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...va/org/apache/rocketmq/auth/authorization/builder/DefaultAuthorizationContextBuilder.java b/...va/org/apache/rocketmq/auth/authorization/builder/DefaultAuthorizationContextBuilder.java
@@ -171,7 +171,7 @@ public List<DefaultAuthorizationContext> build(ChannelHandlerContext context, Re
                 subject = User.of(fields.get(SessionCredentials.ACCESS_KEY));
             }
             String remoteAddr = RemotingHelper.parseChannelRemoteAddr(context.channel());
-            String sourceIp = StringUtils.substringBefore(remoteAddr, CommonConstants.COLON);
+            String sourceIp = StringUtils.substringBeforeLast(remoteAddr, CommonConstants.COLON);
 
             Resource topic;
             Resource group;
@@ -394,7 +394,7 @@ private List<DefaultAuthorizationContext> newContext(Metadata metadata, QueryRou
             subject = User.of(metadata.get(GrpcConstants.AUTHORIZATION_AK));
         }
         Resource resource = Resource.ofTopic(topic.getName());
-        String sourceIp = StringUtils.substringBefore(metadata.get(GrpcConstants.REMOTE_ADDRESS), CommonConstants.COLON);
+        String sourceIp = StringUtils.substringBeforeLast(metadata.get(GrpcConstants.REMOTE_ADDRESS), CommonConstants.COLON);
         DefaultAuthorizationContext context = DefaultAuthorizationContext.of(subject, resource, Arrays.asList(Action.PUB, Action.SUB), sourceIp);
         return Collections.singletonList(context);
     }
@@ -437,7 +437,7 @@ private static List<DefaultAuthorizationContext> newPubContext(Metadata metadata
             subject = User.of(metadata.get(GrpcConstants.AUTHORIZATION_AK));
         }
         Resource resource = Resource.ofTopic(topic.getName());
-        String sourceIp = StringUtils.substringBefore(metadata.get(GrpcConstants.REMOTE_ADDRESS), CommonConstants.COLON);
+        String sourceIp = StringUtils.substringBeforeLast(metadata.get(GrpcConstants.REMOTE_ADDRESS), CommonConstants.COLON);
         DefaultAuthorizationContext context = DefaultAuthorizationContext.of(subject, resource, Action.PUB, sourceIp);
         return Collections.singletonList(context);
     }
@@ -483,7 +483,7 @@ private static List<DefaultAuthorizationContext> newSubContexts(Metadata metadat
         if (metadata.containsKey(GrpcConstants.AUTHORIZATION_AK)) {
             subject = User.of(metadata.get(GrpcConstants.AUTHORIZATION_AK));
         }
-        String sourceIp = StringUtils.substringBefore(metadata.get(GrpcConstants.REMOTE_ADDRESS), CommonConstants.COLON);
+        String sourceIp = StringUtils.substringBeforeLast(metadata.get(GrpcConstants.REMOTE_ADDRESS), CommonConstants.COLON);
         result.add(DefaultAuthorizationContext.of(subject, resource, Action.SUB, sourceIp));
         return result;
     }

diff --git a/.../java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/HAProxyMessageForwarder.java b/.../java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/HAProxyMessageForwarder.java
@@ -118,11 +118,11 @@ protected HAProxyMessage buildHAProxyMessage(Channel inboundChannel) throws Ille
             }
         } else {
             String remoteAddr = RemotingHelper.parseChannelRemoteAddr(inboundChannel);
-            sourceAddress = StringUtils.substringBefore(remoteAddr, CommonConstants.COLON);
+            sourceAddress = StringUtils.substringBeforeLast(remoteAddr, CommonConstants.COLON);
             sourcePort = Integer.parseInt(StringUtils.substringAfterLast(remoteAddr, CommonConstants.COLON));
 
             String localAddr = RemotingHelper.parseChannelLocalAddr(inboundChannel);
-            destinationAddress = StringUtils.substringBefore(localAddr, CommonConstants.COLON);
+            destinationAddress = StringUtils.substringBeforeLast(localAddr, CommonConstants.COLON);
             destinationPort = Integer.parseInt(StringUtils.substringAfterLast(localAddr, CommonConstants.COLON));
         }