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 <[email protected]> Authored: Wed Sep 27 12:08:39 2017 +0100 Committer: Keith Wall <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
