Author: robbie
Date: Fri Jul 13 08:50:08 2012
New Revision: 1361105
URL: http://svn.apache.org/viewvc?rev=1361105&view=rev
Log:
QPID-3998, QPID-3999: get the user name from HttpServletRequest#getRemoteUser()
in SaslServlet
Applied patch from Oleksandr Rudyy <oru...@gmail.com>
Merged from trunk r1360120
Modified:
qpid/branches/0.18/qpid/java/ (props changed)
qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
Propchange: qpid/branches/0.18/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1360120
Modified:
qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java?rev=1361105&r1=1361104&r2=1361105&view=diff
==============================================================================
---
qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
(original)
+++
qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
Fri Jul 13 08:50:08 2012
@@ -91,6 +91,10 @@ public class SaslServlet extends Abstrac
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
