Merge pull request #87 from TAMULib/redirect-location-with-spaces

decode encoded spaces in location header during redirect
TAMULib · Jul 4, 2020 · 501f466 · 501f466
2 parents a7f8472 + 84a3d53
commit 501f466
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>edu.tamu</groupId>
   <artifactId>ir-iiif-service</artifactId>
-  <version>0.5.0</version>
+  <version>0.5.1</version>
   <packaging>war</packaging>
 
   <name>IR IIIF Service</name>

diff --git a/src/main/java/edu/tamu/iiif/service/CustomRedirectStrategy.java b/src/main/java/edu/tamu/iiif/service/CustomRedirectStrategy.java
@@ -1,7 +1,9 @@
 package edu.tamu.iiif.service;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLDecoder;
 import java.util.Optional;
 
 import org.apache.commons.validator.routines.UrlValidator;
@@ -24,13 +26,13 @@ public URI getLocationURI(HttpRequest request, HttpResponse response, HttpContex
             if (locationHeader.isPresent()) {
                 try {
                     URI origUri = new URI(request.getRequestLine().getUri());
-                    String location = locationHeader.get().getValue().split("\\?")[0];
+                    String location = URLDecoder.decode(locationHeader.get().getValue().split("\\?")[0], "UTF-8");
                     if (urlValidator.isValid(location)) {
                         return new URI(location);
                     } else {
                         return new URI(origUri.getScheme(), null, origUri.getHost(), origUri.getPort(), location, null, null);
                     }
-                } catch (URISyntaxException e) {
+                } catch (URISyntaxException | UnsupportedEncodingException e) {
                     throw new ProtocolException("Unable to reconstruct original URI!");
                 }
             } else {