Better fix for #39243: decode in uri

instead of handling that inside the wms routines.
qgis · Oct 13, 2020 · c8f90c1 · c8f90c1
1 parent 40997ff
commit c8f90c1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/core/qgsdatasourceuri.cpp b/src/core/qgsdatasourceuri.cpp
@@ -638,7 +638,7 @@ void QgsDataSourceUri::setEncodedUri( const QByteArray &uri )
   url.setQuery( QString::fromLatin1( uri ) );
   const QUrlQuery query( url );
 
-  const auto constQueryItems = query.queryItems();
+  const auto constQueryItems = query.queryItems( QUrl::ComponentFormattingOption::FullyDecoded );
   for ( const QPair<QString, QString> &item : constQueryItems )
   {
     if ( item.first == QLatin1String( "username" ) )

diff --git a/src/providers/wms/qgswmscapabilities.cpp b/src/providers/wms/qgswmscapabilities.cpp
@@ -42,9 +42,8 @@ bool QgsWmsSettings::parseUri( const QString &uriString )
   uri.setEncodedUri( uriString );
 
   // Setup authentication
-  QUrlQuery query{ uriString };
-  mAuth.mUserName = query.queryItemValue( QStringLiteral( "username" ), QUrl::ComponentFormattingOption::FullyDecoded );
-  mAuth.mPassword = query.queryItemValue( QStringLiteral( "password" ), QUrl::ComponentFormattingOption::FullyDecoded );
+  mAuth.mUserName = uri.username();
+  mAuth.mPassword = uri.password();
 
   if ( !uri.authConfigId().isEmpty() )
   {

diff --git a/tests/src/core/testqgsdatasourceuri.cpp b/tests/src/core/testqgsdatasourceuri.cpp
@@ -290,6 +290,15 @@ void TestQgsDataSourceUri::checkAuthParams()
   QVERIFY( uri.param( QStringLiteral( "authcfg" ) ).isEmpty() );
   QVERIFY( uri.authConfigId().isEmpty() );
 
+  // issue GH #39243
+  QgsDataSourceUri uri4;
+  uri4.setEncodedUri( QStringLiteral( "dpiMode=7&url=http://localhost:8000/ows/?MAP%3D/home/bug.qgs&username=username&password=pa%25%25word" ) );
+
+  QCOMPARE( uri4.param( QStringLiteral( "username" ) ), QStringLiteral( "username" ) );
+  QCOMPARE( uri4.username(), QStringLiteral( "username" ) );
+  QCOMPARE( uri4.param( QStringLiteral( "password" ) ), QStringLiteral( "pa%%word" ) );
+  QCOMPARE( uri4.password(), QStringLiteral( "pa%%word" ) );
+
 }