Merge pull request #5406 from pblottiere/bugfix_server_hex

pblottiere · web-flow · commit c54299dcbb7b · 2017-10-27T12:55:57.000+01:00
[server][bugfix]  Fix parameter decoding with post method and urlencoded
diff --git a/src/server/qgsrequesthandler.cpp b/src/server/qgsrequesthandler.cpp
@@ -230,7 +230,8 @@ void QgsRequestHandler::parseInput()
       QList<pair_t> items = query.queryItems();
       Q_FOREACH ( const pair_t &pair, items )
       {
-        mRequest.setParameter( pair.first.toUpper(), pair.second );
+        const QString value = QUrl::fromPercentEncoding( pair.second.toUtf8() );
+        mRequest.setParameter( pair.first.toUpper(), value );
       }
       setupParameters();
     }
diff --git a/tests/src/python/test_qgsserver_wms.py b/tests/src/python/test_qgsserver_wms.py
@@ -1407,6 +1407,47 @@ def test_wms_getprint_selection(self):
         r, h = self._result(self._execute_request(qs))
         self._img_diff_error(r, h, "WMS_GetPrint_Selection")
 
+    def test_wms_getprint_opacity(self):
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetPrint",
+            "TEMPLATE": "layoutA4",
+            "FORMAT": "png",
+            "map0:EXTENT": "-33626185.498,-13032965.185,33978427.737,16020257.031",
+            "map0:LAYERS": "Country,Hello",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "SELECTION": "Country: 4",
+            "LAYERS": "Country,Hello",
+            "OPACITIES": "125,125"
+        }.items())])
+
+        r, h = self._result(self._execute_request(qs))
+        self._img_diff_error(r, h, "WMS_GetPrint_Opacity")
+
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetPrint",
+            "TEMPLATE": "layoutA4",
+            "FORMAT": "png",
+            "map0:EXTENT": "-33626185.498,-13032965.185,33978427.737,16020257.031",
+            "map0:LAYERS": "Country,Hello",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "SELECTION": "Country: 4",
+            "LAYERS": "Country,Hello",
+            "OPACITIES": "125%2C125"
+        }.items())])
+
+        r, h = self._result(self._execute_request(qs))
+        self._img_diff_error(r, h, "WMS_GetPrint_Opacity")
+
     def test_wms_getprint_highlight(self):
         # default style
         qs = "?" + "&".join(["%s=%s" % i for i in list({
diff --git a/tests/testdata/control_images/qgis_server/WMS_GetPrint_Opacity/WMS_GetPrint_Opacity.png b/tests/testdata/control_images/qgis_server/WMS_GetPrint_Opacity/WMS_GetPrint_Opacity.png

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,8 @@ void QgsRequestHandler::parseInput()`
`230`	`230`	`QList<pair_t> items = query.queryItems();`
`231`	`231`	`Q_FOREACH ( const pair_t &pair, items )`
`232`	`232`	`{`
`233`		`- mRequest.setParameter( pair.first.toUpper(), pair.second );`
	`233`	`+ const QString value = QUrl::fromPercentEncoding( pair.second.toUtf8() );`
	`234`	`+ mRequest.setParameter( pair.first.toUpper(), value );`
`234`	`235`	`}`
`235`	`236`	`setupParameters();`
`236`	`237`	`}`