Author: robbie
Date: Tue Apr 30 11:57:14 2013
New Revision: 1477577
URL: http://svn.apache.org/r1477577
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
merged from trunk r1477155
Modified:
qpid/branches/0.22/qpid/java/ (props changed)
qpid/branches/0.22/qpid/java/broker/ (props changed)
qpid/branches/0.22/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
Propchange: qpid/branches/0.22/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1477155
Propchange: qpid/branches/0.22/qpid/java/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker:r1477155
Modified:
qpid/branches/0.22/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/branches/0.22/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java?rev=1477577&r1=1477576&r2=1477577&view=diff
==============================================================================
---
qpid/branches/0.22/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
(original)
+++
qpid/branches/0.22/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
Tue Apr 30 11:57:14 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/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java?rev=1477577&r1=1477576&r2=1477577&view=diff
==============================================================================
---
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
(original)
+++
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
Tue Apr 30 11:57:14 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: [email protected]
For additional commands, e-mail: [email protected]
