fix: ExternalResolver

Author: predic8

core/pom.xml

@@ -7,7 +7,7 @@
 	<packaging>jar</packaging>
 
 	<parent>
-		<groupId>com.predic8</groupId>
+		<groupId>io.membrane-api</groupId>
 		<artifactId>soa-model-parent</artifactId>
 		<relativePath>../pom.xml</relativePath>
 		<version>2.1.0</version>

core/src/main/groovy/com/predic8/xml/util/ExternalResolver.groovy

@@ -11,6 +11,7 @@
 
 package com.predic8.xml.util
 
+import com.predic8.util.URIUtil
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.apache.http.HttpHost;
@@ -63,7 +64,7 @@ class ExternalResolver extends ResourceResolver {
 			throw new RuntimeException("Do not know how to resolve $input")
 
 		if(input.startsWith('file')) {
-			return fixUtf(new FileInputStream(new URL(input).getPath()))
+			return fixUtf(new FileInputStream(URIUtil.pathFromFileURI(input)))
 		}
 
 		if(input.startsWith('http:') || input.startsWith('https:')) {
@@ -80,7 +81,7 @@ class ExternalResolver extends ResourceResolver {
 		resolveAsFile(input, baseDir)
 	}
 
-	public InputStream resolveAsFile(java.lang.String filename, java.lang.String baseDir) {
+	InputStream resolveAsFile(java.lang.String filename, java.lang.String baseDir) {
 		if(baseDir) {
 			return fixUtf(new FileInputStream(new File(baseDir,filename)))
 		}

core/src/main/java/com/predic8/util/URIUtil.java

@@ -0,0 +1,78 @@
+/* Copyright 2024 predic8 GmbH, www.predic8.com
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License. */
+package com.predic8.util;
+
+import java.util.*;
+import java.util.regex.*;
+
+import static java.net.URLDecoder.*;
+import static java.nio.charset.StandardCharsets.*;
+import static java.util.Optional.*;
+
+/**
+ * From Membrane API Gateway core project
+ */
+public class URIUtil {
+
+    private static final Pattern driveLetterPattern = Pattern.compile("^(\\w)[/:|].*");
+
+    /**
+     * Removes file protocol from uri
+     *
+     * @param uri path that can contain file protocol
+     * @return path without the file protocol
+     */
+    public static String pathFromFileURI(String uri) {
+        return decode(processDecodedPart(stripFilePrefix(uri)), UTF_8);
+    }
+
+    private static String processDecodedPart(String path) {
+        if (path.charAt(0) != '/')
+            return path;
+        String p = removeLocalhost(removeLeadingSlashes(path));
+        return getPossibleDriveLetter(p).map(driveLetter -> driveLetter + ":" + slashToBackslash(removeDriveLetterAndSlash(p))).orElseGet(() -> "/" + p);
+    }
+
+    static String removeDriveLetterAndSlash(String path) {
+        return path.replaceFirst("\\w[:?|/]/*", "");
+    }
+
+    static String slashToBackslash(String path) {
+        return path.replace('/', '\\');
+    }
+
+    static String removeLocalhost(String s) {
+        if (s.startsWith("localhost"))
+            return s.substring(10);
+        return s;
+    }
+
+    static String removeLeadingSlashes(String s) {
+        return s.replaceAll("^/*", "");
+    }
+
+    static Optional<String> getPossibleDriveLetter(String p) {
+        Matcher m = driveLetterPattern.matcher(p);
+        if (m.matches()) {
+            return Optional.of(m.group(1));
+        }
+        return empty();
+    }
+
+    private static String stripFilePrefix(String uri) {
+        if (!uri.startsWith("file:"))
+            return uri;
+        return uri.substring(5); // Remove "file:"
+    }
+}

core/src/test/groovy/com/predic8/xml/util/ExternalResolverTest.groovy

@@ -18,20 +18,34 @@ import org.junit.Assume
 import org.junit.Before
 import org.junit.Test
 
+import java.nio.charset.StandardCharsets
+import java.util.stream.Collectors
+
 class ExternalResolverTest {
-  
-	def resolver
-	def url
+
+    def resolver
+    def url
 
     @Before
-	void setUp() {
-	  resolver = new ExternalResolver()
-	  url = 'https://www.predic8.de/city-service?wsdl'
-	}
-
-   @Test
-   void testResolveAsString() {
-     Assume.assumeTrue(!System.getenv('OFFLINETESTING'))
-     assert resolver.resolveAsString(url) != null
-   }
+    void setUp() {
+        resolver = new ExternalResolver()
+        url = 'https://www.predic8.de/city-service?wsdl'
+    }
+
+    @Test
+    void testResolveAsString() {
+        Assume.assumeTrue(!System.getenv('OFFLINETESTING'))
+        assert resolver.resolveAsString(url) != null
+    }
+
+    @Test
+    void fileUriWithSpaces() {
+        def is = resolver.resolve(this.getClass().getResource("/").toString() + "resource with spaces.xml", "")
+        assert readFromInputStream(is).equals("<foo/>")
+    }
+
+    private String readFromInputStream(is) {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))
+        reader.lines().collect(Collectors.joining(System.lineSeparator()))
+    }
 }

core/src/test/resources/resource with spaces.xml

@@ -0,0 +1 @@
+<foo/>

pom.xml

@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.predic8</groupId>
+	<groupId>io.membrane-api</groupId>
 	<artifactId>soa-model-parent</artifactId>
 	<version>2.1.0</version>
 	<packaging>pom</packaging>