Fix signature-generation for already-percent-encoded queries

As mentioned in RFC 5849 in section 3.4.1.3.1 queries
should be treated as application/x-www-form-urlencoded
and be decoded before being used in the base string.

The queries located in the URL now gets fully decoded and any
already-percent-encoded key-value pairs should be added to the URL. The
parameters list is used for non-encoded input.

[ChangeLog][OAuth1] QOAuth1 will now decode the query-segment of the URL
supplied in get/post/head/deleteResource during the signature-generation
phase. Any key-value-pair which needs to be passed in as percent-encoded
must be passed in the query of the URL.

Task-number: QTBUG-61125
Change-Id: I2ecb145f19f6c9a0031e9f00c6cb22d0fa5c96ea
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

2 files changed, 4 insertions, 2 deletions

diff --git a/src/oauth/qoauth1.cpp b/src/oauth/qoauth1.cpp
index e5d23d6..e23c21e 100644
--- a/src/oauth/qoauth1.cpp
+++ b/src/oauth/qoauth1.cpp
@@ -505,7 +505,7 @@ void QOAuth1::setup(QNetworkRequest *request,
     if (operation == QNetworkAccessManager::GetOperation) {
         if (signingParameters.size()) {
             QUrl url = request->url();
-            QUrlQuery query;
+            QUrlQuery query = QUrlQuery(url.query());
             for (auto it = signingParameters.begin(), end = signingParameters.end(); it != end;
                  ++it)
                 query.addQueryItem(it.key(), it.value().toString());
diff --git a/src/oauth/qoauth1signature.cpp b/src/oauth/qoauth1signature.cpp
index fe92ab0..d8bf191 100644
--- a/src/oauth/qoauth1signature.cpp
+++ b/src/oauth/qoauth1signature.cpp
@@ -96,7 +96,9 @@ QByteArray QOAuth1SignaturePrivate::signatureBaseString() const
 
     QVariantMap p = parameters;
     {
-        const auto queryItems = QUrlQuery(url.query()).queryItems();
+        // replace '+' with spaces now before decoding so that '%2B' gets left as '+'
+        const QString query = url.query().replace(QLatin1Char('+'), QLatin1Char(' '));
+        const auto queryItems = QUrlQuery(query).queryItems(QUrl::FullyDecoded);
         for (auto it = queryItems.begin(), end = queryItems.end(); it != end; ++it)
             p.insert(it->first, it->second);
     }