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/05/18 06:09:57 UTC
[3/3] qpid-broker-j git commit: QPID-7345: Remove support for ACL
checking based on the "immediate" flag
QPID-7345: Remove support for ACL checking based on the "immediate" flag
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/fcd9134e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/fcd9134e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/fcd9134e
Branch: refs/heads/master
Commit: fcd9134e665e2814a3d729a2440877e697b9879b
Parents: 62d6ad7
Author: Keith Wall <ke...@gmail.com>
Authored: Wed May 10 22:53:32 2017 +0100
Committer: Keith Wall <ke...@gmail.com>
Committed: Wed May 17 22:38:25 2017 +0100
----------------------------------------------------------------------
.../security/access/config/LegacyAccessControlAdapter.java | 6 +++---
.../qpid/server/security/access/config/ObjectProperties.java | 8 +-------
.../access/config/LegacyAccessControlAdapterTest.java | 4 +---
3 files changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fcd9134e/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 88636f4..2d764c9 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
@@ -329,7 +329,7 @@ class LegacyAccessControlAdapter
{
final ObjectProperties _props =
- new ObjectProperties(exchange.getAddressSpace().getName(), exchange.getName(), (String)arguments.get("routingKey"), (Boolean)arguments.get("immediate"));
+ new ObjectProperties(exchange.getAddressSpace().getName(), exchange.getName(), (String)arguments.get("routingKey"));
return _accessControl.authorise(PUBLISH, EXCHANGE, _props);
}
}
@@ -361,7 +361,7 @@ class LegacyAccessControlAdapter
{
final ObjectProperties _props =
- new ObjectProperties(queue.getParent().getName(), "", queue.getName(), (Boolean)arguments.get("immediate"));
+ new ObjectProperties(queue.getParent().getName(), "", queue.getName());
return _accessControl.authorise(PUBLISH, EXCHANGE, _props);
}
}
@@ -398,7 +398,7 @@ class LegacyAccessControlAdapter
{
final ObjectProperties _props =
- new ObjectProperties(queue.getParent().getName(), "", queue.getName(), (Boolean)arguments.get("immediate"));
+ new ObjectProperties(queue.getParent().getName(), "", queue.getName());
return _accessControl.authorise(PUBLISH, EXCHANGE, _props);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fcd9134e/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ObjectProperties.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ObjectProperties.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ObjectProperties.java
index 7c0fec2..6b01409 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ObjectProperties.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ObjectProperties.java
@@ -48,7 +48,6 @@ public class ObjectProperties
OWNER,
TYPE,
ALTERNATE,
- IMMEDIATE,
DURABLE,
EXCLUSIVE,
TEMPORARY,
@@ -88,10 +87,6 @@ public class ObjectProperties
}
else
{
- if(property == IMMEDIATE)
- {
- LOGGER.warn("ACL rules which depend on the value of the 'immediate' flag are deprecated, and will be removed in the next release");
- }
return property;
}
}
@@ -129,14 +124,13 @@ public class ObjectProperties
}
- public ObjectProperties(String virtualHostName, String exchangeName, String routingKey, Boolean immediate)
+ public ObjectProperties(String virtualHostName, String exchangeName, String routingKey)
{
super();
setName(exchangeName);
put(Property.ROUTING_KEY, routingKey);
- put(Property.IMMEDIATE, immediate);
put(Property.VIRTUALHOST_NAME, virtualHostName);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fcd9134e/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 734a837..648154e 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
@@ -743,8 +743,7 @@ public class LegacyAccessControlAdapterTest extends QpidTestCase
{
String routingKey = "routingKey";
String exchangeName = "exchangeName";
- boolean immediate = true;
- ObjectProperties properties = new ObjectProperties(TEST_VIRTUAL_HOST, exchangeName, routingKey, immediate);
+ ObjectProperties properties = new ObjectProperties(TEST_VIRTUAL_HOST, exchangeName, routingKey);
Exchange exchange = mock(Exchange.class);
when(exchange.getCategoryClass()).thenReturn(Exchange.class);
@@ -752,7 +751,6 @@ public class LegacyAccessControlAdapterTest extends QpidTestCase
when(exchange.getName()).thenReturn(exchangeName);
Map<String,Object> args = new HashMap<>();
args.put("routingKey",routingKey);
- args.put("immediate", true);
_adapter.authoriseAction(exchange, "publish", args);
verify(_accessControl).authorise(eq(LegacyOperation.PUBLISH), eq(ObjectType.EXCHANGE), eq(properties));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org