You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/12/13 15:49:27 UTC
svn commit: r1774041 - in /qpid/java/branches/6.1.x: ./
broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java
Author: lquack
Date: Tue Dec 13 15:49:26 2016
New Revision: 1774041
URL: http://svn.apache.org/viewvc?rev=1774041&view=rev
Log:
QPID-7549: [Java Broker] Cache authentication results on http path in addition to amqp
merged from trunk using
svn merge -c r1774039 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 15:49:26 2016
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772241,1773057
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772241,1773057,1774039
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java?rev=1774041&r1=1774040&r2=1774041&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java (original)
+++ qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java Tue Dec 13 15:49:26 2016
@@ -38,8 +38,8 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.connection.ConnectionPrincipal;
import org.apache.qpid.server.security.auth.AuthenticationResult;
+import org.apache.qpid.server.security.auth.SocketConnectionPrincipal;
public class AuthenticationResultCacher
{
@@ -113,10 +113,10 @@ public class AuthenticationResultCacher
MessageDigest md = MessageDigest.getInstance("SHA-256");
Subject subject = Subject.getSubject(AccessController.getContext());
- Set<ConnectionPrincipal> connectionPrincipals = subject.getPrincipals(ConnectionPrincipal.class);
+ Set<SocketConnectionPrincipal> connectionPrincipals = subject.getPrincipals(SocketConnectionPrincipal.class);
if (connectionPrincipals != null && !connectionPrincipals.isEmpty())
{
- ConnectionPrincipal connectionPrincipal = connectionPrincipals.iterator().next();
+ SocketConnectionPrincipal connectionPrincipal = connectionPrincipals.iterator().next();
md.update(connectionPrincipal.getRemoteAddress().toString().getBytes(UTF8));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org