Merge branch 'apache:main' into main

Author: gurpartap0306

.asf.yaml

@@ -0,0 +1,43 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+github:
+  description: "Apache ActiveMQ Classic"
+  homepage: https://activemq.apache.org/components/classic/
+  labels:
+    - apache
+    - activemq
+    - activemq-classic
+    - messaging
+    - broker
+    - amqp
+    - amqps
+    - openwire
+    - mqtt
+    - stomp
+    - java
+    - jms
+  enabled_merge_buttons:
+    squash: true
+    merge: true
+    rebase: true
+  autolink_jira:
+    - AMQ
+notifications:
+  commits: [email protected]
+  issues: [email protected]
+  pullrequests: [email protected]
+  jira_options: link label worklog

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java

@@ -22,6 +22,7 @@
 import javax.management.ObjectName;
 
 import org.apache.activemq.broker.Connection;
+import org.apache.activemq.broker.TransportConnection;
 import org.apache.activemq.util.IOExceptionSupport;
 
 public class ConnectionView implements ConnectionViewMBean {
@@ -196,4 +197,12 @@ public boolean isNetworkConnection() {
     public long getConnectedTimestamp() {
         return connection.getConnectedTimestamp();
     }
+
+    @Override
+    public String getWireFormatInfo() {
+        if(connection instanceof TransportConnection) {
+            return ((TransportConnection)connection).getRemoteWireFormatInfo().toString();
+        }
+        return "WireFormatInfo not available";
+    }
 }

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java

@@ -139,4 +139,11 @@ public interface ConnectionViewMBean extends Service {
      */
     @MBeanInfo("Time in ms since epoch when connection was established.")
     long getConnectedTimestamp();
+
+    /**
+     * @return the WireFormatInfo information
+     */
+    @MBeanInfo("WireFormatInfo for the connection")
+    public String getWireFormatInfo();
+
 }

activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java

@@ -20,20 +20,29 @@
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.Socket;
 import java.security.KeyStore;
 import java.security.SecureRandom;
 import java.security.UnrecoverableKeyException;
 
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLSocket;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.SslBrokerService;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportFilter;
+import org.apache.activemq.transport.tcp.SslTransport;
+import org.apache.activemq.transport.tcp.TcpTransport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import static org.junit.Assert.assertArrayEquals;
+
 public class ActiveMQSslConnectionFactoryTest extends CombinationTestSupport {
     private static final Log LOG = LogFactory.getLog(ActiveMQSslConnectionFactoryTest.class);
 
@@ -72,6 +81,26 @@ public void testCreateTcpConnectionUsingKnownPort() throws Exception {
         brokerStop();
     }
 
+    public void testCreateTcpConnectionWithSocketParameters() throws Exception {
+        // Control case: check that the factory can create an ordinary (non-ssl) connection.
+        String tcpUri = "tcp://localhost:61610?socket.OOBInline=true&socket.keepAlive=true&tcpNoDelay=true";
+        broker = createBroker(tcpUri);
+
+        // This should create the connection.
+        ActiveMQSslConnectionFactory cf = getFactory(tcpUri);
+        connection = (ActiveMQConnection)cf.createConnection();
+        assertNotNull(connection);
+
+        Socket socket = getSocketFromConnection(connection);
+        assertTrue(socket.getOOBInline());
+        assertTrue(socket.getKeepAlive());
+        assertTrue(socket.getTcpNoDelay());
+
+        connection.start();
+        connection.stop();
+        brokerStop();
+    }
+
     public void testCreateFailoverTcpConnectionUsingKnownPort() throws Exception {
         // Control case: check that the factory can create an ordinary (non-ssl) connection.
         broker = createBroker("tcp://localhost:61610?wireFormat.tcpNoDelayEnabled=true");
@@ -103,6 +132,30 @@ public void testCreateSslConnection() throws Exception {
         brokerStop();
     }
 
+    public void testCreateSslConnectionWithSocketParameters() throws Exception {
+        // Create SSL/TLS connection with trusted cert from truststore.
+        String sslUri = "ssl://localhost:61611?socket.enabledProtocols=TLSv1.3&socket.enableSessionCreation=true&socket.needClientAuth=true";
+        broker = createSslBroker(sslUri);
+        assertNotNull(broker);
+
+        // This should create the connection.
+        ActiveMQSslConnectionFactory cf = getFactory(sslUri);
+        cf.setTrustStore("server.keystore");
+        cf.setTrustStorePassword("password");
+        connection = (ActiveMQConnection)cf.createConnection();
+        assertNotNull(connection);
+
+        SSLSocket socket = (SSLSocket) getSocketFromConnection(connection);
+        String[] expectedProtocols = {"TLSv1.3"};
+        assertArrayEquals(expectedProtocols, socket.getEnabledProtocols());
+        assertTrue(socket.getEnableSessionCreation());
+        assertTrue(socket.getNeedClientAuth());
+
+        connection.start();
+        connection.stop();
+        brokerStop();
+    }
+
     public void testCreateSslConnectionKeyStore() throws Exception {
         // Create SSL/TLS connection with trusted cert from truststore.
         String sslUri = "ssl://localhost:61611";
@@ -371,4 +424,18 @@ private static Throwable getRootCause(Throwable throwable) {
         return rootCause;
     }
 
+    private Socket getSocketFromConnection(ActiveMQConnection connection) throws Exception {
+        Transport transport = connection.getTransport();
+        while(!(transport instanceof TcpTransport)) {
+            transport = ((TransportFilter) transport).getNext();
+        }
+        Class<?> transportClass = transport.getClass();
+        if (transport instanceof SslTransport) {
+            transportClass = transportClass.getSuperclass();
+        }
+        Field socket = transportClass.getDeclaredField("socket");
+        socket.setAccessible(true);
+        return (Socket) socket.get(transport);
+    }
+
 }

pom.xml

@@ -50,8 +50,8 @@
     <commons-beanutils-version>1.9.4</commons-beanutils-version>
     <commons-collections-version>3.2.2</commons-collections-version>
     <commons-daemon-version>1.4.0</commons-daemon-version>
-    <commons-dbcp2-version>2.12.0</commons-dbcp2-version>
-    <commons-io-version>2.17.0</commons-io-version>
+    <commons-dbcp2-version>2.13.0</commons-dbcp2-version>
+    <commons-io-version>2.18.0</commons-io-version>
     <commons-lang-version>3.14.0</commons-lang-version>
     <commons-logging-version>1.3.4</commons-logging-version>
     <commons-pool2-version>2.12.0</commons-pool2-version>
@@ -65,14 +65,14 @@
     <httpclient-version>4.5.14</httpclient-version>
     <httpcore-version>4.4.16</httpcore-version>
     <insight-version>1.2.0.Beta4</insight-version>
-    <jackson-version>2.18.1</jackson-version>
+    <jackson-version>2.18.2</jackson-version>
     <jakarta-jms-api-version>3.1.0</jakarta-jms-api-version>
     <jasypt-version>1.9.3</jasypt-version>
     <jaxb-version>4.0.5</jaxb-version>
     <jaxb-bundle-version>2.3.2_1</jaxb-bundle-version>
     <jetty-version>11.0.24</jetty-version>
     <jetty-version-range>[11,13)</jetty-version-range>
-    <jmdns-version>3.5.12</jmdns-version>
+    <jmdns-version>3.6.0</jmdns-version>
     <tomcat-api-version>9.0.65</tomcat-api-version>
     <jettison-version>1.5.4</jettison-version>
     <jmock-version>2.13.1</jmock-version>
@@ -97,12 +97,12 @@
     <shiro-version>1.13.0</shiro-version>
     <slf4j-version>2.0.13</slf4j-version>
     <snappy-version>1.1.2</snappy-version>
-    <spring-version>6.1.14</spring-version>
+    <spring-version>6.2.0</spring-version>
     <spring-version-range>[6,7)</spring-version-range>
     <taglibs-version>1.2.5</taglibs-version>
     <velocity-version>2.4.1</velocity-version>
     <xpp3-version>1.1.4c</xpp3-version>
-    <xstream-version>1.4.20</xstream-version>
+    <xstream-version>1.4.21</xstream-version>
     <xbean-version>4.26</xbean-version>
     <xerces-version>2.12.2</xerces-version>
     <jaxb-tools-version>4.0.8</jaxb-tools-version>