You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/09/27 13:12:52 UTC
[1/4] qpid-broker-j git commit: QPID-7923: [Java Broker] [ACL] Ensure
that a failure to authorise a method call respects the access control
default.
Repository: qpid-broker-j
Updated Branches:
refs/heads/master f61b8b903 -> d8613a623
QPID-7923: [Java Broker] [ACL] Ensure that a failure to authorise a method call respects the access control default.
Also added the existing COMPONENT property to the match criteria when considering method authorisations.
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/9c44860d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/9c44860d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/9c44860d
Branch: refs/heads/master
Commit: 9c44860df5485f1c45474dbc86793f61effa1077
Parents: f61b8b9
Author: Keith Wall <kw...@apache.org>
Authored: Wed Sep 27 11:35:36 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Sep 27 11:35:55 2017 +0100
----------------------------------------------------------------------
.../config/LegacyAccessControlAdapter.java | 41 ++++++++++++++------
.../config/LegacyAccessControlAdapterTest.java | 12 +++---
2 files changed, 37 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9c44860d/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java
index 34a3d5a..57a7e19 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java
@@ -33,8 +33,10 @@ import static org.apache.qpid.server.security.access.config.ObjectType.QUEUE;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
+import java.util.LinkedList;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
import org.apache.qpid.server.message.MessageDestination;
import org.apache.qpid.server.model.*;
@@ -331,10 +333,6 @@ class LegacyAccessControlAdapter
{
return _accessControl.authorise(LegacyOperation.ACCESS, ObjectType.MANAGEMENT, ObjectProperties.EMPTY);
}
- else if("CONFIGURE".equals(actionName) || "SHUTDOWN".equals(actionName))
- {
- return _accessControl.authorise(LegacyOperation.valueOf(actionName), ObjectType.BROKER, ObjectProperties.EMPTY);
- }
}
else if(categoryClass == Queue.class)
{
@@ -381,7 +379,7 @@ class LegacyAccessControlAdapter
VirtualHost virtualHost = queue.getVirtualHost();
final String virtualHostName = virtualHost.getName();
properties.setName(methodName);
- properties.put(ObjectProperties.Property.COMPONENT, "VirtualHost.Queue");
+ properties.put(ObjectProperties.Property.COMPONENT, buildHierarchicalCategoryName(queue, virtualHost));
properties.put(ObjectProperties.Property.VIRTUALHOST_NAME, virtualHostName);
return _accessControl.authorise(LegacyOperation.UPDATE, METHOD, properties);
}
@@ -411,8 +409,7 @@ class LegacyAccessControlAdapter
}
}
- //TODO: add check for VH#messagePublish
- return Result.DENIED;
+ return invokeResult;
}
private ObjectProperties createObjectPropertiesForMethod(final PermissionedObject permissionedObject,
@@ -424,19 +421,41 @@ class LegacyAccessControlAdapter
if (permissionedObject instanceof ConfiguredObject<?>)
{
ConfiguredObject<?> configuredObject = ((ConfiguredObject) permissionedObject);
- VirtualHost virtualHost = configuredObject.getModel()
- .getAncestor(VirtualHost.class,
- configuredObject.getCategoryClass(),
- configuredObject);
+ Model model = configuredObject.getModel();
+ VirtualHost<?> virtualHost = model.getAncestor(VirtualHost.class, configuredObject);
+
+ final String componentName;
if (virtualHost != null)
{
properties.put(ObjectProperties.Property.VIRTUALHOST_NAME, virtualHost.getName());
+ componentName = buildHierarchicalCategoryName(configuredObject, virtualHost);
}
+ else
+ {
+ componentName = buildHierarchicalCategoryName(configuredObject, model.getAncestor(Broker.class, configuredObject));
+ }
+ properties.put(ObjectProperties.Property.COMPONENT, componentName);
}
return properties;
}
+ private String buildHierarchicalCategoryName(final ConfiguredObject<?> configuredObject, final ConfiguredObject<?> significantAncestor)
+ {
+ LinkedList<String> hierarchicalName = new LinkedList<>();
+
+ ConfiguredObject<?> current = configuredObject;
+ hierarchicalName.add(configuredObject.getCategoryClass().getSimpleName());
+
+ while (current != null && significantAncestor != current)
+ {
+ ConfiguredObject<?> parent = configuredObject.getParent();
+ hierarchicalName.add(0, parent.getCategoryClass().getSimpleName());
+ current = parent;
+ }
+ return hierarchicalName.stream().collect(Collectors.joining("."));
+ }
+
private ObjectProperties createObjectPropertiesForExchangeBind(final Map<String, Object> arguments,
final PermissionedObject configuredObject)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9c44860d/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java
index 1604e05..0efedb7 100644
--- a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java
+++ b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java
@@ -61,22 +61,23 @@ public class LegacyAccessControlAdapterTest extends QpidTestCase
{
super.setUp();
_accessControl = mock(LegacyAccessControl.class);
+ _model = BrokerModel.getInstance();
+ _broker = mock(Broker.class);
+ _virtualHostNode = getMockVirtualHostNode();
_virtualHost = mock(QueueManagingVirtualHost.class);
-
+ when(_virtualHost.getParent()).thenReturn(_broker);
when(_virtualHost.getName()).thenReturn(TEST_VIRTUAL_HOST);
when(_virtualHost.getAttribute(VirtualHost.NAME)).thenReturn(TEST_VIRTUAL_HOST);
- _model = BrokerModel.getInstance();
when(_virtualHost.getModel()).thenReturn(_model);
+ doReturn(_virtualHostNode).when(_virtualHost).getParent();
doReturn(VirtualHost.class).when(_virtualHost).getCategoryClass();
- _broker = mock(Broker.class);
when(_broker.getCategoryClass()).thenReturn(Broker.class);
when(_broker.getName()).thenReturn("My Broker");
when(_broker.getAttribute(Broker.NAME)).thenReturn("My Broker");
when(_broker.getModel()).thenReturn(BrokerModel.getInstance());
- _virtualHostNode = getMockVirtualHostNode();
_adapter = new LegacyAccessControlAdapter(_accessControl, BrokerModel.getInstance());
}
@@ -665,6 +666,7 @@ public class LegacyAccessControlAdapterTest extends QpidTestCase
properties.put(ObjectProperties.Property.NAME, TEST_QUEUE);
properties.put(ObjectProperties.Property.METHOD_NAME, methodName);
properties.put(ObjectProperties.Property.VIRTUALHOST_NAME, _virtualHost.getName());
+ properties.put(ObjectProperties.Property.COMPONENT, "VirtualHost.Queue");
when(_accessControl.authorise(same(LegacyOperation.INVOKE),
same(ObjectType.QUEUE),
@@ -681,10 +683,10 @@ public class LegacyAccessControlAdapterTest extends QpidTestCase
String methodName = "getStatistics";
VirtualHostNode<?> virtualHostNode = _virtualHostNode;
-
ObjectProperties properties = new ObjectProperties();
properties.put(ObjectProperties.Property.NAME, virtualHostNode.getName());
properties.put(ObjectProperties.Property.METHOD_NAME, methodName);
+ properties.put(ObjectProperties.Property.COMPONENT, "Broker.VirtualHostNode");
when(_accessControl.authorise(same(LegacyOperation.INVOKE),
same(ObjectType.VIRTUALHOSTNODE),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[4/4] qpid-broker-j git commit: QPID-7923: [Java Broker] [ACL]
Correct typos in the documentation
Posted by kw...@apache.org.
QPID-7923: [Java Broker] [ACL] Correct typos in the documentation
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/d8613a62
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/d8613a62
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/d8613a62
Branch: refs/heads/master
Commit: d8613a6238a4e9bfb7af4174105a1ce3f7d7a3e2
Parents: 33c5e6a
Author: Keith Wall <kw...@apache.org>
Authored: Wed Sep 27 14:12:04 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Sep 27 14:12:04 2017 +0100
----------------------------------------------------------------------
...a-Broker-Security-AccessControlProviders.xml | 32 ++++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d8613a62/doc/java-broker/src/docbkx/security/Java-Broker-Security-AccessControlProviders.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/security/Java-Broker-Security-AccessControlProviders.xml b/doc/java-broker/src/docbkx/security/Java-Broker-Security-AccessControlProviders.xml
index d5b4ce1..2f7964d 100644
--- a/doc/java-broker/src/docbkx/security/Java-Broker-Security-AccessControlProviders.xml
+++ b/doc/java-broker/src/docbkx/security/Java-Broker-Security-AccessControlProviders.xml
@@ -26,18 +26,18 @@
The Access Control Provider governs the actions that a user may perform.
</para>
<para>There are two points within the hierarchy that enforce access control: the Broker itself and at each Virtual
- Host. When an access decision needs to be made, the nearest control point configure with a provider is consulted
+ Host. When an access decision needs to be made, the nearest control point configured with a provider is consulted
for a decision. The example, when making a decision about the ability to say, consume from, a Queue, if the
Virtual Host is configured with Access Control Provider it is consulted. Unless a decision is made, the decision
is delegated to the Access Control Provider configured at the Broker.
</para>
- <para>Access Control Providers are configured with a list of ACL rules. The rules determine to which object
+ <para>Access Control Providers are configured with a list of ACL rules. The rules determine to which objects
the user has access and what actions the user may perform on those objects. Rules are ordered and are considered
top to bottom. The first matching rule makes the access decision.
</para>
<para>
- ACL rules may be written in terms of group names. A rule written in terms of a group name applies to the user if
- he is a member of that group. Groups information is obtained from the
+ ACL rules may be written in terms of user or group names. A rule written in terms of a group name applies to the
+ user if he is a member of that group. Groups information is obtained from the
<link linkend="Java-Broker-Security-Authentication-Providers">Authentication Providers</link>
and
<link linkend="Java-Broker-Security-Group-Providers">Group Providers</link>. Writing ACL in terms of groups is
@@ -55,7 +55,7 @@
<listitem>
<para><emphasis>RulesBased</emphasis> - a provider that stores the rules-set within
the Broker's or VirtualHost's configuration. When used with HA, the Virtualhost
- rules automatically apply to all nodes participating within the HA group.</para>
+ rules automatically propagated to all nodes participating within the HA group.</para>
</listitem>
<listitem>
<para>
@@ -72,13 +72,13 @@
</title>
<para>
An ACL rule-set is an ordered list of ACL rules.</para>
- <para>An ACL rule comrprises matching criteria that determine if a rule will fire for a given action and a decision
- outcome. If the rule matches the rule makes an access decision outcome. Decision outcomes are final: no regard is given
- to rules that appear later once a decision is made.
+ <para>An ACL rule comprises matching criteria that determines if a rule applies to a situation and a decision
+ outcome. The rule produces an outcome only if the all matching criteria are satisfied.
</para>
- <para>Matching criteria is composed of an ACL object type (e.g. QUEUE), an ACL action (e.g. UPDATE) and other
- properties that further refine if a match is made. These properties restrict the match based on criteria such
- as name or IP address.
+ <para>Matching criteria is composed of an ACL object type (e.g. <literal>QUEUE</literal>), an ACL action
+ (e.g. <literal>UPDATE</literal>) and other properties that further refine if a match is made. These properties
+ restrict the match based on additional criteria such as name or IP address. ACL Object type <literal>ALL</literal>
+ matches any object. Likewise ACL Action <literal>ALL</literal> matches any action.
</para>
<para>Let's look at some examples.</para>
<programlisting>
@@ -86,7 +86,7 @@
ACL DENY bob CREATE QUEUE name="myqueue" # Denies bob permission to create a queue called "myqueue"
</programlisting>
<para>
- As dicussed, ACL rule-set is considered in order with the first matching rule taking precedence over all those
+ As discussed, the ACL rule-set is considered in order with the first matching rule taking precedence over all those
that follow. In the following example, if the user bob tries to create an exchange "myexch", the action
will be allowed by the first rule. The second rule will never be considered.
</para>
@@ -102,10 +102,10 @@
ACL ALLOW bob ALL EXCHANGE
</programlisting>
<para>
- If a rule-set fails to make a decision, the result is configurable. By default, the RulesBased provider defers
- the decision allowing another provider further up the hierarchy to make a decision (i.e. allowing the VirtualHost
- control point to delegate to the Broker). In the case of the ACLFile provider, by default, its rule-sets implicit
- have a rule denying all operations to all users. It is as if the rule-set ends with
+ If a rule-set fails to make a decision, the result is configurable. By default, the <literal>RuleBased</literal>
+ provider defers the decision allowing another provider further up the hierarchy to make a decision (i.e. allowing
+ the VirtualHost control point to delegate to the Broker). In the case of the ACLFile provider, by default, its
+ rule-set implicit have a rule denying all operations to all users. It is as if the rule-set ends with
<literal>ACL DENY ALL ALL</literal>. If no access control provider makes a decision the default is to
deny the action.
</para>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/4] qpid-broker-j git commit: QPID-7923: [Java Broker] [ACL] Mark
Queue#getConsumers and getPublishingLink as not requiring an ACL check.
Posted by kw...@apache.org.
QPID-7923: [Java Broker] [ACL] Mark Queue#getConsumers and getPublishingLink as not requiring an ACL check.
Queue#getConsumers returns information that was available without an explict ACL permission in previous release. This
change avoids breaking compatibility with existing rule-sets.
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/0dad8495
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/0dad8495
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/0dad8495
Branch: refs/heads/master
Commit: 0dad8495a2960c38251b2a393e52922696abd8e4
Parents: 9c44860
Author: Keith Wall <kw...@apache.org>
Authored: Wed Sep 27 11:41:26 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Sep 27 11:42:43 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/qpid/server/model/Queue.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0dad8495/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index e146466..855603e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
@@ -309,12 +309,12 @@ public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>,
mandatory = true)
OverflowPolicy getOverflowPolicy();
- @ManagedOperation(nonModifying = true, changesConfiguredObjectState = false)
+ @ManagedOperation(nonModifying = true, changesConfiguredObjectState = false, skipAclCheck = true)
Collection<PublishingLink> getPublishingLinks();
@Override
- @ManagedOperation(nonModifying = true, changesConfiguredObjectState = false)
+ @ManagedOperation(nonModifying = true, changesConfiguredObjectState = false, skipAclCheck = true)
Collection<QueueConsumer<?,?>> getConsumers();
//operations
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/4] qpid-broker-j git commit: QPID-7928: [Broker] [ACL] Disentangle
uses of #getAccessControl so that authorisation decisions about the
AccessControlProvider itself are governed by the ACL system as a whole.
Posted by kw...@apache.org.
QPID-7928: [Broker] [ACL] Disentangle uses of #getAccessControl so that authorisation decisions about the AccessControlProvider itself are governed by the ACL system as a whole.
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/33c5e6a5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/33c5e6a5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/33c5e6a5
Branch: refs/heads/master
Commit: 33c5e6a55db994c1c6da80ed87af20cc7abce81f
Parents: 0dad849
Author: Keith Wall <kw...@apache.org>
Authored: Wed Sep 27 12:08:39 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Sep 27 14:10:36 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/qpid/server/model/BrokerImpl.java | 2 +-
.../apache/qpid/server/model/CommonAccessControlProvider.java | 3 ++-
.../qpid/server/security/AllowAllAccessControlProviderImpl.java | 2 +-
.../server/security/access/AbstractAccessControlProvider.java | 3 ---
.../org/apache/qpid/server/virtualhost/AbstractVirtualHost.java | 2 +-
.../access/plugins/AbstractLegacyAccessControlProvider.java | 4 +---
6 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/33c5e6a5/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
index 565cc05..7c1f5c9 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
@@ -770,7 +770,7 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
}
else if(prov.getState() == State.ACTIVE)
{
- accessControls.add(prov.getAccessControl());
+ accessControls.add(prov.getControl());
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/33c5e6a5/broker-core/src/main/java/org/apache/qpid/server/model/CommonAccessControlProvider.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/CommonAccessControlProvider.java b/broker-core/src/main/java/org/apache/qpid/server/model/CommonAccessControlProvider.java
index fda513f..f94a808 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/CommonAccessControlProvider.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/CommonAccessControlProvider.java
@@ -50,5 +50,6 @@ public interface CommonAccessControlProvider<X> extends Comparable<X>
String getName();
int getPriority();
- AccessControl getAccessControl();
+
+ AccessControl<?> getControl();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/33c5e6a5/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java
index 455c1a8..a14918d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java
@@ -55,7 +55,7 @@ public class AllowAllAccessControlProviderImpl extends AbstractConfiguredObject<
}
@Override
- public AccessControl getAccessControl()
+ public AccessControl getControl()
{
return AccessControl.ALWAYS_ALLOWED;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/33c5e6a5/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java b/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java
index 5a0db1d..ca0dca2 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java
@@ -69,9 +69,6 @@ public abstract class AbstractAccessControlProvider<X extends AbstractAccessCont
}
@Override
- public abstract AccessControl getAccessControl();
-
- @Override
public int compareTo(final Y o)
{
return ACCESS_CONTROL_PROVIDER_COMPARATOR.compare((Y)this, o);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/33c5e6a5/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index 928a246..c37bc78 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -328,7 +328,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
}
else if(prov.getState() == State.ACTIVE)
{
- accessControls.add(prov.getAccessControl());
+ accessControls.add(prov.getControl());
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/33c5e6a5/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java
index 596bac2..eb7085a 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java
@@ -117,11 +117,9 @@ abstract class AbstractLegacyAccessControlProvider<X extends AbstractLegacyAcces
}
-
@Override
- public final AccessControl getAccessControl()
+ public AccessControl<?> getControl()
{
return _accessControl;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org