This is an automated email from the ASF dual-hosted git repository.
jbertram 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 7456e64f39 ARTEMIS-4452: Allow to customize http header in
http-upgrade request from Artemis.
7456e64f39 is described below
commit 7456e64f3960255b6e74197791e5dd8087cf85a8
Author: Emmanuel Hugonnet <[email protected]>
AuthorDate: Tue Jan 2 09:30:29 2024 +0100
ARTEMIS-4452: Allow to customize http header in http-upgrade request from
Artemis.
Using a prefix "netty.http.header." to be able to define http headers
used for http request from the netty connector.
Issue: https://issues.apache.org/jira/browse/ARTEMIS-4452
Signed-off-by: Emmanuel Hugonnet <[email protected]>
---
.../core/remoting/impl/netty/NettyConnector.java | 27 +++++++++++++++--
.../remoting/impl/netty/TransportConstants.java | 2 ++
.../integration/client/NettyConnectorTest.java | 35 ++++++++++++++++++++++
3 files changed, 62 insertions(+), 2 deletions(-)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index 205b0ea061..0a12996268 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -16,6 +16,8 @@
*/
package org.apache.activemq.artemis.core.remoting.impl.netty;
+import static
org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.NETTY_HTTP_HEADER_PREFIX;
+
import javax.net.ssl.SNIHostName;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
@@ -309,6 +311,8 @@ public class NettyConnector extends AbstractConnector {
private final ClientProtocolManager protocolManager;
+ private final Map<String, String> httpHeaders;
+
public NettyConnector(final Map<String, Object> configuration,
final BufferHandler handler,
final BaseConnectionLifeCycleListener<?> listener,
@@ -361,10 +365,17 @@ public class NettyConnector extends AbstractConnector {
httpMaxClientIdleTime =
ConfigurationHelper.getLongProperty(TransportConstants.HTTP_CLIENT_IDLE_PROP_NAME,
TransportConstants.DEFAULT_HTTP_CLIENT_IDLE_TIME, configuration);
httpClientIdleScanPeriod =
ConfigurationHelper.getLongProperty(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD,
TransportConstants.DEFAULT_HTTP_CLIENT_SCAN_PERIOD, configuration);
httpRequiresSessionId =
ConfigurationHelper.getBooleanProperty(TransportConstants.HTTP_REQUIRES_SESSION_ID,
TransportConstants.DEFAULT_HTTP_REQUIRES_SESSION_ID, configuration);
+ httpHeaders = new HashMap<>();
+ for (Map.Entry<String, Object> header : configuration.entrySet()) {
+ if (header.getKey().startsWith(NETTY_HTTP_HEADER_PREFIX)) {
+
httpHeaders.put(header.getKey().substring(NETTY_HTTP_HEADER_PREFIX.length()),
header.getValue().toString());
+ }
+ }
} else {
httpMaxClientIdleTime = 0;
httpClientIdleScanPeriod = -1;
httpRequiresSessionId = false;
+ httpHeaders = Collections.emptyMap();
}
httpUpgradeEnabled =
ConfigurationHelper.getBooleanProperty(TransportConstants.HTTP_UPGRADE_ENABLED_PROP_NAME,
TransportConstants.DEFAULT_HTTP_UPGRADE_ENABLED, configuration);
@@ -743,7 +754,7 @@ public class NettyConnector extends AbstractConnector {
pipeline.addLast(new HttpObjectAggregator(Integer.MAX_VALUE));
- pipeline.addLast(new HttpHandler());
+ pipeline.addLast(new HttpHandler(httpHeaders));
}
if (httpUpgradeEnabled) {
@@ -1110,9 +1121,15 @@ public class NettyConnector extends AbstractConnector {
private boolean handshaking = false;
private String cookie;
+ private Map<String, String> headers;
- HttpHandler() throws Exception {
+ HttpHandler(Map<String, String> headers) throws Exception {
url = new URI("http", null, host, port, servletPath, null,
null).toString();
+ this.headers = headers;
+ }
+
+ public Map<String, String> getHeaders() {
+ return headers;
}
@Override
@@ -1170,6 +1187,9 @@ public class NettyConnector extends AbstractConnector {
ByteBuf buf = (ByteBuf) msg;
FullHttpRequest httpRequest = new
DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, url, buf);
httpRequest.headers().add(HttpHeaderNames.HOST,
NettyConnector.this.host);
+ for (Map.Entry<String, String> header : headers.entrySet()) {
+ httpRequest.headers().add(header.getKey(), header.getValue());
+ }
if (cookie != null) {
httpRequest.headers().add(HttpHeaderNames.COOKIE, cookie);
}
@@ -1197,6 +1217,9 @@ public class NettyConnector extends AbstractConnector {
if (!waitingGet && System.currentTimeMillis() > lastSendTime +
httpMaxClientIdleTime) {
FullHttpRequest httpRequest = new
DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, url);
httpRequest.headers().add(HttpHeaderNames.HOST,
NettyConnector.this.host);
+ for (Map.Entry<String, String> header : headers.entrySet()) {
+ httpRequest.headers().add(header.getKey(),
header.getValue());
+ }
waitingGet = true;
channel.writeAndFlush(httpRequest);
}
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
index 522986b719..7859fec4a6 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
@@ -46,6 +46,8 @@ public class TransportConstants {
public static final String HTTP_CLIENT_IDLE_SCAN_PERIOD =
"httpClientIdleScanPeriod";
+ public static final String NETTY_HTTP_HEADER_PREFIX = "nettyHttpHeader.";
+
public static final String HTTP_RESPONSE_TIME_PROP_NAME =
"httpResponseTime";
public static final String HTTP_SERVER_SCAN_PERIOD_PROP_NAME =
"httpServerScanPeriod";
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java
index ebbe5f51ac..6538a73e5f 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java
@@ -16,7 +16,11 @@
*/
package org.apache.activemq.artemis.tests.integration.client;
+
import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.ChannelPipeline;
+import java.lang.reflect.Method;
+import java.util.Map;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
@@ -60,4 +64,35 @@ public class NettyConnectorTest extends ActiveMQTestBase {
factory.close();
locator.close();
}
+
+ @Test
+ public void testConnectionHttpHeaders() throws Exception {
+ TransportConfiguration transport = new
TransportConfiguration(NETTY_CONNECTOR_FACTORY);
+ transport.getParams().put(TransportConstants.HTTP_ENABLED_PROP_NAME,
true);
+ transport.getParams().put("nettyHttpHeader.accept",
"text/html,application/xhtml+xml,application/xml");
+ transport.getParams().put("nettyHttpHeader.Accept-Encoding",
"gzip,deflate");
+ transport.getParams().put("nettyHttpHeader.Accept-Language",
"en-us,en;q=0.5");
+
+ try (ServerLocator locator =
ActiveMQClient.createServerLocatorWithoutHA(transport)) {
+ ClientSessionFactoryImpl factory = (ClientSessionFactoryImpl)
locator.createSessionFactory();
+ NettyConnector connector = (NettyConnector) factory.getConnector();
+
+ Bootstrap bootstrap = connector.getBootStrap();
+ ChannelPipeline pipeline = bootstrap.register().channel().pipeline();
+ pipeline.flush();
+ Object httpHandler = pipeline.get("NettyConnector$HttpHandler#0");
+ Method getHeadersMethod =
httpHandler.getClass().getMethod("getHeaders", (Class<?>[]) null);
+ getHeadersMethod.setAccessible(true);
+ Map<String, String> headers = (Map<String, String>)
getHeadersMethod.invoke(httpHandler, (Object[]) null);
+ assertEquals(3, headers.size());
+ assertTrue(headers.containsKey("accept"));
+ assertEquals("text/html,application/xhtml+xml,application/xml",
headers.get("accept"));
+ assertTrue(headers.containsKey("Accept-Encoding"));
+ assertEquals("gzip,deflate", headers.get("Accept-Encoding"));
+ assertTrue(headers.containsKey("Accept-Language"));
+ assertEquals("en-us,en;q=0.5", headers.get("Accept-Language"));
+ assertFalse(headers.containsKey("test"));
+ factory.close();
+ }
+ }
}
