Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AMQ-8043] Do not override JMSXUserID when message comes across network connector 

(cherry picked from commit bec734a133)
This commit is contained in:
Matt Pavlovich 2021-12-24 10:37:17 -06:00 committed by Jean-Baptiste Onofré
parent ec6db10c7e
commit 7295bd85a5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-broker/src/main/java/org/apache/activemq/broker/UserIDBroker.java
View File

@ -37,6 +37,10 @@ public class UserIDBroker extends BrokerFilter {
public void send(ProducerBrokerExchange producerExchange, Message messageSend) throws Exception { public void send(ProducerBrokerExchange producerExchange, Message messageSend) throws Exception {
final ConnectionContext context = producerExchange.getConnectionContext(); final ConnectionContext context = producerExchange.getConnectionContext();
if(context.isNetworkConnection() && messageSend.getUserID() != null) {
super.send(producerExchange, messageSend);
return;
}
String userID = context.getUserName(); String userID = context.getUserName();
if (isUseAuthenticatePrincipal()) { if (isUseAuthenticatePrincipal()) {
SecurityContext securityContext = context.getSecurityContext(); SecurityContext securityContext = context.getSecurityContext();