diff options
author | Keith Wall <kwall@apache.org> | 2012-04-27 10:27:33 +0000 |
---|---|---|
committer | Keith Wall <kwall@apache.org> | 2012-04-27 10:27:33 +0000 |
commit | 2b9f9ce817339547ad64ca7b9442ca8105e6e8b3 (patch) | |
tree | 5ce62ac10a5f574ef0879f93d83b43b730d485c5 | |
parent | e569a65e251d8f5d174a2fb6082b5e3573e1619d (diff) | |
download | qpid-python-2b9f9ce817339547ad64ca7b9442ca8105e6e8b3.tar.gz |
QPID-3965: Fix issue with converting ACL content to lower case Applied patch by Oleksandr Rudyy <orudyy@gmail.com>, Phil Harvey <phil@philharveyonline.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1331342 13f79535-47bb-0310-9956-ffa450edef68
3 files changed, 10 insertions, 6 deletions
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java index b299b62538..9a08eb6499 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java @@ -83,7 +83,6 @@ public class PlainConfiguration extends AbstractConfiguration _st.commentChar(COMMENT); // single line comments _st.eolIsSignificant(true); // return EOL as a token - _st.lowerCaseMode(true); // case insensitive tokens _st.ordinaryChar('='); // equals is a token _st.ordinaryChar(CONTINUATION); // continuation character (when followed by EOL) _st.quoteChar('"'); // double quote diff --git a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AccessControlTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AccessControlTest.java index 61e867f459..5db02d10ce 100644 --- a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AccessControlTest.java +++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AccessControlTest.java @@ -68,7 +68,7 @@ public class AccessControlTest extends TestCase private RuleSet createGroupRuleSet() { final RuleSet rs = new RuleSet(); - rs.addGroup("aclGroup1", Arrays.asList(new String[] {"member1", "member2"})); + rs.addGroup("aclGroup1", Arrays.asList(new String[] {"member1", "Member2"})); // Rule expressed with username rs.grant(0, "user1", Permission.ALLOW, Operation.ACCESS, ObjectType.VIRTUALHOST, ObjectProperties.EMPTY); @@ -122,7 +122,12 @@ public class AccessControlTest extends TestCase setUpGroupAccessControl(); SecurityManager.setThreadSubject(TestPrincipalUtils.createTestSubject("member1")); - final Result result = _plugin.authorise(Operation.ACCESS, ObjectType.VIRTUALHOST, ObjectProperties.EMPTY); + Result result = _plugin.authorise(Operation.ACCESS, ObjectType.VIRTUALHOST, ObjectProperties.EMPTY); + assertEquals(Result.ALLOWED, result); + + SecurityManager.setThreadSubject(TestPrincipalUtils.createTestSubject("Member2")); + + result = _plugin.authorise(Operation.ACCESS, ObjectType.VIRTUALHOST, ObjectProperties.EMPTY); assertEquals(Result.ALLOWED, result); } diff --git a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/PlainConfigurationTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/PlainConfigurationTest.java index aa3982df71..25f903e860 100644 --- a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/PlainConfigurationTest.java +++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/PlainConfigurationTest.java @@ -318,17 +318,17 @@ public class PlainConfigurationTest extends TestCase */ public void testMixedCaseRuleInterpretation() throws Exception { - final PlainConfiguration config = writeACLConfig("AcL deny-LOG user1 BiND Exchange name=AmQ.dIrect"); + final PlainConfiguration config = writeACLConfig("AcL deny-LOG User1 BiND Exchange Name=AmQ.dIrect"); final RuleSet rs = config.getConfiguration(); assertEquals(1, rs.getRuleCount()); final Map<Integer, Rule> rules = rs.getAllRules(); assertEquals(1, rules.size()); final Rule rule = rules.get(0); - assertEquals("Rule has unexpected identity", "user1", rule.getIdentity()); + assertEquals("Rule has unexpected identity", "User1", rule.getIdentity()); assertEquals("Rule has unexpected operation", Operation.BIND, rule.getAction().getOperation()); assertEquals("Rule has unexpected operation", ObjectType.EXCHANGE, rule.getAction().getObjectType()); - final ObjectProperties expectedProperties = new ObjectProperties("amq.direct"); + final ObjectProperties expectedProperties = new ObjectProperties("AmQ.dIrect"); assertEquals("Rule has unexpected object properties", expectedProperties, rule.getAction().getProperties()); } |