Issue #69: Only normalize path segment when resolving IRI

Author: James Leigh

core/util/src/main/java/org/eclipse/rdf4j/common/net/ParsedIRI.java

@@ -24,7 +24,6 @@
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.StringTokenizer;
 
 import org.eclipse.rdf4j.common.text.StringUtil;
 
@@ -728,14 +727,11 @@ else if (relative.getHost() == null && relative.getPath().length() == 0) {
 			}
 		}
 
-		ParsedIRI result = new ParsedIRI(scheme, userInfo, host, port, path, query, fragment);
-
 		if (normalize || path.indexOf("/./") >= 0 || path.indexOf("/../") >= 0) {
-			return result.normalize();
-		}
-		else {
-			return result;
+			path = pathSegmentNormalization(path);
 		}
+
+		return new ParsedIRI(scheme, userInfo, host, port, path, query, fragment);
 	}
 
 	/**
@@ -1282,15 +1278,9 @@ private String pathSegmentNormalization(String _path) {
 
 		// Split the path into its segments
 
-		LinkedList<String> segments = new LinkedList<String>();
-
-		StringTokenizer st = new StringTokenizer(_path, "/");
-
-		while (st.hasMoreTokens()) {
-			String segment = st.nextToken();
-			if (!segments.isEmpty() || !segment.equals("..") && !segment.equals(".")) {
-				segments.add(segment);
-			}
+		LinkedList<String> segments = new LinkedList<String>(Arrays.asList(_path.split("/")));
+		if (_path.startsWith("/")) {
+			segments.remove(0);
 		}
 
 		boolean lastSegmentRemoved = false;

core/util/src/test/java/org/eclipse/rdf4j/common/net/ParsedIRITest.java

@@ -102,7 +102,7 @@ public void resolvesAPathRelativeUriRelativeToABaseJarUri()
 		throws URISyntaxException
 	{
 		ParsedIRI uri = new ParsedIRI("jar:file:///some-file.jar!/some-nested-file");
-		assertEquals("jar:file:/some-file.jar!/another-file", uri.resolve("another-file").toString());
+		assertEquals("jar:file:///some-file.jar!/another-file", uri.resolve("another-file").toString());
 	}
 
 	@Test
@@ -406,13 +406,22 @@ public void testAbnormalExamples()
 	}
 
 	@Test
-	public void testResolveOpaque() throws URISyntaxException {
+	public void testResolveOpaque()
+		throws URISyntaxException
+	{
 		assertResolves("", "urn:test:foo#bar", "urn:test:foo");
 		assertResolves("", "urn:test:foo", "urn:test:foo");
 		assertResolves("#bar", "urn:test:foo", "urn:test:foo#bar");
 		assertResolves("#bat", "urn:test:foo#bar", "urn:test:foo#bat");
 	}
 
+	@Test
+	public void testDoubleSlash()
+		throws URISyntaxException
+	{
+		assertResolves("../xyz", "http://ab//de//ghi", "http://ab//de/xyz");
+	}
+
 	private void assertResolves(String relative, String base, String absolute)
 		throws URISyntaxException
 	{
@@ -687,7 +696,8 @@ public void testDurst()
 	public void testDeseret()
 		throws URISyntaxException
 	{
-		assertURI2IRI("http://www.example.org/U+10400/%F0%90%90%80", "http://www.example.org/U+10400/\uD801\uDC00");
+		assertURI2IRI("http://www.example.org/U+10400/%F0%90%90%80",
+				"http://www.example.org/U+10400/\uD801\uDC00");
 	}
 
 	@Test