Http request/response handler refactoring.

HTTP Request handler now manages HTTP request and response. * added methods to manage HTTP response headers * added methods to manage response body * added accessors API methods for request parameters and response headers and body Conflicts: src/mapserver/qgswmsserver.cpp Funded by ItOpen - http://www.itopen.it
qgis · Nov 4, 2014 · 670719c · 670719c
1 parent 1d3f8a7
commit 670719c
Show file tree

Hide file tree

Showing 17 changed files with 480 additions and 282 deletions.
diff --git a/src/mapserver/qgis_map_serv.cpp b/src/mapserver/qgis_map_serv.cpp
@@ -16,6 +16,9 @@
  *                                                                         *
  ***************************************************************************/
 
+//for CMAKE_INSTALL_PREFIX
+#include "qgsconfig.h"
+
 #include "qgsapplication.h"
 #include "qgscapabilitiescache.h"
 #include "qgsconfigcache.h"
@@ -34,6 +37,11 @@
 #include "qgsnetworkaccessmanager.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsserverlogger.h"
+#ifdef MAPSERVER_HAVE_PYTHON_PLUGINS
+#include "qgsserverplugins.h"
+#include "qgsserverfilter.h"
+#include "qgsserverinterfaceimpl.h"
+#endif
 
 #include <QDomDocument>
 #include <QNetworkDiskCache>
@@ -42,9 +50,6 @@
 #include <QDateTime>
 #include <QScopedPointer>
 
-//for CMAKE_INSTALL_PREFIX
-#include "qgsconfig.h"
-
 #include <fcgi_stdio.h>
 
 
@@ -281,6 +286,7 @@ int main( int argc, char * argv[] )
   QgsDebugMsg( "User DB PATH: " + QgsApplication::qgisUserDbFilePath() );
   QgsDebugMsg( "SVG PATHS: " + QgsApplication::svgPaths().join( ":" ) );
 
+  // FIXME: what is this debug line for?
   QgsDebugMsg( qgsapp.applicationDirPath() + "/qgis_wms_server.log" );
   QgsApplication::createDB(); //init qgis.db (e.g. necessary for user crs)
 
@@ -314,6 +320,18 @@ int main( int argc, char * argv[] )
   int logLevel = QgsServerLogger::instance()->logLevel();
   QTime time; //used for measuring request time if loglevel < 1
 
