Fix auth basic encoding (no auth system)

elpaso · elpaso · commit 1ba3c264f9ff · 2021-03-25T09:27:39.000+01:00
Followup #42410 Fixes #42405
diff --git a/src/core/qgsdatasourceuri.cpp b/src/core/qgsdatasourceuri.cpp
@@ -635,7 +635,7 @@ void QgsDataSourceUri::setEncodedUri( const QByteArray &uri )
   mAuthConfigId.clear();
 
   QUrl url;
-  url.setQuery( QString::fromLatin1( uri ) );
+  url.setQuery( QString::fromUtf8( uri ) );
   const QUrlQuery query( url );
 
   const auto constQueryItems = query.queryItems( QUrl::ComponentFormattingOption::FullyDecoded );
@@ -654,7 +654,7 @@ void QgsDataSourceUri::setEncodedUri( const QByteArray &uri )
 
 void QgsDataSourceUri::setEncodedUri( const QString &uri )
 {
-  setEncodedUri( uri.toLatin1() );
+  setEncodedUri( uri.toUtf8() );
 }
 
 QString QgsDataSourceUri::quotedTablename() const
diff --git a/tests/src/core/testqgsdatasourceuri.cpp b/tests/src/core/testqgsdatasourceuri.cpp
@@ -299,6 +299,19 @@ void TestQgsDataSourceUri::checkAuthParams()
   QCOMPARE( uri4.param( QStringLiteral( "password" ) ), QStringLiteral( "pa%%word" ) );
   QCOMPARE( uri4.password(), QStringLiteral( "pa%%word" ) );
 
+  // issue GH #42405
+  uri4.setEncodedUri( QStringLiteral( "dpiMode=7&url=http://localhost:8000/ows/?MAP%3D/home/bug.qgs&username=username&password=qgis%C3%A8%C3%A9" ) );
+  QCOMPARE( uri4.param( QStringLiteral( "username" ) ), QStringLiteral( "username" ) );
+  QCOMPARE( uri4.username(), QStringLiteral( "username" ) );
+  QCOMPARE( uri4.param( QStringLiteral( "password" ) ), QStringLiteral( "qgisèé" ) );
+  QCOMPARE( uri4.password(), QStringLiteral( "qgisèé" ) );
+
+  uri4.setEncodedUri( QStringLiteral( "dpiMode=7&url=http://localhost:8000/&username=username&password=%1" ).arg( QString( QUrl::toPercentEncoding( QStringLiteral( "😁😂😍" ) ) ) ) );
+  QCOMPARE( uri4.param( QStringLiteral( "username" ) ), QStringLiteral( "username" ) );
+  QCOMPARE( uri4.username(), QStringLiteral( "username" ) );
+  QCOMPARE( uri4.param( QStringLiteral( "password" ) ), QStringLiteral( "😁😂😍" ) );
+  QCOMPARE( uri4.password(), QStringLiteral( "😁😂😍" ) );
+
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ void QgsDataSourceUri::setEncodedUri( const QByteArray &uri )`
`635`	`635`	`mAuthConfigId.clear();`
`636`	`636`
`637`	`637`	`QUrl url;`
`638`		`- url.setQuery( QString::fromLatin1( uri ) );`
	`638`	`+ url.setQuery( QString::fromUtf8( uri ) );`
`639`	`639`	`const QUrlQuery query( url );`
`640`	`640`
`641`	`641`	`const auto constQueryItems = query.queryItems( QUrl::ComponentFormattingOption::FullyDecoded );`
`@@ -654,7 +654,7 @@ void QgsDataSourceUri::setEncodedUri( const QByteArray &uri )`
`654`	`654`
`655`	`655`	`void QgsDataSourceUri::setEncodedUri( const QString &uri )`
`656`	`656`	`{`
`657`		`- setEncodedUri( uri.toLatin1() );`
	`657`	`+ setEncodedUri( uri.toUtf8() );`
`658`	`658`	`}`
`659`	`659`
`660`	`660`	`QString QgsDataSourceUri::quotedTablename() const`