summaryrefslogtreecommitdiff
path: root/qpid/java
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
commite16f7d01e8a9c049dc99a08cd38634f174e2d41a (patch)
tree9beb09e24a9bb49df52a5298711ac1315d1142f5 /qpid/java
parente7e343290d2e47455c9e75e50c2d263046d22bad (diff)
downloadqpid-python-e16f7d01e8a9c049dc99a08cd38634f174e2d41a.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@1360120 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/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/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
index 0787e7ec1d..03ee2e92ee 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
+++ b/qpid/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);