summaryrefslogtreecommitdiff
path: root/java/broker-plugins
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2012-07-11 11:00:14 +0000
committerRobert Gemmell <robbie@apache.org>2012-07-11 11:00:14 +0000
commit77059647d15b2d439164c5a07ff1c04899326aec (patch)
tree4b3d97194faf5d20c02de40c1e909c1c75d67361 /java/broker-plugins
parentbf78e564d54406e7bee38fb31ec217b75aabbcc6 (diff)
downloadqpid-python-77059647d15b2d439164c5a07ff1c04899326aec.tar.gz
QPID-3998, QPID-3999: get the user name from HttpServletRequest#getRemoteUser() in SaslServlet
Applied patch from Oleksandr Rudyy <orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1360120 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-plugins')
-rw-r--r--java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
index 0787e7ec1d..03ee2e92ee 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
+++ b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
@@ -91,6 +91,10 @@ public class SaslServlet extends AbstractServlet
final Principal principal = subject.getPrincipals().iterator().next();
outputObject.put("user", principal.getName());
}
+ else if (request.getRemoteUser() != null)
+ {
+ outputObject.put("user", request.getRemoteUser());
+ }
outputObject.put("mechanisms", (Object) mechanisms);