Author: kwall
Date: Thu Feb 2 22:26:50 2012
New Revision: 1239889
URL: http://svn.apache.org/viewvc?rev=1239889&view=rev
Log:
QPID-3805: Remove allow-all/deny-all security plugins from Java Broker.
Remove allow-all/deny-all security plugins as equivilent functionality is
offerred by the ACL plugin.
Removed:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java
Modified:
qpid/trunk/qpid/doc/book/src/Security-Plugins.xml
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
Modified: qpid/trunk/qpid/doc/book/src/Security-Plugins.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Security-Plugins.xml?rev=1239889&r1=1239888&r2=1239889&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Security-Plugins.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Security-Plugins.xml Thu Feb 2 22:26:50 2012
@@ -608,17 +608,4 @@ if (!_vhost.getSecurityManager().accessO
</section>
</section>
</section>
- <section role="h2" label="SPD-Other-Security-Plugins">
- <title>Other Security Plugins</title>
- <para>
- There are two basic plugins provided internally by the
broker, which can be
- found in the
<code>org.apache.qpid.server.security.access.plugins</code> package.
- These are <code>AllowAll</code> and
<code>DenyAll</code>. The <code>LegacyAccess</code>
- plugin is not normally required, and simply ignores
legacy elements of the configuration
- file. The other two plugins are activated by the
presence of an element in the
- <code><security /></code> section of the
configuration or virtual hosts XML
- files. To deny all access by default, add the empty
<code><deny-all /></code>
- element, and to allow all access, add
<code><allow-all /></code>.
- </para>
- </section>
</section>
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java?rev=1239889&r1=1239888&r2=1239889&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
Thu Feb 2 22:26:50 2012
@@ -39,8 +39,6 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.exchange.ExchangeType;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.SecurityPluginFactory;
-import org.apache.qpid.server.security.access.plugins.AllowAll;
-import org.apache.qpid.server.security.access.plugins.DenyAll;
import org.apache.qpid.server.security.access.plugins.LegacyAccess;
import
org.apache.qpid.server.security.auth.manager.AuthenticationManagerPluginFactory;
import
org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;
@@ -147,16 +145,13 @@ public class PluginManager implements Cl
{
// Store all non-OSGi plugins
// A little gross that we have to add them here, but not all the
plugins are OSGIfied
- for (SecurityPluginFactory<?> pluginFactory : Arrays.asList(
- AllowAll.FACTORY, DenyAll.FACTORY, LegacyAccess.FACTORY))
+ for (SecurityPluginFactory<?> pluginFactory :
Arrays.asList(LegacyAccess.FACTORY))
{
_securityPlugins.put(pluginFactory.getPluginName(), pluginFactory);
}
for (ConfigurationPluginFactory configFactory : Arrays.asList(
TopicConfiguration.FACTORY,
SecurityManager.SecurityConfiguration.FACTORY,
- AllowAll.AllowAllConfiguration.FACTORY,
- DenyAll.DenyAllConfiguration.FACTORY,
LegacyAccess.LegacyAccessConfiguration.FACTORY,
new SlowConsumerDetectionConfigurationFactory(),
new SlowConsumerDetectionPolicyConfigurationFactory(),
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java?rev=1239889&r1=1239888&r2=1239889&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
Thu Feb 2 22:26:50 2012
@@ -28,7 +28,9 @@ import org.apache.qpid.server.security.S
import java.util.Arrays;
import java.util.List;
-/** Always Abstain. */
+/**
+ * The <code>LegacyAccess</code> plugin is used internally and simply ignores
legacy elements of the configuration file.
+ */
public class LegacyAccess extends BasicPlugin
{
public static class LegacyAccessConfiguration extends ConfigurationPlugin {
@@ -36,9 +38,7 @@ public class LegacyAccess extends BasicP
{
public List<String> getParentPaths()
{
- return Arrays.asList("security.jmx",
"virtualhosts.virtualhost.security.jmx",
- "security.msg-auth",
"virtualhosts.virtualhost.security.msg-auth",
- "security.principal-databases",
"virtualhosts.virtualhost.security.principal-databases");
+ return Arrays.asList("security.msg-auth",
"virtualhosts.virtualhost.security.msg-auth");
}
public ConfigurationPlugin newInstance(String path, Configuration
config) throws ConfigurationException
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
