Merge pull request #6879 from arnaud-morvan/server_fix_url_params_dec…

…oding [server] Avoid %2B to be interpreted as space in querystring
qgis · May 2, 2018 · 9e5f382 · 9e5f382
2 parents 73ad80f + 4087521
commit 9e5f382
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/server/qgsserverrequest.cpp b/src/server/qgsserverrequest.cpp
@@ -76,14 +76,12 @@ QMap<QString, QString> QgsServerRequest::parameters() const
     typedef QPair<QString, QString> pair_t;
 
     QUrlQuery query( mUrl );
+    query.setQuery( query.query().replace( '+', QStringLiteral( "%20" ) ) );
+
     QList<pair_t> items = query.queryItems( QUrl::FullyDecoded );
     Q_FOREACH ( const pair_t &pair, items )
     {
-      // prepare the value
-      QString value = pair.second;
-      value.replace( '+', ' ' );
-
-      mParams.insert( pair.first.toUpper(), value );
+      mParams.insert( pair.first.toUpper(), pair.second );
     }
     mDecoded = true;
   }

diff --git a/tests/src/python/test_qgsserver_request.py b/tests/src/python/test_qgsserver_request.py
@@ -48,6 +48,11 @@ def test_requestParameters(self):
         for k, v in request.headers().items():
             self.assertEqual(parameters[k], v)
 
+    def test_requestParametersDecoding(self):
+        """Test request parameters decoding"""
+        request = QgsServerRequest('http://somesite.com/somepath?parm1=val1%20%2B+val2', QgsServerRequest.GetMethod)
+        self.assertEqual(request.parameters()['PARM1'], 'val1 + val2')
+
     def test_requestUrl(self):
         """Test url"""
         request = QgsServerRequest('http://somesite.com/somepath', QgsServerRequest.GetMethod)