diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-03-03 19:10:52 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-03-03 19:10:52 +0000 |
| commit | 5060814cddbb3a2edcdc8cc451e81129d0bf3736 (patch) | |
| tree | 04e0e64b6d11b96309bde46ab9ebec0c295fde42 | |
| parent | 180a7eb21bd6aee461e9213174c1824db3d0d6f4 (diff) | |
| download | qpid-python-5060814cddbb3a2edcdc8cc451e81129d0bf3736.tar.gz | |
QPID-5567 : Address review comments
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1573683 13f79535-47bb-0310-9956-ffa450edef68
3 files changed, 3 insertions, 2 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java index dc30892667..1f0d482ed2 100755 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java @@ -325,7 +325,7 @@ public class SecurityManager implements ConfigurationChangeListener public void authoriseCreateConsumer(final Consumer consumer) { - // TODO + // TODO - remove cast to AMQQueue and allow testing of consumption from any MessageSource final AMQQueue queue = (AMQQueue) consumer.getMessageSource(); if(!checkAllPlugins(new AccessCheck() diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java index 6d4a689363..167a505c19 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java @@ -1159,6 +1159,8 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi } _authorizedSubject.getPrincipals().addAll(authorizedSubject.getPrincipals()); + _authorizedSubject.getPrivateCredentials().addAll(authorizedSubject.getPrivateCredentials()); + _authorizedSubject.getPublicCredentials().addAll(authorizedSubject.getPublicCredentials()); } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java index ec6b91f829..fae2dafd82 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java @@ -119,7 +119,6 @@ public class HttpManagementUtil public static void assertManagementAccess(final SecurityManager securityManager, Subject subject, LogActor actor) { - // TODO: We should eliminate SecurityManager.setThreadSubject in favour of Subject.doAs CurrentActor.set(actor); try { |