fix: Allow to get files from git repository if file name starts with dot

Signed-off-by: Vitaliy Gulyy <[email protected]>
eclipse-che · Sep 9, 2022 · 723d332 · 723d332
1 parent 893d6ae
commit 723d332
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...e/che/api/factory/server/bitbucket/BitbucketServerAuthorizingFileContentProviderTest.java b/...e/che/api/factory/server/bitbucket/BitbucketServerAuthorizingFileContentProviderTest.java
@@ -112,7 +112,6 @@ public void shouldResolveRelativePaths(String relative, String expected, String
   public static Object[][] relativePathsProvider() {
     return new Object[][] {
       {"./file.txt", "https://foo.bar/rest/api/1.0/projects/proj/repos/repo/raw/file.txt", null},
-      {"../file.txt", "https://foo.bar/rest/api/1.0/projects/proj/repos/repo/raw/file.txt", null},
       {"/file.txt", "https://foo.bar/rest/api/1.0/projects/proj/repos/repo/raw/file.txt", null},
       {"file.txt", "https://foo.bar/rest/api/1.0/projects/proj/repos/repo/raw/file.txt", null},
       {

diff --git a/.../src/main/java/org/eclipse/che/api/factory/server/scm/AuthorizingFileContentProvider.java b/.../src/main/java/org/eclipse/che/api/factory/server/scm/AuthorizingFileContentProvider.java
@@ -146,9 +146,9 @@ protected String formatUrl(String fileURL) throws DevfileException {
         requestURL = fileURL;
       } else {
         // since files retrieved via REST, we cannot use path like '.' or one that starts with './'
-        // or '../', so cut them off
+        // so cut them off
         requestURL =
-            remoteFactoryUrl.rawFileLocation(fileURL.replaceAll("^(?:\\.*\\/)|(?:\\.$)", ""));
+            remoteFactoryUrl.rawFileLocation(fileURL.replaceAll("^(?:\\.?\\/)|(?:\\.$)", ""));
       }
     } catch (URISyntaxException e) {
       throw new DevfileException(e.getMessage(), e);