Handle feature type names that need URL encoding

geoserver · Aug 20, 2018 · 8e76aa4 · 8e76aa4
1 parent ae9528d
commit 8e76aa4
Showing 1 changed file with 27 additions and 1 deletion.
diff --git a/src/community/wfs3/src/main/java/org/geoserver/wfs3/WFS3Filter.java b/src/community/wfs3/src/main/java/org/geoserver/wfs3/WFS3Filter.java
@@ -5,6 +5,8 @@
 package org.geoserver.wfs3;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -110,6 +112,9 @@ private RequestWrapper(HttpServletRequest wrapped) {
                             if (matches) {
                                 request = "getFeature";
                                 String layerName = matcher.group(1);
+                                if (layerName != null) {
+                                    layerName = urlDecode(layerName);
+                                }
                                 setLayerName(layerName);
                                 this.featureId = matcher.group(2);
                             }
@@ -123,6 +128,9 @@ private RequestWrapper(HttpServletRequest wrapped) {
                             if (matches) {
                                 request = "getFeature";
                                 String layerName = matcher.group(1);
+                                if (layerName != null) {
+                                    layerName = urlDecode(layerName);
+                                }
                                 setLayerName(layerName);
                             }
                             return matches;
@@ -135,6 +143,9 @@ private RequestWrapper(HttpServletRequest wrapped) {
                             if (matches) {
                                 request = "collection";
                                 String layerName = matcher.group(1);
+                                if (layerName != null) {
+                                    layerName = urlDecode(layerName);
+                                }
                                 setLayerName(layerName);
                             }
                             return matches;
@@ -212,7 +223,7 @@ private void setLayerName(String layerName) {
                 typeName = layers.get(0).prefixedName();
             } else {
                 throw new HttpErrorCodeException(
-                        HttpStatus.NOT_FOUND.value(), "Could not find layer " + layerName);
+                        HttpStatus.NOT_FOUND.value(), "Could not find feature type " + layerName);
             }
         }
 
@@ -281,4 +292,19 @@ public String getParameter(String name) {
             }
         }
     }
+
+    /**
+     * URL decodes the given string
+     *
+     * @param name
+     * @return
+     */
+    private String urlDecode(String name) {
+        try {
+            name = URLDecoder.decode(name, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+        return name;
+    }
 }