WFCORE-7083 ModuleNameValidator fails if module name contains a dash

wildfly · Dec 5, 2024 · 01b5aac · 01b5aac
1 parent a62fb1c
commit 01b5aac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...ller/src/main/java/org/jboss/as/controller/operations/validation/ModuleNameValidator.java b/...ller/src/main/java/org/jboss/as/controller/operations/validation/ModuleNameValidator.java
@@ -20,7 +20,7 @@
 public class ModuleNameValidator extends ModelTypeValidator {
     public static final ParameterValidator INSTANCE = new ModuleNameValidator();
     // Ensure module name is valid with filesystem module repository, permitting deprecated slot, if present
-    private static final Predicate<String> MODULE_NAME_TESTER = Pattern.compile("(?:^\\w+|\\w+\\.\\w+|\\w+\\Q\\:\\E\\w+)+(?:\\:(?:\\w+|\\w+\\.\\w+))?$").asMatchPredicate();
+    private static final Predicate<String> MODULE_NAME_TESTER = Pattern.compile("(?:^\\w+|\\w+[\\.\\-]\\w+|\\w+\\Q\\:\\E\\w+)+(?:\\:(?:\\w+|\\w+[\\.\\-]\\w+))?$").asMatchPredicate();
 
     private ModuleNameValidator() {
         super(ModelType.STRING);

diff --git a/...c/test/java/org/jboss/as/controller/operation/validation/ModuleNameValidatorTestCase.java b/...c/test/java/org/jboss/as/controller/operation/validation/ModuleNameValidatorTestCase.java
@@ -25,6 +25,7 @@ public void test() throws OperationFailedException {
         validator.validateParameter("valid", new ModelNode("org.jboss.modules:main"));
         validator.validateParameter("valid", new ModelNode("org.jboss.modules:1.9"));
         validator.validateParameter("escaped", new ModelNode("org.jboss.modules.foo\\:bar:main"));
+        validator.validateParameter("dash", new ModelNode("org.infinispan.hibernate-cache"));
 
         Assert.assertThrows(OperationFailedException.class, () -> validator.validateParameter("invalid", new ModelNode(".foo.bar")));
         Assert.assertThrows(OperationFailedException.class, () -> validator.validateParameter("invalid", new ModelNode("foo..bar")));