diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-07-13 08:50:08 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-07-13 08:50:08 +0000 |
| commit | c4b63720bf002c3cad415b0f0efe9c976bd476c4 (patch) | |
| tree | b49dd5ecd19d7c7207df78de9a99bbb4e55501b0 | |
| parent | 6b1ddb63bad1038951136ad1b43c210d5664f749 (diff) | |
| download | qpid-python-c4b63720bf002c3cad415b0f0efe9c976bd476c4.tar.gz | |
QPID-3998, QPID-3999: get the user name from HttpServletRequest#getRemoteUser() in SaslServlet
Applied patch from Oleksandr Rudyy <orudyy@gmail.com>
Merged from trunk r1360120
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1361105 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java | 4 |
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); |