Merge pull request #46412 from benoitdm-oslandia/backport-46401-to-queued_ltr_backports

lbartoletti · web-flow · commit 1249c70cc5ed · 2021-12-08T19:47:03.000+01:00
fix percent encoding in wms server parameter
diff --git a/src/server/qgsserverparameters.cpp b/src/server/qgsserverparameters.cpp
@@ -441,7 +441,8 @@ QUrlQuery QgsServerParameters::urlQuery() const
 
     for ( auto param : toMap().toStdMap() )
     {
-      query.addQueryItem( param.first, param.second );
+      const QString value = QUrl::toPercentEncoding( QString( param.second ) );
+      query.addQueryItem( param.first, value );
     }
   }
 
diff --git a/tests/src/server/wms/test_qgsserver_wms_parameters.cpp b/tests/src/server/wms/test_qgsserver_wms_parameters.cpp
@@ -29,6 +29,8 @@ class TestQgsServerWmsParameters : public QObject
     void cleanupTestCase();
 
     void external_layers();
+
+    void percent_encoding();
 };
 
 void TestQgsServerWmsParameters::initTestCase()
@@ -75,5 +77,25 @@ void TestQgsServerWmsParameters::external_layers()
   QCOMPARE( layers_params[2].mOpacity, 125 );
 }
 
+void TestQgsServerWmsParameters::percent_encoding()
+{
+  // '+' in its encoded ('%2B') form is transformed in '+' sign and
+  // forwarded to parameters subclasses
+  QUrlQuery query;
+  query.addQueryItem( "MYPARAM", QString( "a%2Cb%2Cc%2C%C3%A4%C3%B6s+%2B+%25%26%23" ) );
+
+  QgsServerParameters params;
+  params.load( query );
+  QCOMPARE( params.value( "MYPARAM" ), QString( "a,b,c,äös + %&#" ) );
+
+  const QgsWms::QgsWmsParameters wmsParams( params );
+  QCOMPARE( wmsParams.value( "MYPARAM" ), QString( "a,b,c,äös + %&#" ) );
+
+  // back to urlQuery
+  QgsServerParameters params2;
+  params2.load( params.urlQuery() );
+  QCOMPARE( params2.value( "MYPARAM" ), QString( "a,b,c,äös + %&#" ) );
+}
+
 QGSTEST_MAIN( TestQgsServerWmsParameters )
 #include "test_qgsserver_wms_parameters.moc"

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,8 @@ QUrlQuery QgsServerParameters::urlQuery() const`
`441`	`441`
`442`	`442`	`for ( auto param : toMap().toStdMap() )`
`443`	`443`	`{`
`444`		`- query.addQueryItem( param.first, param.second );`
	`444`	`+ const QString value = QUrl::toPercentEncoding( QString( param.second ) );`
	`445`	`+ query.addQueryItem( param.first, value );`
`445`	`446`	`}`
`446`	`447`	`}`
`447`	`448`