always resolve paths relative to the WebDAV base URL (fixing tests)

Author: overheadhunter

src/main/java/org/cryptomator/cloudaccess/webdav/WebDavClient.java

@@ -22,6 +22,8 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 public class WebDavClient {
 
@@ -283,10 +285,12 @@ private void checkExecutionSucceeded(final int status) throws CloudProviderExcep
         }
     }
 
-    private URL absoluteURLFrom(final Path relativePath) {
-        // TODO improve path appending
+    // visible for testing
+    URL absoluteURLFrom(final Path relativePath) {
+        var basePath = Path.of(baseUrl.getPath());
+        var fullPath = IntStream.range(0, relativePath.getNameCount()).mapToObj(i -> relativePath.getName(i)).reduce(basePath, Path::resolve);
         try {
-            return new URL(baseUrl, relativePath.toString());
+            return new URL(baseUrl, fullPath.toString());
         } catch (MalformedURLException e) {
             throw new IllegalArgumentException("The relative path contains invalid URL elements.");
         }

src/test/java/org/cryptomator/cloudaccess/webdav/WebDavClientTest.java

@@ -13,6 +13,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 
@@ -48,6 +50,21 @@ public void setup() throws MalformedURLException {
         webDavClient = new WebDavClient(webDavCompatibleHttpClient, webDavCredential);
     }
 
+    @ParameterizedTest
+    @DisplayName("getPath()")
+    @CsvSource(value = {
+            "'',/cloud/remote.php/webdav",
+            "/,/cloud/remote.php/webdav",
+            "/foo,/cloud/remote.php/webdav/foo",
+            "foo/bar,/cloud/remote.php/webdav/foo/bar",
+            "//foo///bar/baz,/cloud/remote.php/webdav/foo/bar/baz",
+    })
+    public void testAbsoluteURLFrom(String absPath, String expectedResult) {
+        var result = webDavClient.absoluteURLFrom(Path.of(absPath));
+
+        Assertions.assertEquals(expectedResult, result.getPath());
+    }
+
     @Test
     @DisplayName("get metadata of /Nextcloud Manual.pdf")
     public void testItemMetadata() throws IOException {

src/test/java/org/cryptomator/cloudaccess/webdav/WebDavCloudProviderTestIT.java

@@ -43,7 +43,7 @@ public WebDavCloudProviderTestIT() throws IOException, InterruptedException {
         server = new MockWebServer();
         server.start();
 
-        baseUrl = new URL("http", server.getHostName(), server.getPort(), "cloud/remote.php/webdav");
+        baseUrl = new URL("http", server.getHostName(), server.getPort(), "/cloud/remote.php/webdav");
 
         final var response = getInterceptedResponse("item-meta-data-response.xml");
         server.enqueue(response);
@@ -89,7 +89,7 @@ public void testList() throws InterruptedException {
         RecordedRequest rq = server.takeRequest();
         Assertions.assertEquals("PROPFIND", rq.getMethod());
         Assertions.assertEquals("1", rq.getHeader("DEPTH"));
-        Assertions.assertEquals("/cloud/remote.php/webdav/", rq.getPath());
+        Assertions.assertEquals("/cloud/remote.php/webdav", rq.getPath());
         Assertions.assertEquals(webDavRequestBody, rq.getBody().readUtf8());
     }
 
@@ -116,7 +116,7 @@ public void testListExhaustively() throws InterruptedException {
         RecordedRequest rq = server.takeRequest();
         Assertions.assertEquals("PROPFIND", rq.getMethod());
         Assertions.assertEquals("infinity", rq.getHeader("DEPTH"));
-        Assertions.assertEquals("/cloud/remote.php/webdav/", rq.getPath());
+        Assertions.assertEquals("/cloud/remote.php/webdav", rq.getPath());
         Assertions.assertEquals(webDavRequestBody, rq.getBody().readUtf8());
     }