[
https://issues.apache.org/jira/browse/ARTEMIS-3915?focusedWorklogId=982260&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-982260
]
ASF GitHub Bot logged work on ARTEMIS-3915:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 08/Sep/25 11:28
Start Date: 08/Sep/25 11:28
Worklog Time Spent: 10m
Work Description: brusdev commented on code in PR #5908:
URL: https://github.com/apache/activemq-artemis/pull/5908#discussion_r2329957797
##########
artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyServerConnection.java:
##########
@@ -51,4 +58,55 @@ public void setSNIHostname(String sniHostname) {
public String getRouter() {
return router;
}
+
+ /**
+ * {@return a string representation of the remote address of this
connection; if this connection was made via the
+ * proxy protocol then this will be the original address, not the proxy
address}
+ */
+ @Override
+ public String getRemoteAddress() {
+ String proxyProtocolSourceAddress =
channel.attr(PROXY_PROTOCOL_SOURCE_ADDRESS).get();
+ String proxyProtocolSourcePort =
channel.attr(PROXY_PROTOCOL_SOURCE_PORT).get();
+ if (proxyProtocolSourceAddress != null &&
!proxyProtocolSourceAddress.isEmpty() && proxyProtocolSourcePort != null &&
!proxyProtocolSourcePort.isEmpty()) {
+ return proxyProtocolSourceAddress + ":" + proxyProtocolSourcePort;
+ } else {
Review Comment:
The method `getProxyAddress` could avoid code duplication, i.e.
```suggestion
String result = getProxyAddress();
if (result != null) {
return result;
} else {
```
##########
artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java:
##########
@@ -147,11 +156,26 @@ public void channelInactive(ChannelHandlerContext ctx)
throws Exception {
timeoutFuture.cancel(true);
timeoutFuture = null;
}
+ if (proxyAttributesSet) {
+ ctx.channel().attr(PROXY_PROTOCOL_SOURCE_ADDRESS).remove();
+ ctx.channel().attr(PROXY_PROTOCOL_SOURCE_PORT).remove();
+ ctx.channel().attr(PROXY_PROTOCOL_DESTINATION_ADDRESS).remove();
+ ctx.channel().attr(PROXY_PROTOCOL_DESTINATION_PORT).remove();
+ ctx.channel().attr(PROXY_PROTOCOL_VERSION).remove();
+ }
}
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws
Exception {
- if (msg instanceof FullHttpRequest httpRequest) {
+ if (msg instanceof HAProxyMessage haProxyMessage) {
+
ctx.channel().attr(PROXY_PROTOCOL_SOURCE_ADDRESS).set(haProxyMessage.sourceAddress());
+
ctx.channel().attr(PROXY_PROTOCOL_SOURCE_PORT).set(Integer.toString(haProxyMessage.sourcePort()));
+
ctx.channel().attr(PROXY_PROTOCOL_DESTINATION_ADDRESS).set(haProxyMessage.destinationAddress());
+
ctx.channel().attr(PROXY_PROTOCOL_DESTINATION_PORT).set(Integer.toString(haProxyMessage.destinationPort()));
+
ctx.channel().attr(PROXY_PROTOCOL_VERSION).set(haProxyMessage.protocolVersion().toString());
+ proxyAttributesSet = true;
+ skipProxyBytes = true;
+ } else if (msg instanceof FullHttpRequest httpRequest) {
Review Comment:
Should `skipProxyBytes` be false for `FullHttpRequest`?
Issue Time Tracking
-------------------
Worklog Id: (was: 982260)
Time Spent: 2h 40m (was: 2.5h)
> Support PROXY Protocol
> ----------------------
>
> Key: ARTEMIS-3915
> URL: https://issues.apache.org/jira/browse/ARTEMIS-3915
> Project: ActiveMQ Artemis
> Issue Type: Improvement
> Components: Broker
> Reporter: João Santos
> Assignee: Justin Bertram
> Priority: Major
> Labels: pull-request-available
> Time Spent: 2h 40m
> Remaining Estimate: 0h
>
> [HAProxy|http://www.haproxy.org/] is a widely known and used TCP Load
> Balancer and especially useful for an ActiveMQ Artemis clustered environment.
> Although possible to functionally implement with both products current
> features, Artemis does not support the PROXY protocol, which prevents it's
> broker nodes from inferring the real remote client IP address when behind an
> HAProxy instance.
> Since Netty sockets implementation already seems to support this protocol
> (discussed w/ [~jbertram] on DEV mailing list), it shouldn't be a big leap to
> adding support for the protocol on Artemis acceptors, thus improving the
> deployment of the use case at hand.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
