Check parameters before calling the renderer

qgis · Apr 9, 2019 · bc72ff2 · bc72ff2
1 parent b2aa978
commit bc72ff2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/src/server/services/wms/qgswmsgetlegendgraphics.cpp b/src/server/services/wms/qgswmsgetlegendgraphics.cpp
@@ -34,6 +34,9 @@ namespace QgsWms
     // get parameters from query
     QgsWmsParameters parameters( QUrlQuery( request.url() ) );
 
+    // check parameters validity
+    checkParameters( parameters );
+
     // init render context
     QgsWmsRenderContext context( project, serverIface );
     context.setFlag( QgsWmsRenderContext::UseScaleDenominator );
@@ -100,5 +103,26 @@ namespace QgsWms
       throw QgsException( QStringLiteral( "Failed to compute GetLegendGraphics image" ) );
     }
   }
+
+  void checkParameters( const QgsWmsParameters &parameters )
+  {
+    if ( parameters.allLayersNickname().isEmpty() )
+    {
+      throw QgsBadRequestException( QgsServiceException::QGIS_MISSING_PARAMETER_VALUE,
+                                    parameters[QgsWmsParameter::LAYERS] );
+    }
+
+    if ( parameters.format() == QgsWmsParameters::Format::NONE )
+    {
+      throw QgsBadRequestException( QgsServiceException::QGIS_MISSING_PARAMETER_VALUE,
+                                    parameters[QgsWmsParameter::FORMAT] );
+    }
+
+    if ( ! parameters.bbox().isEmpty() && !parameters.rule().isEmpty() )
+    {
+      throw QgsBadRequestException( QgsServiceException::QGIS_INVALID_PARAMETER_VALUE,
+                                    QStringLiteral( "BBOX parameter cannot be combined with RULE." ) );
+    }
+  }
 } // namespace QgsWms
 
diff --git a/src/server/services/wms/qgswmsgetlegendgraphics.h b/src/server/services/wms/qgswmsgetlegendgraphics.h
@@ -29,6 +29,7 @@ namespace QgsWms
                                const QString &version, const QgsServerRequest &request,
                                QgsServerResponse &response );
 
+  void checkParameters( const QgsWmsParameters &parameters );
 } // namespace QgsWms
 
 

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -129,15 +129,6 @@ namespace QgsWms
 
   QImage *QgsRenderer::getLegendGraphics()
   {
-    // check parameters
-    if ( mWmsParameters.allLayersNickname().isEmpty() )
-      throw QgsBadRequestException( QgsServiceException::QGIS_MISSING_PARAMETER_VALUE,
-                                    mWmsParameters[QgsWmsParameter::LAYERS] );
-
-    if ( mWmsParameters.format() == QgsWmsParameters::Format::NONE )
-      throw QgsBadRequestException( QgsServiceException::QGIS_MISSING_PARAMETER_VALUE,
-                                    mWmsParameters[QgsWmsParameter::FORMAT] );
-
     // get layers
     std::unique_ptr<QgsLayerRestorer> restorer;
     restorer.reset( new QgsLayerRestorer( mContext.layers() ) );