Clean WMS service

    - Remove "transitional" code
    - Remove duplicated code (or functionaly equivalent code)
    - Remove dead code
    - Sanitize error checking
    - Ensure correct build with HAVE_SERVER_PYTHON_PLUGINS not defined

Author: dmarteau

src/server/CMakeLists.txt

@@ -52,6 +52,8 @@ SET ( qgis_mapserv_SRCS
   qgsfcgiserverresponse.cpp
   qgsbufferserverresponse.cpp
   qgsfilterresponsedecorator.cpp
+  qgsserverinterface.cpp
+  qgsserverinterfaceimpl.cpp
   qgsfilterrestorer.cpp
 #----------------------------
 )
@@ -98,11 +100,9 @@ SET(qgis_mapserv_MOC_HDRS ${qgis_mapserv_MOC_HDRS})
 IF (WITH_SERVER_PLUGINS)
 SET(qgis_mapserv_SRCS ${qgis_mapserv_SRCS}
     qgsserverplugins.cpp
-    qgsserverinterface.cpp
     qgsserverfilter.cpp
     qgsaccesscontrolfilter.cpp
     qgsaccesscontrol.cpp
-    qgsserverinterfaceimpl.cpp
 )
 ENDIF (WITH_SERVER_PLUGINS)
 

src/server/qgsconfigcache.cpp

