You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/04/29 17:39:20 UTC
svn commit: r1477155 - in /qpid/trunk/qpid/java:
broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
Author: robbie
Date: Mon Apr 29 15:39:20 2013
New Revision: 1477155
URL: http://svn.apache.org/r1477155
Log:
QPID-4753: set vhost SecurityManager _managementMode boolean to equal the parent/broker SecurityManager, validate the ACL file during onCreate to ensure it is usable before allowing it to be added
Modified:
qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java?rev=1477155&r1=1477154&r2=1477155&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java Mon Apr 29 15:39:20 2013
@@ -91,13 +91,16 @@ public class DefaultAccessControl implem
@Override
public void onCreate()
{
- //verify file exists
if(_aclFile != null)
{
+ //verify it exists
if (!_aclFile.exists())
{
throw new IllegalConfigurationException("ACL file '" + _aclFile + "' is not found");
}
+
+ //verify it is parsable
+ new PlainConfiguration(_aclFile).load();
}
}
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=1477155&r1=1477154&r2=1477155&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 Mon Apr 29 15:39:20 2013
@@ -137,6 +137,8 @@ public class SecurityManager implements
*/
public SecurityManager(SecurityManager parent, String aclFile, String vhostName)
{
+ _managementMode = parent._managementMode;
+
if(!_managementMode)
{
configureVirtualHostAclPlugin(aclFile, vhostName);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org