diff options
| author | Robert Gemmell <robbie@apache.org> | 2010-06-17 16:04:11 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2010-06-17 16:04:11 +0000 |
| commit | c289c16084d7f81d0ab848a9d0e0a024e231b81b (patch) | |
| tree | 666bdef386c9e650966095df61af439bf0cbc2f6 /java | |
| parent | 557c5d9e5d3bea0d199cc508e43dc650c92741b8 (diff) | |
| download | qpid-python-c289c16084d7f81d0ab848a9d0e0a024e231b81b.tar.gz | |
QPID-2665: Remove BROKER from object types for plugins
Applied patch from Andrew Kennedy <andrew.international@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@955654 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
4 files changed, 1 insertions, 16 deletions
diff --git a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java b/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java index c9a476c5f2..ab43653122 100644 --- a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java +++ b/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java @@ -371,7 +371,7 @@ public class SimpleXML extends AbstractPlugin } // Authorise object access - if (objectType == ObjectType.BROKER || objectType == ObjectType.VIRTUALHOST) + if (objectType == ObjectType.VIRTUALHOST) { return principalPermissions.authorise(Permission.ACCESS); } diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java b/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java index 7f3b89b46b..7d0fcfb6cb 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java +++ b/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java @@ -98,8 +98,6 @@ public abstract class AbstractProxyPlugin extends AbstractPlugin { switch (objectType) { - case BROKER: - return accessBroker(instance); case VIRTUALHOST: return accessVirtualhost(instance); } diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java b/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java index 240be9efe7..f18c327692 100755 --- a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java +++ b/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java @@ -300,18 +300,6 @@ public class SecurityManager } }); } - - // TODO not implemented yet, awaiting consensus - public boolean accessBroker(final AMQProtocolSession session) - { - return checkAllPlugins(new AccessCheck() - { - Result allowed(SecurityPlugin plugin) - { - return plugin.access(BROKER, session); - } - }); - } public boolean accessVirtualhost(final String vhostname, final SocketAddress remoteAddress) { diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java index 1fedc8134a..7103b30283 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java +++ b/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java @@ -36,7 +36,6 @@ public enum ObjectType QUEUE(CREATE, DELETE, PURGE, CONSUME), TOPIC(CREATE, DELETE, PURGE, CONSUME), EXCHANGE(ACCESS, CREATE, DELETE, BIND, UNBIND, PUBLISH), - BROKER(ACCESS), LINK, // Not allowed in the Java broker ROUTE, // Not allowed in the Java broker METHOD(Operation.ALL, ACCESS, UPDATE, EXECUTE), |