diff --git a/src/server/qgsfilterrestorer.h b/src/server/qgsfilterrestorer.h index e04f8f6e6173..5cc30c24be91 100644 --- a/src/server/qgsfilterrestorer.h +++ b/src/server/qgsfilterrestorer.h @@ -35,9 +35,7 @@ class SERVER_EXPORT QgsOWSServerFilterRestorer { public: - QgsOWSServerFilterRestorer( const QgsAccessControl *accessControl ) - : mAccessControl( accessControl ) - {} + QgsOWSServerFilterRestorer() = default; //! Destructor. When object is destroyed all original layer filters will be restored. ~QgsOWSServerFilterRestorer() @@ -72,7 +70,6 @@ class SERVER_EXPORT QgsOWSServerFilterRestorer static void applyAccessControlLayerFilters( const QgsAccessControl *accessControl, QgsMapLayer *mapLayer ); private: - const QgsAccessControl *mAccessControl = nullptr; QHash mOriginalLayerFilters; }; diff --git a/src/server/services/wfs/qgswfsgetfeature.cpp b/src/server/services/wfs/qgswfsgetfeature.cpp index f4e9259a2c7d..e641864acd0b 100644 --- a/src/server/services/wfs/qgswfsgetfeature.cpp +++ b/src/server/services/wfs/qgswfsgetfeature.cpp @@ -181,7 +181,7 @@ namespace QgsWfs //scoped pointer to restore all original layer filters (subsetStrings) when pointer goes out of scope //there's LOTS of potential exit paths here, so we avoid having to restore the filters manually - std::unique_ptr< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer( accessControl ) ); + std::unique_ptr< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer() ); // features counters long sentFeatures = 0; diff --git a/src/server/services/wfs/qgswfstransaction.cpp b/src/server/services/wfs/qgswfstransaction.cpp index 0d89215b5f68..67cde379dc4f 100644 --- a/src/server/services/wfs/qgswfstransaction.cpp +++ b/src/server/services/wfs/qgswfstransaction.cpp @@ -239,7 +239,7 @@ namespace QgsWfs //scoped pointer to restore all original layer filters (subsetStrings) when pointer goes out of scope //there's LOTS of potential exit paths here, so we avoid having to restore the filters manually - std::unique_ptr< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer( accessControl ) ); + std::unique_ptr< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer() ); // get layers QStringList wfsLayerIds = QgsServerProjectUtils::wfsLayerIds( *project ); diff --git a/src/server/services/wfs/qgswfstransaction_1_0_0.cpp b/src/server/services/wfs/qgswfstransaction_1_0_0.cpp index f279e9820db6..51458c97ca43 100644 --- a/src/server/services/wfs/qgswfstransaction_1_0_0.cpp +++ b/src/server/services/wfs/qgswfstransaction_1_0_0.cpp @@ -226,7 +226,7 @@ namespace QgsWfs //scoped pointer to restore all original layer filters (subsetStrings) when pointer goes out of scope //there's LOTS of potential exit paths here, so we avoid having to restore the filters manually - std::unique_ptr< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer( accessControl ) ); + std::unique_ptr< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer() ); // get layers QStringList wfsLayerIds = QgsServerProjectUtils::wfsLayerIds( *project ); diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp index 861aa1d8c55b..d8af864976a8 100644 --- a/src/server/services/wms/qgswmsrenderer.cpp +++ b/src/server/services/wms/qgswmsrenderer.cpp @@ -123,7 +123,9 @@ namespace QgsWms const QgsProject *project, const QgsServerRequest::Parameters ¶meters ) : mParameters( parameters ) +#ifdef HAVE_SERVER_PYTHON_PLUGINS , mAccessControl( serverIface->accessControls() ) +#endif , mSettings( *serverIface->serverSettings() ) , mProject( project ) { diff --git a/src/server/services/wms/qgswmsrenderer.h b/src/server/services/wms/qgswmsrenderer.h index 862f91c45388..1725f04c660e 100644 --- a/src/server/services/wms/qgswmsrenderer.h +++ b/src/server/services/wms/qgswmsrenderer.h @@ -286,8 +286,10 @@ namespace QgsWms const QgsServerRequest::Parameters &mParameters; +#ifdef HAVE_SERVER_PYTHON_PLUGINS //! The access control helper QgsAccessControl *mAccessControl = nullptr; +#endif QgsFeatureFilter mFeatureFilter; const QgsServerSettings &mSettings;