Merge pull request #6519 from elpaso/server-tempfile-fix

[bugfix][server] Fix temporary path permission issue
qgis · Mar 5, 2018 · 7aa830430f0c8938377cb1239dd4b6aeac7c737e · 7aa8304
2 parents 993b9fd + c614b94
commit 7aa830430f0c8938377cb1239dd4b6aeac7c737e
Unified Split

Showing with 6 additions and 5 deletions.

+1 −1 python/server/qgsserviceregistry.sip.in

+1 −1 src/server/qgsserviceregistry.h

+4 −3 src/server/services/wms/qgswmsrenderer.cpp
diff --git a/python/server/qgsserviceregistry.sip.in b/python/server/qgsserviceregistry.sip.in
@@ -59,7 +59,7 @@ services. A module may register multiple services.
 
 The registry gain ownership of services and will call 'delete' on cleanup
 
-:param service: a QgsServerResponse to be registered
+:param service: a QgsService to be registered
 %End
 
     int unregisterService( const QString &name, const QString &version = QString() );

diff --git a/src/server/qgsserviceregistry.h b/src/server/qgsserviceregistry.h
@@ -73,7 +73,7 @@ class SERVER_EXPORT QgsServiceRegistry
      *
      * The registry gain ownership of services and will call 'delete' on cleanup
      *
-     * \param service a QgsServerResponse to be registered
+     * \param service a QgsService to be registered
      */
     void registerService( QgsService *service SIP_TRANSFER );
 

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -68,6 +68,7 @@
 #include "qgsdxfexport.h"
 #include "qgssymbollayerutils.h"
 #include "qgslayoutitemlegend.h"
+#include "qgsserverexception.h"
 
 #include <QImage>
 #include <QPainter>
@@ -379,11 +380,11 @@ namespace QgsWms
     configurePrintLayout( layout.get(), mapSettings );
 
     // Get the temporary output file
-    QTemporaryFile tempOutputFile( QStringLiteral( "XXXXXX.%1" ).arg( formatString.toLower() ) );
+    QTemporaryFile tempOutputFile( QDir::tempPath() +  '/' + QStringLiteral( "XXXXXX.%1" ).arg( formatString.toLower() ) );
     if ( !tempOutputFile.open() )
     {
-      // let the caller handle this
-      return nullptr;
+      throw QgsServerException( QStringLiteral( "Could not open temporary file for the GetPrint request." ) );
+
     }
 
     if ( formatString.compare( QLatin1String( "svg" ), Qt::CaseInsensitive ) == 0 )