More test cases for bad formatting

NationalSecurityAgency · Jul 31, 2024 · 9773d7b · 9773d7b
1 parent ffcc64f
commit 9773d7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/emissary/output/filter/AbstractFilter.java b/src/main/java/emissary/output/filter/AbstractFilter.java
@@ -178,12 +178,11 @@ protected void initializeOutputTypes(@Nullable final Configurator config) {
     }
 
     protected void initializeDenylist(final Configurator config) {
-        Pattern charSet = Pattern.compile("^[\\w*]+[\\w*.]*[\\w*]+$"); // Match if acceptable characters are in correct order
-        Pattern repeatedPeriods = Pattern.compile("\\.\\."); // Match if any sequential `.` characters
+        Pattern charSetOrdering = Pattern.compile("^[\\w*]+(\\.[\\w*]+)*$"); // Match if acceptable characters are in correct order
         Pattern viewNameFormat = Pattern.compile("^\\w+(\\.\\w+)?\\*?$"); // Match if String is word sequence with optional `*` suffix
 
         for (String entry : config.findEntriesAsSet("DENYLIST")) {
-            if (charSet.matcher(entry).matches() && !repeatedPeriods.matcher(entry).matches()) {
+            if (charSetOrdering.matcher(entry).matches()) {
                 String viewName = validateAndRemoveDenylistFiletype(entry);
 
                 if (viewName.chars().filter(ch -> ch == '.').count() > 0) {

diff --git a/src/test/java/emissary/output/filter/AbstractFilterTest.java b/src/test/java/emissary/output/filter/AbstractFilterTest.java
@@ -55,7 +55,8 @@ void testIncorrectConfigs() {
                 "type*.*view", "*type.*view", "ty*pe.*view", "*.*view", ".*view", "*view",
                 "type*.vi*ew", "*type.vi*ew", "ty*pe.vi*ew", "*.vi*ew", ".vi*ew", "vi*ew",
                 "type*.view*", "*type.view*", "ty*pe.view*", "*.view*", ".view*",
-                "type.", "*", "type.*", ".", "type.view.", ".type.view", ".type.view.");
+                "type.", "*", "type.*", ".", "type.view.", ".type.view", ".type.view.",
+                "type..view", "type.view.view.view", "type.view*.view*", "type.view**", "view**");
         for (String entry : invalidEntries) {
             final Configurator config = new ServiceConfigGuide();
             config.addEntry("DENYLIST", entry);