Merge pull request #202 from xjusko/verify_repo_format

[Issue #200]Fixes regex that verifies repository format

Author: xstefank

tyr-core/src/main/java/org/jboss/tyr/model/Utils.java

@@ -50,6 +50,10 @@ public class Utils {
     public static final String MESSAGE = "message";
     public static final String URL = "url";
 
+    //Repository verification regex
+    public static final String REPOSITORY_FORMAT_VERIFICATION_REGEX =
+            "^([a-zA-Z0-9](?:-?[a-zA-Z0-9]){0,38})/[a-zA-Z0-9_.-]{1,100}$";
+
     public static String getConfigDirectory() {
         String path = System.getProperty(TYR_CONFIG_DIR);
         if (path == null) {

tyr-core/src/main/java/org/jboss/tyr/verification/RepositoryFormatVerification.java

@@ -15,13 +15,14 @@
  */
 package org.jboss.tyr.verification;
 
+import org.jboss.tyr.model.Utils;
 import org.jboss.tyr.model.yaml.FormatYaml;
 
 public class RepositoryFormatVerification implements Verification {
 
     @Override
     public void verify(FormatYaml formatYaml) throws InvalidConfigurationException {
-        if (!formatYaml.getRepository().matches("^[a-zA-Z0-9_]*/[a-zA-Z0-9_-]*$"))
+        if (!formatYaml.getRepository().matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX))
             throw new InvalidConfigurationException("Wrong repository format in configuration file");
     }
 }

tyr-core/src/test/java/org/jboss/tyr/verification/VerificationsTest.java

@@ -15,6 +15,7 @@
  */
 package org.jboss.tyr.verification;
 
+import org.jboss.tyr.model.Utils;
 import org.jboss.tyr.model.yaml.FormatYaml;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -47,4 +48,29 @@ public void testReadInvalidFormatConfiguration() {
     public void testNullParameterToVerify() {
         Assertions.assertThrows(NullPointerException.class, () -> VerificationHandler.verifyConfiguration(null));
     }
+    @Test
+    public void testRepositoryFormatVerificationRegex() {
+        //Valid examples
+        Assertions.assertTrue("a/repo".matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertTrue("a/.".matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertTrue("a/_".matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertTrue("a/-".matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertTrue("a-a123/.test.repo.".matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertTrue("a-A-a/_test_repo_".matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertTrue(("a".repeat(39)+"/-Test-repo-123-").matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertTrue(("a/" + "-".repeat(100)).matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+
+        //Invalid username
+        Assertions.assertFalse("-a/test-repo".matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertFalse("/test-repo".matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertFalse("a-/test-repo".matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertFalse("a_a/test-repo".matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertFalse("a.a/test-repo".matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertFalse("a--a/test-repo".matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertFalse(("a".repeat(40) + "/test-repo").matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+
+        //Invalid repository names
+        Assertions.assertFalse(("a/" + ".".repeat(101)).matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+        Assertions.assertFalse("a/".matches(Utils.REPOSITORY_FORMAT_VERIFICATION_REGEX));
+    }
 }