Fix auth encoding issue

Fixes: #10564
owncloud · Mar 3, 2023 · 4609315 · 4609315
1 parent a68dbad
commit 4609315
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/changelog/unreleased/10564 b/changelog/unreleased/10564
@@ -0,0 +1,5 @@
+Bugfix: Fix encoding issue with basic authentication
+
+In 3.0 we introduced an encoding issue for basic authentication.
+
+https://github.com/owncloud/client/issues/10564
diff --git a/src/gui/newwizard/jobs/checkbasicauthjobfactory.cpp b/src/gui/newwizard/jobs/checkbasicauthjobfactory.cpp
@@ -31,8 +31,8 @@ CoreJob *CheckBasicAuthJobFactory::startJob(const QUrl &url, QObject *parent)
 
     req.setAttribute(QNetworkRequest::AuthenticationReuseAttribute, QNetworkRequest::Manual);
 
-    QString authorizationHeader = QStringLiteral("Basic %1").arg(QString::fromLocal8Bit(QStringLiteral("%1:%2").arg(_username, _password).toLocal8Bit().toBase64()));
-    req.setRawHeader("Authorization", authorizationHeader.toLocal8Bit());
+    QString authorizationHeader = QStringLiteral("Basic %1").arg(QString::fromUtf8(QStringLiteral("%1:%2").arg(_username, _password).toUtf8().toBase64()));
+    req.setRawHeader("Authorization", authorizationHeader.toUtf8());
 
     auto *job = new CoreJob(nam()->sendCustomRequest(req, "PROPFIND"), parent);
 

diff --git a/src/libsync/networkjobs/fetchuserinfojobfactory.cpp b/src/libsync/networkjobs/fetchuserinfojobfactory.cpp
@@ -26,7 +26,7 @@ namespace OCC {
 
 FetchUserInfoJobFactory FetchUserInfoJobFactory::fromBasicAuthCredentials(QNetworkAccessManager *nam, const QString &username, const QString &password)
 {
-    QString authorizationHeader = QStringLiteral("Basic %1").arg(QString::fromLocal8Bit(QStringLiteral("%1:%2").arg(username, password).toLocal8Bit().toBase64()));
+    QString authorizationHeader = QStringLiteral("Basic %1").arg(QString::fromUtf8(QStringLiteral("%1:%2").arg(username, password).toUtf8().toBase64()));
     return { nam, authorizationHeader };
 }