[
https://issues.apache.org/jira/browse/ARTEMIS-3915?focusedWorklogId=982962&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-982962
]
ASF GitHub Bot logged work on ARTEMIS-3915:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 12/Sep/25 15:20
Start Date: 12/Sep/25 15:20
Worklog Time Spent: 10m
Work Description: jbertram commented on code in PR #5908:
URL: https://github.com/apache/activemq-artemis/pull/5908#discussion_r2344590083
##########
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java:
##########
@@ -525,13 +530,13 @@ private static int parseDefaultVariable(String
variableName, int defaultValue) {
allowableConnectorKeys.add(TransportConstants.NIO_REMOTING_THREADS_PROPNAME);
allowableConnectorKeys.add(TransportConstants.REMOTING_THREADS_PROPNAME);
allowableConnectorKeys.add(TransportConstants.BATCH_DELAY);
- allowableConnectorKeys.add(TransportConstants.PROXY_ENABLED_PROP_NAME);
- allowableConnectorKeys.add(TransportConstants.PROXY_HOST_PROP_NAME);
- allowableConnectorKeys.add(TransportConstants.PROXY_PORT_PROP_NAME);
+ allowableConnectorKeys.add(TransportConstants.SOCKS_ENABLED_PROP_NAME);
+ allowableConnectorKeys.add(TransportConstants.SOCKS_HOST_PROP_NAME);
+ allowableConnectorKeys.add(TransportConstants.SOCKS_PORT_PROP_NAME);
allowableConnectorKeys.add(TransportConstants.PROXY_VERSION_PROP_NAME);
- allowableConnectorKeys.add(TransportConstants.PROXY_USERNAME_PROP_NAME);
- allowableConnectorKeys.add(TransportConstants.PROXY_PASSWORD_PROP_NAME);
-
allowableConnectorKeys.add(TransportConstants.PROXY_REMOTE_DNS_PROP_NAME);
+ allowableConnectorKeys.add(TransportConstants.SOCKS_USERNAME_PROP_NAME);
Review Comment:
Not sure how I missed that before. Fixed now.
##########
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConnectionField.java:
##########
@@ -29,7 +29,9 @@ public enum ConnectionField {
LOCAL_ADDRESS("localAddress"),
SESSION_ID("sessionID"),
CREATION_TIME("creationTime"),
- IMPLEMENTATION("implementation");
+ IMPLEMENTATION("implementation"),
+ PROXY_ADDRESS("proxyAddress"),
+ PROXY_VERSION("proxyVersion");
Review Comment:
Done.
##########
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConnectionView.java:
##########
@@ -65,7 +66,9 @@ public JsonObjectBuilder toJson(RemotingConnection
connection) {
.add(ConnectionField.PROTOCOL.getName(),
toString(connection.getProtocolName()))
.add(ConnectionField.CLIENT_ID.getName(),
toString(connection.getClientID()))
.add(ConnectionField.LOCAL_ADDRESS.getName(),
toString(connection.getTransportLocalAddress()))
- .add(ConnectionField.SESSION_COUNT.getName(), sessions.size());
+ .add(ConnectionField.SESSION_COUNT.getName(), sessions.size())
+ .add(ConnectionField.PROXY_ADDRESS.getName(),
toString(NettyServerConnection.getProxyAddress(connection.getTransportConnection())))
+ .add(ConnectionField.PROXY_VERSION.getName(),
toString(NettyServerConnection.getProxyVersion(connection.getTransportConnection())));
Review Comment:
Done.
Issue Time Tracking
-------------------
Worklog Id: (was: 982962)
Time Spent: 8h 40m (was: 8.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: 8h 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
