Add repository name restriction.

Only a-zA-Z0-9- are allowed.
adr · Jun 8, 2017 · 793896f · 793896f
1 parent f9abf72
commit 793896f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/serepo-commons/src/main/java/ch/hsr/isf/serepo/commons/FileUtils.java b/serepo-commons/src/main/java/ch/hsr/isf/serepo/commons/FileUtils.java
@@ -7,6 +7,7 @@
 import java.util.List;
 
 import com.google.common.base.Predicate;
+import com.google.common.base.Strings;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Files;
@@ -20,6 +21,12 @@ public static String cleanFilename(String filename) {
 		return filename.replaceAll("[^a-zA-Z0-9\\@\\!\\#\\%\\&\\(\\)\\_\\-\\=\\+\\[\\]\\{\\}\\,\\;\\.äÄöÖüÜ ]+", "_");
 	}
 
+	public static boolean isValidRepositoryName(String name) {
+	  boolean empty = Strings.isNullOrEmpty(name);
+	  boolean validChars = Strings.nullToEmpty(name).matches("[a-zA-Z0-9-]+");
+	  return !empty && validChars;
+	}
+
 	public static String relativize(File rootDir, File file) {
 		return relativize(rootDir.getAbsolutePath(), file.getAbsolutePath());
 	}

diff --git a/serepo-git/src/main/java/ch/hsr/isf/serepo/git/repository/GitRepositoryBuilder.java b/serepo-git/src/main/java/ch/hsr/isf/serepo/git/repository/GitRepositoryBuilder.java
@@ -29,9 +29,8 @@ public static GitRepository open(File gitDir) throws IOException {
   public static void create(File gitDir, String name, String description, GitAuthor author)
       throws IOException, GitCommandException {
 
-    name = name.trim();
-    if (name.contains(" ")) {
-      throw new GitCommandException("No spaces are allowed in repository name!");
+    if (!FileUtils.isValidRepositoryName(name)) {
+      throw new GitCommandException(String.format("Repository name '%s' is not allowed. Only a-zA-Z0-9- are allowed.", name));
     }
 
     File repositoryDir = Paths.get(gitDir.getAbsolutePath(), name + ".git")