This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new b8a9d626cd ARTEMIS-4920 strip leading forward slash from IP address
b8a9d626cd is described below
commit b8a9d626cd736cd7b01adc1a0e4e360fa2c60b16
Author: Justin Bertram <[email protected]>
AuthorDate: Wed Jul 10 22:43:33 2024 -0500
ARTEMIS-4920 strip leading forward slash from IP address
---
.../core/remoting/impl/netty/NettyConnection.java | 7 ++++++-
.../tests/integration/client/CoreClientTest.java | 22 ++++++++++++++++------
.../tests/integration/client/SlowConsumerTest.java | 2 +-
.../management/SSLSecurityNotificationTest.java | 4 ++--
4 files changed, 25 insertions(+), 10 deletions(-)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
index dde7055a90..f84edb2284 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
@@ -397,7 +397,12 @@ public class NettyConnection implements Connection {
if (address == null) {
return null;
}
- return address.toString();
+ String result = address.toString();
+ if (result.startsWith("/")) {
+ return result.substring(1);
+ } else {
+ return result;
+ }
}
@Override
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CoreClientTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CoreClientTest.java
index 24dd9b8bcb..4533233a4a 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CoreClientTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CoreClientTest.java
@@ -16,12 +16,6 @@
*/
package org.apache.activemq.artemis.tests.integration.client;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -59,6 +53,12 @@ import
org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
import org.apache.activemq.artemis.utils.UUIDGenerator;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class CoreClientTest extends ActiveMQTestBase {
@Test
@@ -282,4 +282,14 @@ public class CoreClientTest extends ActiveMQTestBase {
sf.close();
}
+
+ @Test
+ public void testRemoteAddress() throws Exception {
+ ActiveMQServer server =
addServer(ActiveMQServers.newActiveMQServer(createDefaultConfig(true), false));
+ server.start();
+ ServerLocator locator = createNonHALocator(true);
+ ClientSessionFactory sf = createSessionFactory(locator);
+ addClientSession(sf.createSession(false, true, true));
+
assertFalse(server.getRemotingService().getConnections().iterator().next().getTransportConnection().getRemoteAddress().startsWith("/"));
+ }
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
index 5673347d6b..e35ef32684 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
@@ -262,7 +262,7 @@ public class SlowConsumerTest extends ActiveMQTestBase {
assertEquals(QUEUE.toString(),
message.getObjectProperty(ManagementHelper.HDR_ADDRESS).toString());
assertEquals(Integer.valueOf(1),
message.getIntProperty(ManagementHelper.HDR_CONSUMER_COUNT));
if (isNetty) {
-
assertTrue(message.getSimpleStringProperty(ManagementHelper.HDR_REMOTE_ADDRESS).toString().startsWith("/127.0.0.1"));
+
assertTrue(message.getSimpleStringProperty(ManagementHelper.HDR_REMOTE_ADDRESS).toString().startsWith("127.0.0.1"));
} else {
assertEquals(SimpleString.of("invm:0"),
message.getSimpleStringProperty(ManagementHelper.HDR_REMOTE_ADDRESS));
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SSLSecurityNotificationTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SSLSecurityNotificationTest.java
index 7ce14d91b5..eb7e1a7f40 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SSLSecurityNotificationTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SSLSecurityNotificationTest.java
@@ -107,7 +107,7 @@ public class SSLSecurityNotificationTest extends
ActiveMQTestBase {
assertEquals(SECURITY_AUTHENTICATION_VIOLATION.toString(),
notifications[0].getObjectProperty(ManagementHelper.HDR_NOTIFICATION_TYPE).toString());
assertNull(notifications[0].getObjectProperty(ManagementHelper.HDR_USER));
assertEquals("CN=ActiveMQ Artemis Unknown Client, OU=Artemis,
O=ActiveMQ, L=AMQ, ST=AMQ, C=AMQ",
notifications[0].getObjectProperty(ManagementHelper.HDR_CERT_SUBJECT_DN).toString());
-
assertTrue(notifications[0].getObjectProperty(ManagementHelper.HDR_REMOTE_ADDRESS).toString().startsWith("/127.0.0.1"));
+
assertTrue(notifications[0].getObjectProperty(ManagementHelper.HDR_REMOTE_ADDRESS).toString().startsWith("127.0.0.1"));
assertTrue(notifications[0].getTimestamp() >= start);
assertTrue((long)
notifications[0].getObjectProperty(ManagementHelper.HDR_NOTIFICATION_TIMESTAMP)
>= start);
assertEquals(notifications[0].getTimestamp(), (long)
notifications[0].getObjectProperty(ManagementHelper.HDR_NOTIFICATION_TIMESTAMP));
@@ -179,7 +179,7 @@ public class SSLSecurityNotificationTest extends
ActiveMQTestBase {
assertEquals(CONNECTION_CREATED.toString(),
notification.getObjectProperty(ManagementHelper.HDR_NOTIFICATION_TYPE).toString());
assertNotNull(notification.getObjectProperty(ManagementHelper.HDR_CERT_SUBJECT_DN));
assertEquals("CN=ActiveMQ Artemis Client, OU=Artemis, O=ActiveMQ, L=AMQ,
ST=AMQ, C=AMQ",
notification.getObjectProperty(ManagementHelper.HDR_CERT_SUBJECT_DN).toString());
-
assertTrue(notification.getObjectProperty(ManagementHelper.HDR_REMOTE_ADDRESS).toString().startsWith("/127.0.0.1"));
+
assertTrue(notification.getObjectProperty(ManagementHelper.HDR_REMOTE_ADDRESS).toString().startsWith("127.0.0.1"));
assertTrue(notification.getTimestamp() >= start);
assertTrue((long)
notification.getObjectProperty(ManagementHelper.HDR_NOTIFICATION_TIMESTAMP) >=
start);
assertEquals(notification.getTimestamp(), (long)
notification.getObjectProperty(ManagementHelper.HDR_NOTIFICATION_TIMESTAMP));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