@@ -79,9 +79,7 @@ QgsServerProjectParser* QgsConfigCache::serverConfiguration( const QString& file
 
 QgsWCSProjectParser *QgsConfigCache::wcsConfiguration(
   const QString& filePath
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
   , const QgsAccessControl* accessControl
-#endif
 )
 {
   QgsWCSProjectParser *p = mWCSConfigCache.object( filePath );
@@ -94,9 +92,7 @@ QgsWCSProjectParser *QgsConfigCache::wcsConfiguration(
     }
     p = new QgsWCSProjectParser(
       filePath
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
       , accessControl
-#endif
     );
     mWCSConfigCache.insert( filePath, p );
     p = mWCSConfigCache.object( filePath );
@@ -109,9 +105,7 @@ QgsWCSProjectParser *QgsConfigCache::wcsConfiguration(
 
 QgsWfsProjectParser *QgsConfigCache::wfsConfiguration(
   const QString& filePath
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
   , const QgsAccessControl* accessControl
-#endif
 )
 {
   QgsWfsProjectParser *p = mWFSConfigCache.object( filePath );
@@ -124,9 +118,7 @@ QgsWfsProjectParser *QgsConfigCache::wfsConfiguration(
     }
     p = new QgsWfsProjectParser(
       filePath
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
       , accessControl
-#endif
     );
     mWFSConfigCache.insert( filePath, p );
     p = mWFSConfigCache.object( filePath );
@@ -139,9 +131,7 @@ QgsWfsProjectParser *QgsConfigCache::wfsConfiguration(
 
 QgsWmsConfigParser *QgsConfigCache::wmsConfiguration(
   const QString& filePath
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
   , const QgsAccessControl* accessControl
-#endif
   , const QMap<QString, QString>& parameterMap
 )
 {
@@ -165,9 +155,7 @@ QgsWmsConfigParser *QgsConfigCache::wmsConfiguration(
     {
       p = new QgsWmsProjectParser(
         filePath
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
         , accessControl
-#endif
       );
     }
     mWMSConfigCache.insert( filePath, p );

src/server/qgsconfigcache.h

@@ -43,21 +43,15 @@ class SERVER_EXPORT QgsConfigCache : public QObject
     QgsServerProjectParser* serverConfiguration( const QString& filePath );
     QgsWCSProjectParser* wcsConfiguration(
       const QString& filePath
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
       , const QgsAccessControl* accessControl
-#endif
     );
     QgsWfsProjectParser* wfsConfiguration(
       const QString& filePath
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
       , const QgsAccessControl* accessControl
-#endif
     );
     QgsWmsConfigParser* wmsConfiguration(
       const QString& filePath
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
       , const QgsAccessControl* accessControl
-#endif
       , const QMap<QString, QString>& parameterMap = ( QMap< QString, QString >() )
     );
 

src/server/qgsfilterrestorer.cpp

@@ -20,7 +20,12 @@
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
 
-//! Apply filter from AccessControl
+#ifdef HAVE_SERVER_PYTHON_PLUGINS
+#include "qgsaccesscontrol.h"
+#endif
+
+//! Apply filter from AccessControal
+#ifdef HAVE_SERVER_PYTHON_PLUGINS
 void QgsOWSServerFilterRestorer::applyAccessControlLayerFilters( const QgsAccessControl* accessControl, QgsMapLayer* mapLayer,
     QHash<QgsMapLayer*, QString>& originalLayerFilters )
 {
@@ -45,6 +50,7 @@ void QgsOWSServerFilterRestorer::applyAccessControlLayerFilters( const QgsAccess
     }
   }
 }
+#endif
 
 //! Restore layer filter as original
 void QgsOWSServerFilterRestorer::restoreLayerFilters( const QHash<QgsMapLayer*, QString>& filterMap )

src/server/qgsfilterrestorer.h

@@ -18,12 +18,12 @@
 #ifndef QGSFILTERRESTORER_H
 #define QGSFILTERRESTORER_H
 
-#include "qgsaccesscontrol.h"
 #include "qgis_server.h"
 
 #include <QHash>
 
 class QgsMapLayer;
+class QgsAccessControl;
 
 /** RAII class to restore layer filters on destruction
  */

src/server/qgsserverinterfaceimpl.cpp

@@ -31,7 +31,7 @@ QgsServerInterfaceImpl::QgsServerInterfaceImpl( QgsCapabilitiesCache* capCache,
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
   mAccessControls = new QgsAccessControl();
 #else
-  mAccessControls = nullptr
+  mAccessControls = nullptr;
 #endif
 }
 
@@ -43,7 +43,9 @@ QString QgsServerInterfaceImpl::getEnv( const QString& name ) const
 
 QgsServerInterfaceImpl::~QgsServerInterfaceImpl()
 {
+#ifdef HAVE_SERVER_PYTHON_PLUGINS
   delete mAccessControls;
+#endif
 }
 
 
@@ -75,10 +77,12 @@ void QgsServerInterfaceImpl::setFilters( QgsServerFiltersMap* filters )
 //! Register a new access control filter
 void QgsServerInterfaceImpl::registerAccessControl( QgsAccessControlFilter* accessControl, int priority )
 {
-  if ( mAccessControls )
-  {
-    mAccessControls->registerAccessControl( accessControl, priority );
-  }
+#ifdef HAVE_SERVER_PYTHON_PLUGINS
+  mAccessControls->registerAccessControl( accessControl, priority );
+#else
+  Q_UNUSED( accessControl );
+  Q_UNUSED( priority );
+#endif
 }
 
 

src/server/qgswcsprojectparser.cpp

@@ -31,15 +31,13 @@
 
 QgsWCSProjectParser::QgsWCSProjectParser(
   const QString& filePath
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
   , const QgsAccessControl* as
-#endif
 )
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
-    :
-    mAccessControl( as )
-#endif
+    : mAccessControl( as )
 {
+#ifndef HAVE_SERVER_PYTHON_PLUGINS
+  Q_UNUSED( mAccessControl );
+#endif
   mProjectParser = QgsConfigCache::instance()->serverConfiguration( filePath );
 }
 

src/server/qgswcsprojectparser.h

@@ -21,18 +21,14 @@
 #include "qgsserverprojectparser.h"
 #include "qgis_server.h"
 
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
 class QgsAccessControl;
-#endif
 
 class SERVER_EXPORT QgsWCSProjectParser
 {
   public:
     QgsWCSProjectParser(
       const QString& filePath
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
       , const QgsAccessControl* ac
-#endif
     );
     ~QgsWCSProjectParser();
 
@@ -49,9 +45,7 @@ class SERVER_EXPORT QgsWCSProjectParser
 
   private:
     QgsServerProjectParser* mProjectParser;
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
     const QgsAccessControl* mAccessControl;
-#endif
 
 };
 

src/server/qgswfsprojectparser.cpp

@@ -26,15 +26,13 @@
 
 QgsWfsProjectParser::QgsWfsProjectParser(
   const QString& filePath
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
   , const QgsAccessControl* ac
-#endif
 )
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
-    :
-    mAccessControl( ac )
-#endif
+    : mAccessControl( ac )
 {
+#ifndef HAVE_SERVER_PYTHON_PLUGINS
+  Q_UNUSED( mAccessControl );
+#endif
   mProjectParser = QgsConfigCache::instance()->serverConfiguration( filePath );
 }
 

src/server/qgswfsprojectparser.h

@@ -22,19 +22,15 @@
 #include "qgis_server.h"
 
 
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
 class QgsAccessControl;
-#endif
 
 
 class SERVER_EXPORT QgsWfsProjectParser
 {
   public:
     QgsWfsProjectParser(
       const QString& filePath
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
       , const QgsAccessControl* ac
-#endif
     );
     ~QgsWfsProjectParser();
 
@@ -60,9 +56,7 @@ class SERVER_EXPORT QgsWfsProjectParser
 
   private:
     QgsServerProjectParser* mProjectParser;
-#ifdef HAVE_SERVER_PYTHON_PLUGINS
     const QgsAccessControl* mAccessControl;
-#endif
 
 };