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

#310 - Allow for topic/patterns with '#' and end of line comments

Browse Source
This commit is contained in:
Gustavo De Micheli
2017-08-23 09:43:51 +02:00
parent c81fab62e6
commit 89174178c6
2 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/spi/impl/security/ACLFileParser.java
+22 -16
View File
@@ -20,6 +20,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.*;
import java.text.ParseException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* Parses the acl configuration file. If a line starts with # it's comment. Blank lines are skipped.
@@ -83,25 +85,29 @@ public final class ACLFileParser {
String line;
AuthorizationsCollector collector = new AuthorizationsCollector();
Pattern emptyLine = Pattern.compile("^\\s*$");
Pattern commentLine = Pattern.compile("^#.*"); // As spec, comment lines should start with '#'
Pattern invalidCommentLine = Pattern.compile("^\\s*#.*");
Pattern endLineComment = Pattern.compile("^([\\w\\s\\/\\+]+#?)(\\s*#.*)$"); // This pattern has a dependency on filtering `commentLine`.
Matcher endLineCommentMatcher;
try {
while ((line = br.readLine()) != null) {
int commentMarker = line.indexOf('#');
if (commentMarker != -1) {
if (commentMarker == 0) {
// skip its a comment
continue;
} else {
// it's a malformed comment
throw new ParseException(line, commentMarker);
}
} else {
if (line.isEmpty() || line.matches("^\\s*$")) {
// skip it's a black line
continue;
}
collector.parse(line);
if (line.isEmpty() || emptyLine.matcher(line).matches() || commentLine.matcher(line).matches()) {
// skip it's a black line or comment
continue;
} else if (invalidCommentLine.matcher(line).matches()) {
// it's a malformed comment
int commentMarker = line.indexOf('#');
throw new ParseException(line, commentMarker);
}
endLineCommentMatcher = endLineComment.matcher(line);
if (endLineCommentMatcher.matches()) {
line = endLineCommentMatcher.group(1);
}
collector.parse(line);
}
} catch (IOException ex) {
throw new ParseException("Failed to read", 1);
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"), "", ""));
}
}