From 01cbbe89da8cc8edbdd7387ffc268cfe4123379c Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 16 Jul 2018 12:03:13 +0200
Subject: [PATCH] check repository path of hg hooks is in the hg directory,
 instead of path length check

---
 .../sonia/scm/repository/RepositoryUtil.java  | 26 +++----
 .../scm/repository/RepositoryUtilTest.java    | 67 +++++++++++++++++++
 2 files changed, 81 insertions(+), 12 deletions(-)
 create mode 100644 scm-core/src/test/java/sonia/scm/repository/RepositoryUtilTest.java

diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryUtil.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryUtil.java
index 4bf10387d4..798ac38a0e 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryUtil.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryUtil.java
@@ -103,19 +103,21 @@ public final class RepositoryUtil
 
   public static String getRepositoryId(File baseDirectory, File directory) throws IOException {
     String path = directory.getCanonicalPath();
-    int directoryLength = baseDirectory.getCanonicalPath().length();
+    String basePath = baseDirectory.getCanonicalPath();
 
-    if (directoryLength < path.length())
-    {
-      String id = IOUtil.trimSeperatorChars(path.substring(directoryLength));
-      Preconditions.checkState(!id.contains("\\") && !id.contains("/"),
-        "got illegal repository directory with separators in id: " + path);
-      return id;
-    }
-    else
-    {
-      throw new IllegalStateException("path is shorter as the main repository path");
-    }
+    Preconditions.checkArgument(
+      path.startsWith(basePath),
+      "repository path %s is not in the main repository path %s", path, basePath
+    );
+
+    String id = IOUtil.trimSeperatorChars(path.substring(basePath.length()));
+
+    Preconditions.checkArgument(
+      !id.contains("\\") && !id.contains("/"),
+      "got illegal repository directory with separators in id: %s", path
+    );
+
+    return id;
   }
 
   private static void searchRepositoryDirectories(List<File> repositories,
diff --git a/scm-core/src/test/java/sonia/scm/repository/RepositoryUtilTest.java b/scm-core/src/test/java/sonia/scm/repository/RepositoryUtilTest.java
new file mode 100644
index 0000000000..bbe4814566
--- /dev/null
+++ b/scm-core/src/test/java/sonia/scm/repository/RepositoryUtilTest.java
@@ -0,0 +1,67 @@
+package sonia.scm.repository;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+@RunWith(MockitoJUnitRunner.class)
+public class RepositoryUtilTest {
+
+  @Rule
+  public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+  @Mock
+  private AbstractRepositoryHandler<SimpleRepositoryConfig> repositoryHandler;
+
+  private SimpleRepositoryConfig repositoryConfig = new SimpleRepositoryConfig();
+
+  @Before
+  public void setUpMocks() {
+    when(repositoryHandler.getConfig()).thenReturn(repositoryConfig);
+  }
+
+  @Test
+  public void testGetRepositoryId() throws IOException {
+    File repositoryTypeRoot = temporaryFolder.newFolder();
+    repositoryConfig.setRepositoryDirectory(repositoryTypeRoot);
+
+    File repository = new File(repositoryTypeRoot, "abc");
+    String id = RepositoryUtil.getRepositoryId(repositoryHandler, repository.getPath());
+    assertEquals("abc", id);
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testGetRepositoryIdWithInvalidPath() throws IOException {
+    File repositoryTypeRoot = temporaryFolder.newFolder();
+    repositoryConfig.setRepositoryDirectory(repositoryTypeRoot);
+
+    File repository = new File("/etc/abc");
+    String id = RepositoryUtil.getRepositoryId(repositoryHandler, repository.getPath());
+    assertEquals("abc", id);
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testGetRepositoryIdWithInvalidPathButSameLength() throws IOException {
+    File repositoryTypeRoot = temporaryFolder.newFolder();
+    repositoryConfig.setRepositoryDirectory(repositoryTypeRoot);
+
+    System.out.println(repositoryTypeRoot);
+
+    File repository = new File(temporaryFolder.newFolder(), "abc");
+    System.out.println(repository);
+
+    String id = RepositoryUtil.getRepositoryId(repositoryHandler, repository.getPath());
+    assertEquals("abc", id);
+  }
+
+}