[Server] Request handler reads the document root attributes to expose…

… parameters
qgis · Oct 12, 2017 · 5d2c035 · 5d2c035
1 parent b8ebbc1
commit 5d2c035
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/src/server/qgsrequesthandler.cpp b/src/server/qgsrequesthandler.cpp
@@ -241,15 +241,27 @@ void QgsRequestHandler::parseInput()
       setupParameters();
 
       QDomElement docElem = doc.documentElement();
-      if ( docElem.hasAttribute( QStringLiteral( "version" ) ) )
-      {
-        mRequest.setParameter( QStringLiteral( "VERSION" ), docElem.attribute( QStringLiteral( "version" ) ) );
-      }
-      if ( docElem.hasAttribute( QStringLiteral( "service" ) ) )
+      // the document element tag name is the request
+      mRequest.setParameter( QStringLiteral( "REQUEST" ), docElem.tagName() );
+      // loop through the attributes which are the parameters
+      // excepting the attributes started by xmlns or xsi
+      QDomNamedNodeMap map = docElem.attributes();
+      for ( int i = 0 ; i < map.length() ; ++i )
       {
-        mRequest.setParameter( QStringLiteral( "SERVICE" ), docElem.attribute( QStringLiteral( "service" ) ) );
+        if ( map.item( i ).isNull() )
+          continue;
+
+        QDomNode attrNode = map.item( i );
+        QDomAttr attr = attrNode.toAttr();
+        if ( attr.isNull() )
+          continue;
+
+        QString attrName = attr.name();
+        if ( attrName.startsWith( "xmlns" ) || attrName.startsWith( "xsi:" ) )
+          continue;
+
+        mRequest.setParameter( attrName.toUpper(), attr.value() );
       }
-      mRequest.setParameter( QStringLiteral( "REQUEST" ), docElem.tagName() );
       mRequest.setParameter( QStringLiteral( "REQUEST_BODY" ), inputString );
     }
   }