anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #340 from nMoncho/ACL_COMMENTS

Browse Source 
#310 - Allow for topic/patterns with '#' and end of line comments
This commit is contained in:
Andrea Selva
2017-08-23 10:02:29 +02:00
committed by GitHub
parent d6aca1d2a1 89174178c6
commit ed87abaaaa
2 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/test/java/io/moquette/spi/impl/security/ACLFileParserTest.java
+34 -2
View File
@@ -44,9 +44,12 @@ public class ACLFileParserTest {
}
@Test(expected = ParseException.class)
public void testParseInvalidComment() throws ParseException {
public void testParseInvalidPaddedComment() throws ParseException {
Reader conf = new StringReader(" #simple comment");
ACLFileParser.parse(conf);
AuthorizationsCollector authorizations = ACLFileParser.parse(conf);
// Verify
assertTrue(authorizations.isEmpty());
}
@Test
@@ -59,4 +62,33 @@ public class ACLFileParserTest {
assertTrue(authorizations.canWrite(new Topic("/weather/italy/anemometer"), "", ""));
}
@Test
public void testParseValidEndLineComment() throws ParseException {
Reader conf = new StringReader("topic /weather/italy/anemometer #simple comment");
AuthorizationsCollector authorizations = ACLFileParser.parse(conf);
// Verify
assertTrue(authorizations.canRead(new Topic("/weather/italy/anemometer"), "", ""));
assertTrue(authorizations.canWrite(new Topic("/weather/italy/anemometer"), "", ""));
}
@Test
public void testParseValidPoundTopicWithEndLineComment() throws ParseException {
Reader conf = new StringReader("topic /weather/italy/anemometer/# #simple comment");
AuthorizationsCollector authorizations = ACLFileParser.parse(conf);
// Verify
assertTrue(authorizations.canRead(new Topic("/weather/italy/anemometer/#"), "", ""));
assertTrue(authorizations.canWrite(new Topic("/weather/italy/anemometer/#"), "", ""));
}
@Test
public void testParseValidPlusTopicWithEndLineComment() throws ParseException {
Reader conf = new StringReader("topic /weather/+/anemometer #simple comment");
AuthorizationsCollector authorizations = ACLFileParser.parse(conf);
// Verify
assertTrue(authorizations.canRead(new Topic("/weather/+/anemometer"), "", ""));
assertTrue(authorizations.canWrite(new Topic("/weather/+/anemometer"), "", ""));
}
}