+#ifdef MAPSERVER_HAVE_PYTHON_PLUGINS
+  // Create the interface
+  QgsServerInterfaceImpl serverIface( &capabilitiesCache );
+  // Init plugins
+  if (! QgsServerPlugins::initPlugins( &serverIface ) )
+  {
+      QgsMessageLog::logMessage( "No server plugins are available", "Server", QgsMessageLog::INFO );
+  }
+  // Store plugin filters for faster access  
+  QMultiMap<int, QgsServerFilter*> pluginFilters = serverIface.filters();
+#endif
+
   while ( fcgi_accept() >= 0 )
   {
     QgsMapLayerRegistry::instance()->removeAllMapLayers();
@@ -327,78 +345,99 @@ int main( int argc, char * argv[] )
 
     //Request handler
     QScopedPointer<QgsRequestHandler> theRequestHandler( createRequestHandler() );
-    QMap<QString, QString> parameterMap;
+
     try
     {
-      parameterMap = theRequestHandler->parseInput();
+      // TODO: split parse input into plain parse and processing from specific services
+      theRequestHandler->parseInput();
     }
     catch ( QgsMapServiceException& e )
     {
       QgsMessageLog::logMessage( "Parse input exception: " + e.message(), "Server", QgsMessageLog::CRITICAL );
-      theRequestHandler->sendServiceException( e );
-      continue;
+      theRequestHandler->setServiceException( e );
     }
 
+#ifdef MAPSERVER_HAVE_PYTHON_PLUGINS
+    // Set the request handler into the interface for plugins to manipulate it
+    serverIface.setRequestHandler( theRequestHandler.data() );
+    // Iterate filters and call their requestReady() method
+    QgsServerFiltersMap::const_iterator filtersIterator;
+    for( filtersIterator = pluginFilters.constBegin(); filtersIterator != pluginFilters.constEnd(); ++filtersIterator)
+    {
+      filtersIterator.value()->requestReady();
+    }
+#endif
+
+    // Copy the parameters map
+    QMap<QString, QString> parameterMap( theRequestHandler->parameterMap() );
+
     printRequestParameters( parameterMap, logLevel );
     QMap<QString, QString>::const_iterator paramIt;
-
     //Config file path
     QString configFilePath = configPath( defaultConfigFilePath, parameterMap );
-
     //Service parameter
-    QString serviceString;
-    paramIt = parameterMap.find( "SERVICE" );
-    if ( paramIt == parameterMap.constEnd() )
-    {
-      QgsMessageLog::logMessage( "Exception: SERVICE parameter is missing", "Server", QgsMessageLog::CRITICAL );
-      theRequestHandler->sendServiceException( QgsMapServiceException( "ServiceNotSpecified", "Service not specified. The SERVICE parameter is mandatory" ) );
-      continue;
-    }
-    else
+    QString serviceString = theRequestHandler->parameter( "SERVICE" );
+
+    // Enter core services main switch
+    if ( !theRequestHandler->exceptionRaised() ) {
+        if ( serviceString == "WCS")
+          {
+            QgsWCSProjectParser* p = QgsConfigCache::instance()->wcsConfiguration( configFilePath );
+            if ( !p )
+              {
+                theRequestHandler->setServiceException( QgsMapServiceException( "Project file error", "Error reading the project file" ) );
+              }
+            else {
+                QgsWCSServer wcsServer( configFilePath, parameterMap, p, theRequestHandler.data() );
+                wcsServer.executeRequest();
+              }
+          }
+        else if ( serviceString == "WFS")
+          {
+            QgsWFSProjectParser* p = QgsConfigCache::instance()->wfsConfiguration( configFilePath );
+            if ( !p )
+              {
+                theRequestHandler->setServiceException( QgsMapServiceException( "Project file error", "Error reading the project file" ) );
+              }
+            else
+              {
+                QgsWFSServer wfsServer( configFilePath, parameterMap, p, theRequestHandler.data() );
+                wfsServer.executeRequest();
+              }
+          }
+        else if ( serviceString == "WMS")
+          {
+            QgsWMSConfigParser* p = QgsConfigCache::instance()->wmsConfiguration( configFilePath, parameterMap );
+            if ( !p )
+              {
+                theRequestHandler->setServiceException( QgsMapServiceException( "WMS configuration error", "There was an error reading the project file or the SLD configuration" ) );
+              }
+            else
+              {
+                QgsWMSServer wmsServer( configFilePath, parameterMap, p, theRequestHandler.data() , theMapRenderer.data(), &capabilitiesCache );
+                wmsServer.executeRequest();
+              }
+          }
+        else
+          {
+            theRequestHandler->setServiceException( QgsMapServiceException( "Service configuration error", "Service unknown or unsupported" ) );
+          } // end switch
+    } // end if not exception raised
+
+#ifdef MAPSERVER_HAVE_PYTHON_PLUGINS
+    // Call responseReady plugin filters
+    for(filtersIterator = pluginFilters.constBegin(); filtersIterator != pluginFilters.constEnd(); ++filtersIterator)
     {
-      serviceString = paramIt.value();
+      filtersIterator.value()->responseReady();
     }
+#endif
 
-    if ( serviceString == "WCS" )
-    {
-      QgsWCSProjectParser* p = QgsConfigCache::instance()->wcsConfiguration( configFilePath );
-      if ( !p )
-      {
-        theRequestHandler->sendServiceException( QgsMapServiceException( "Project file error", "Error reading the project file" ) );
-        continue;
-      }
-      QgsWCSServer wcsServer( configFilePath, parameterMap, p, theRequestHandler.take() );
-      wcsServer.executeRequest();
-    }
-    else if ( serviceString == "WFS" )
-    {
-      QgsWFSProjectParser* p = QgsConfigCache::instance()->wfsConfiguration( configFilePath );
-      if ( !p )
-      {
-        theRequestHandler->sendServiceException( QgsMapServiceException( "Project file error", "Error reading the project file" ) );
-        continue;
-      }
-      QgsWFSServer wfsServer( configFilePath, parameterMap, p, theRequestHandler.take() );
-      wfsServer.executeRequest();
-    }
-    else    //WMS else
-    {
-      QgsWMSConfigParser* p = QgsConfigCache::instance()->wmsConfiguration( configFilePath, parameterMap );
-      if ( !p )
-      {
-        theRequestHandler->sendServiceException( QgsMapServiceException( "WMS configuration error", "There was an error reading the project file or the SLD configuration" ) );
-        continue;
-      }
-      QgsWMSServer wmsServer( configFilePath, parameterMap, p, theRequestHandler.take(), theMapRenderer.data(), &capabilitiesCache );
-      wmsServer.executeRequest();
-    }
+    theRequestHandler->sendResponse();
 
     if ( logLevel < 1 )
     {
       QgsMessageLog::logMessage( "Request finished in " + QString::number( time.elapsed() ) + " ms", "Server", QgsMessageLog::INFO );
     }
   }
-
   return 0;
 }
-
diff --git a/src/mapserver/qgsgetrequesthandler.cpp b/src/mapserver/qgsgetrequesthandler.cpp
@@ -24,10 +24,9 @@ QgsGetRequestHandler::QgsGetRequestHandler()
 {
 }
 
-QMap<QString, QString> QgsGetRequestHandler::parseInput()
+void QgsGetRequestHandler::parseInput()
 {
   QString queryString;
-  QMap<QString, QString> parameters;
 
   const char* qs = getenv( "QUERY_STRING" );
   if ( qs )
@@ -38,9 +37,8 @@ QMap<QString, QString> QgsGetRequestHandler::parseInput()
   else
   {
     QgsDebugMsg( "error, no query string found" );
-    return parameters; //no query string? something must be wrong...
+    return; //no query string? something must be wrong...
   }
 
-  requestStringToParameterMap( queryString, parameters );
-  return parameters;
+  requestStringToParameterMap( queryString, mParameterMap );
 }
diff --git a/src/mapserver/qgsgetrequesthandler.h b/src/mapserver/qgsgetrequesthandler.h
@@ -18,9 +18,15 @@
 
 #include "qgshttprequesthandler.h"
 
+#ifndef QGSGETPREQUESTHANDLER_H
+#define QGSGETPREQUESTHANDLER_H
+
+
 class QgsGetRequestHandler: public QgsHttpRequestHandler
 {
   public:
     QgsGetRequestHandler();
-    QMap<QString, QString> parseInput();
+    void parseInput();
 };
+
+#endif