Merge pull request #3 from kitarek/develop

Exclude query string from mapping URI to file path
kitarek · Feb 5, 2016 · 2735902 · 2735902
2 parents 788a8c1 + 2cfdd9f
commit 2735902
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/...main/java/io/github/kitarek/elasthttpd/plugins/consumers/file/mapper/UriToFileMapper.java b/...main/java/io/github/kitarek/elasthttpd/plugins/consumers/file/mapper/UriToFileMapper.java
@@ -17,6 +17,7 @@
 
 package io.github.kitarek.elasthttpd.plugins.consumers.file.mapper;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,6 +39,7 @@ public class UriToFileMapper {
 	public static final Logger LOGGER = LoggerFactory.getLogger(UriToFileMapper.class);
 	public static final String ROOT_URI_REQUEST_PATH = "/";
 	public static final String RESOURCE_PATH_SEPARATOR = "/";
+	public static final String QUERY_STRING_REQUEST_PATH_SEPARATOR = "?";
 	private final String pathToMappedRootDirectory;
 
 	public UriToFileMapper(String pathToMappedRootDirectory) {
@@ -66,7 +68,11 @@ public static boolean isCorrectUriRequestPath(String uriRequestPath) {
 
 	public String mapUriRequestPath(String uriRequestPath) {
 		isTrue(isCorrectUriRequestPath(uriRequestPath), "URI request path is not correct");
-		return removeEnd(pathToMappedRootDirectory + normalizeUrlRequestPath(uriRequestPath), RESOURCE_PATH_SEPARATOR);
+		return removeEnd(pathToMappedRootDirectory + getNormalizedUriRequestPathWithoutQueryString(uriRequestPath), RESOURCE_PATH_SEPARATOR);
+	}
+
+	public String getNormalizedUriRequestPathWithoutQueryString(String uriRequestPath) {
+		return normalizeUrlRequestPath(StringUtils.substringBefore(uriRequestPath, QUERY_STRING_REQUEST_PATH_SEPARATOR));
 	}
 
 	private String normalizeUrlRequestPath(String uriRequestPath) {

diff --git a/...ovy/io/github/kitarek/elasthttpd/plugins/consumers/file/mapper/UriToFileMapperSpec.groovy b/...ovy/io/github/kitarek/elasthttpd/plugins/consumers/file/mapper/UriToFileMapperSpec.groovy
@@ -173,7 +173,6 @@ class UriToFileMapperSpec extends Specification {
 			'/src/a/b/c%20'  | validExistingDirectory() | validExistingDirectory() + "/src/a/b/c "
 			'/src%21'        | validExistingDirectory() | validExistingDirectory() + "/src!"
 			'/src%2B'        | validExistingDirectory() | validExistingDirectory() + "/src+"
-
 	}
 
 	@Unroll("Maps specified relative URI request path: #requestedPath appropriatly always under rootDirectory")
@@ -199,6 +198,27 @@ class UriToFileMapperSpec extends Specification {
 			'/../src/../a/../b/c%2C'   | validExistingDirectory() | validExistingDirectory() + "/b/c,"
 	}
 
+
+	@Unroll("Maps specified URI request path that contains query string: #requestedPath without applying query string as subpath of rootDirectory")
+	def 'Maps specified URI request path that contains query string without applying the query string part in subpath of rootDirectory'() {
+		given:
+			def UriToFileMapper mapper = new UriToFileMapper(root)
+
+		when:
+			def actualAbsoluteFilePath = mapper.mapUriRequestPath(requestedPath)
+
+		then:
+			actualAbsoluteFilePath == expectedMappedFilePath
+
+		where:
+			requestedPath            | root                     | expectedMappedFilePath
+			'/src?a=b'               | validExistingDirectory() | validExistingDirectory() + "/src"
+			'/src/a/b/c%20?c=d'      | validExistingDirectory() | validExistingDirectory() + "/src/a/b/c "
+			'/src/a/b/c%20?e=f&g=f'  | validExistingDirectory() | validExistingDirectory() + "/src/a/b/c "
+			'/src%21?d=f&j=k'        | validExistingDirectory() | validExistingDirectory() + "/src!"
+			'/src%2B?'               | validExistingDirectory() | validExistingDirectory() + "/src+"
+	}
+
 	@Shared
 	private validExistingDirectory = {
 		Path currentRelativePath = Paths.get("");