From bb3e417a58861f96c0303ecf12b2cc9321cb018e Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 10 May 2012 18:53:56 +0200
Subject: [PATCH] improve validation of repository name

---
 .../java/sonia/scm/util/ValidationUtil.java    |  9 ++++++---
 .../sonia/scm/util/ValidationUtilTest.java     | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/util/ValidationUtil.java b/scm-core/src/main/java/sonia/scm/util/ValidationUtil.java
index c46bdc7432..42695421eb 100644
--- a/scm-core/src/main/java/sonia/scm/util/ValidationUtil.java
+++ b/scm-core/src/main/java/sonia/scm/util/ValidationUtil.java
@@ -52,10 +52,12 @@ public class ValidationUtil
   private static final String REGEX_NAME = "^[A-z0-9\\.\\-_]+$";
 
   /** Field description */
-  private static final String REGEX_REPOSITORYNAME = "^[A-z0-9\\.\\-_/]+$";
+  private static final String REGEX_REPOSITORYNAME =
+    "^[A-z0-9][A-z0-9\\.\\-_/]*$";
 
   /** Field description */
-  private static final String REGEX_USERNAME = "^[A-z0-9\\.\\-_@]|[^ ]([A-z0-9\\.\\-_@ ]*[A-z0-9\\.\\-_@]|[^ ])?$";
+  private static final String REGEX_USERNAME =
+    "^[A-z0-9\\.\\-_@]|[^ ]([A-z0-9\\.\\-_@ ]*[A-z0-9\\.\\-_@]|[^ ])?$";
 
   //~--- get methods ----------------------------------------------------------
 
@@ -139,7 +141,8 @@ public class ValidationUtil
    */
   public static boolean isRepositoryNameValid(String name)
   {
-    return Util.isNotEmpty(name) && name.matches(REGEX_REPOSITORYNAME);
+    return Util.isNotEmpty(name) && name.matches(REGEX_REPOSITORYNAME)
+           &&!name.contains("..") &&!name.endsWith("/.") &&!name.endsWith(".");
   }
 
   /**
diff --git a/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java b/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java
index b29ed007ce..00b8f7574a 100644
--- a/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java
+++ b/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java
@@ -130,6 +130,24 @@ public class ValidationUtilTest
     assertFalse(ValidationUtil.isNotContaining("test", "t"));
   }
 
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void testIsRepositoryNameValid()
+  {
+    assertTrue(ValidationUtil.isRepositoryNameValid("scm"));
+    assertTrue(ValidationUtil.isRepositoryNameValid("scm/main"));
+    assertTrue(ValidationUtil.isRepositoryNameValid("scm/plugins/git-plugin"));
+
+    // issue 142
+    assertFalse(ValidationUtil.isRepositoryNameValid("."));
+    assertFalse(ValidationUtil.isRepositoryNameValid(".scm/plugins"));
+    assertTrue(ValidationUtil.isRepositoryNameValid("scm/plugins/."));
+    assertFalse(ValidationUtil.isRepositoryNameValid("scm/../plugins"));
+  }
+
   /**
    * Method description
    *