qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject svn commit: r955654 - in /qpid/trunk/qpid/java: broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/ broker/src/main/java/org/apache/qpid/server/security/ broker/src/main/java/org/apache/qpid/server/security/access/
Date Thu, 17 Jun 2010 16:04:12 GMT
Author: robbie
Date: Thu Jun 17 16:04:11 2010
New Revision: 955654

URL: http://svn.apache.org/viewvc?rev=955654&view=rev
Log:
QPID-2665: Remove BROKER from object types for plugins

Applied patch from Andrew Kennedy <andrew.international@gmail.com>

Modified:
    qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java

Modified: qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java?rev=955654&r1=955653&r2=955654&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
(original)
+++ qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
Thu Jun 17 16:04:11 2010
@@ -371,7 +371,7 @@ public class SimpleXML extends AbstractP
         }
         
         // Authorise object access
-        if (objectType == ObjectType.BROKER || objectType == ObjectType.VIRTUALHOST)
+        if (objectType == ObjectType.VIRTUALHOST)
         {
             return principalPermissions.authorise(Permission.ACCESS);
         }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java?rev=955654&r1=955653&r2=955654&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java
Thu Jun 17 16:04:11 2010
@@ -98,8 +98,6 @@ public abstract class AbstractProxyPlugi
     {
         switch (objectType)
         {
-			case BROKER:
-				return accessBroker(instance);
 			case VIRTUALHOST:
 				return accessVirtualhost(instance);
         }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java?rev=955654&r1=955653&r2=955654&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
Thu Jun 17 16:04:11 2010
@@ -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)
     {

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java?rev=955654&r1=955653&r2=955654&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
Thu Jun 17 16:04:11 2010
@@ -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),



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message