Merge pull request #1219 from lat-lon/fixWmsExceptions-7678-1182

Fix exception type for WMS
deegree · Nov 17, 2021 · 2f97fc6 · 2f97fc6
2 parents bc4e5ea + 0aa5efb
commit 2f97fc6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/...core-protocol/deegree-protocol-wms/src/main/java/org/deegree/protocol/wms/ops/GetMap.java b/...core-protocol/deegree-protocol-wms/src/main/java/org/deegree/protocol/wms/ops/GetMap.java
@@ -615,7 +615,13 @@ private void parse130( Map<String, String> map, MapOptionsMaps exts )
             throw new OWSException( "The BBOX parameter is missing.", OWSException.MISSING_PARAMETER_VALUE );
         }
 
-        double[] vals = splitAsDoubles( box, "," );
+        double[] vals;
+        try {
+            vals = splitAsDoubles( box, "," );
+        } catch ( NumberFormatException e ) {
+            throw new OWSException( "The value of the BBOX parameter is invalid: " + box,
+                                    OWSException.INVALID_PARAMETER_VALUE );
+        }
         if ( vals.length != 4 ) {
             throw new OWSException( "The value of the BBOX parameter had too many values: " + box,
                                     OWSException.INVALID_PARAMETER_VALUE );

diff --git a/...deegree-services-wms/src/main/java/org/deegree/services/wms/controller/WMSController.java b/...deegree-services-wms/src/main/java/org/deegree/services/wms/controller/WMSController.java
@@ -37,6 +37,7 @@
 package org.deegree.services.wms.controller;
 
 import static javax.imageio.ImageIO.write;
+import static org.deegree.commons.ows.exception.OWSException.NO_APPLICABLE_CODE;
 import static org.deegree.commons.ows.exception.OWSException.OPERATION_NOT_SUPPORTED;
 import static org.deegree.commons.utils.ArrayUtils.join;
 import static org.deegree.commons.utils.CollectionUtils.getStringJoiner;
@@ -345,7 +346,7 @@ public void doKVP( Map<String, String> map, HttpServletRequest request, HttpResp
         WMSRequestType req;
         String requestName = map.get( "REQUEST" );
         try {
-            req = (WMSRequestType) ( (ImplementationMetadata<?>) ( (OWSProvider) getMetadata().getProvider() ).getImplementationMetadata() ).getRequestTypeByName( requestName );
+            req = parseRequest( requestName );
         } catch ( IllegalArgumentException e ) {
             controllers.get( version ).sendException( new OWSException( get( "WMS.OPERATION_NOT_KNOWN", requestName ),
                                                                         OWSException.OPERATION_NOT_SUPPORTED ),
@@ -373,7 +374,20 @@ public void doKVP( Map<String, String> map, HttpServletRequest request, HttpResp
             LOG.trace( "Stack trace of OWSException being sent", e );
 
             controllers.get( version ).handleException( map, req, e, response, this );
+        } catch ( Exception e ) {
+            LOG.debug( "OWS-Exception: {}", e.getMessage() );
+            LOG.trace( e.getMessage(), e );
+            controllers.get( version ).handleException( map, req, new OWSException( e.getMessage(), NO_APPLICABLE_CODE ), response, this );
+        }
+    }
+
+    private WMSRequestType parseRequest( String requestName ) {
+        WMSRequestType requestType = (WMSRequestType) ( (ImplementationMetadata<?>) ( (OWSProvider) getMetadata().getProvider() ).getImplementationMetadata() ).getRequestTypeByName(
+                        requestName );
+        if ( requestType == null ) {
+            throw new IllegalArgumentException( "Request type " + requestName + "is not known." );
         }
+        return requestType;
     }
 
     private void handleRequest( WMSRequestType req, HttpResponseBuffer response, Map<String, String> map,
@@ -1168,10 +1182,10 @@ private String getVersionValueFromRequest( Map<String, String> map ) {
 
     /**
      * <code>Controller</code>
-     * 
+     *
      * @author <a href="mailto:schmitz@lat-lon.de">Andreas Schmitz</a>
      * @author last edited by: $Author$
-     * 
+     *
      * @version $Revision$, $Date$
      */
     public interface Controller {

diff --git a/...ree-services-wms/src/main/java/org/deegree/services/wms/controller/WMSControllerBase.java b/...ree-services-wms/src/main/java/org/deegree/services/wms/controller/WMSControllerBase.java
@@ -161,6 +161,11 @@ private void writeExceptionCatchExceptions( Map<String, String> map, OWSExceptio
     }
 
     private boolean isSupportedFormatForRequestType( WMSRequestType req, String exceptions ) {
+        if ( req == null ) {
+            if ( EXCEPTION_BLANK.equals( exceptions ) || EXCEPTION_INIMAGE.equals( exceptions ) )
+                return false;
+            return true;
+        }
         switch ( req ) {
         case map:
         case GetMap: