From be70a08df5e2cfd31414696cbd1bb914d89826ebfdaf73d3e5468ac796086d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 21 Aug 2024 16:57:35 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main qt6-networkauth revision 8214ebc284ed3805ab1d7ff31905affa --- ...ix-data-race-and-poor-seeding-in-gen.patch | 102 ++++++++++++++++++ qt6-networkauth.changes | 18 ++++ qt6-networkauth.spec | 6 +- qtnetworkauth-everywhere-src-6.6.1.tar.xz | 3 - qtnetworkauth-everywhere-src-6.6.3.tar.xz | 3 + 5 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 0001-QAbstractOAuth-fix-data-race-and-poor-seeding-in-gen.patch delete mode 100644 qtnetworkauth-everywhere-src-6.6.1.tar.xz create mode 100644 qtnetworkauth-everywhere-src-6.6.3.tar.xz diff --git a/0001-QAbstractOAuth-fix-data-race-and-poor-seeding-in-gen.patch b/0001-QAbstractOAuth-fix-data-race-and-poor-seeding-in-gen.patch new file mode 100644 index 0000000..09c65f2 --- /dev/null +++ b/0001-QAbstractOAuth-fix-data-race-and-poor-seeding-in-gen.patch @@ -0,0 +1,102 @@ +From 5c0c90b6e5c3cdabd6ad41d5b6478250c8877f48 Mon Sep 17 00:00:00 2001 +From: Marc Mutz +Date: Wed, 8 May 2024 16:11:36 +0200 +Subject: [PATCH] QAbstractOAuth: fix data race and poor seeding in + generateRandomString() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +While not explicitly documented as thread-safe, this function +maintains unprotected global state, and OAuth classes are surely used +outside the main thread, so independent OAuth objects performing this +operation at the same time means data race, iow: UB. + +Protect with a mutex. + +As a drive-by, use Q_GLOBAL_STATIC instead of magic statics, and make +the char array constexpr instead of static const, to statically assert +that it plays no role in thread-safety. + +Also seed the PRNG with QRandomGenerator::system() instead of the +moral equivalent of gettimeoday(). The OAuth1 RFC5849¹ doesn't mention +it, but the OpenID² spec asks for the nonce to be "unguessable to +attackers". A gettimeofday()-seeded PRNG, esp. with only millisecond +resolution, clearly doesn't fulfil that requirement. + +QRandomGenerator::system(), OTOH, is documented to be "securely +seeded", and provides a seed_seq-like interface so the _whole_ mt19937 +state can be seeded, not just a 32-bit fraction of it. + +Keep the local PRNG to not exhaust the kernel's entropy pool through +excessive system() usage. + +¹ https://datatracker.ietf.org/doc/html/rfc5849#section-3.3 +² https://openid.net/specs/openid-connect-core-1_0.html#NonceNotes + +Amends a6dc1c01da723a93e1c174a6950eb4bab8cab3fc. + +Pick-to: 6.7 6.5 6.2 5.15 +Change-Id: Id09b04cc2ae342a7374a9f7a6803c860360d132c +Reviewed-by: Mårten Nordheim +Reviewed-by: Jesus Fernandez +--- + src/oauth/qabstractoauth.cpp | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/src/oauth/qabstractoauth.cpp b/src/oauth/qabstractoauth.cpp +index a3cbea7..f98fd28 100644 +--- a/src/oauth/qabstractoauth.cpp ++++ b/src/oauth/qabstractoauth.cpp +@@ -11,7 +11,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -20,6 +19,9 @@ + #include + #include + ++#include ++#include ++ + #include + + QT_BEGIN_NAMESPACE +@@ -273,15 +275,19 @@ void QAbstractOAuthPrivate::setStatus(QAbstractOAuth::Status newStatus) + } + } + ++Q_CONSTINIT static QBasicMutex prngMutex; ++Q_GLOBAL_STATIC_WITH_ARGS(std::mt19937, prng, (*QRandomGenerator::system())) ++ + QByteArray QAbstractOAuthPrivate::generateRandomString(quint8 length) + { +- const char characters[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; +- static std::mt19937 randomEngine(QDateTime::currentDateTime().toMSecsSinceEpoch()); ++ constexpr char characters[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + std::uniform_int_distribution distribution(0, sizeof(characters) - 2); + QByteArray data; + data.reserve(length); ++ auto lock = qt_unique_lock(prngMutex); + for (quint8 i = 0; i < length; ++i) +- data.append(characters[distribution(randomEngine)]); ++ data.append(characters[distribution(*prng)]); ++ lock.unlock(); + return data; + } + +@@ -591,6 +597,7 @@ void QAbstractOAuth::resourceOwnerAuthorization(const QUrl &url, const QMultiMap + } + + /*! ++ \threadsafe + Generates a random string which could be used as state or nonce. + The parameter \a length determines the size of the generated + string. +-- +2.44.0 + diff --git a/qt6-networkauth.changes b/qt6-networkauth.changes index 48bb7f7..4f397ce 100644 --- a/qt6-networkauth.changes +++ b/qt6-networkauth.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue May 21 09:14:03 UTC 2024 - Christophe Marin + +- Add security fix (CVE-2024-36048, boo#1224782): + * 0001-QAbstractOAuth-fix-data-race-and-poor-seeding-in-gen.patch + +------------------------------------------------------------------- +Tue Mar 26 14:26:08 UTC 2024 - Christophe Marin + +- Update to 6.6.3: + * https://www.qt.io/blog/qt-6.6.3-released + +------------------------------------------------------------------- +Wed Feb 14 16:53:21 UTC 2024 - Christophe Marin + +- Update to 6.6.2 + * https://www.qt.io/blog/qt-6.6.2-released + ------------------------------------------------------------------- Mon Nov 27 14:00:12 UTC 2023 - Christophe Marin diff --git a/qt6-networkauth.spec b/qt6-networkauth.spec index ae8e69e..b9a574d 100644 --- a/qt6-networkauth.spec +++ b/qt6-networkauth.spec @@ -16,7 +16,7 @@ # -%define real_version 6.6.1 +%define real_version 6.6.3 %define short_version 6.6 %define short_name qtnetworkauth %define tar_name qtnetworkauth-everywhere-src @@ -28,13 +28,15 @@ %endif # Name: qt6-networkauth%{?pkg_suffix} -Version: 6.6.1 +Version: 6.6.3 Release: 0 Summary: Set of APIs to obtain limited access to online accounts and HTTP services License: GPL-3.0-only WITH Qt-GPL-exception-1.0 URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-networkauth-rpmlintrc +# PATCH-FIX-UPSTREAM +Patch0: 0001-QAbstractOAuth-fix-data-race-and-poor-seeding-in-gen.patch BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel BuildRequires: cmake(Qt6Core) = %{real_version} diff --git a/qtnetworkauth-everywhere-src-6.6.1.tar.xz b/qtnetworkauth-everywhere-src-6.6.1.tar.xz deleted file mode 100644 index bcd6319..0000000 --- a/qtnetworkauth-everywhere-src-6.6.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:693e11945b22735fc9b1662cad53c60098882d301c4f4a3e13c01bcc41c00d49 -size 152916 diff --git a/qtnetworkauth-everywhere-src-6.6.3.tar.xz b/qtnetworkauth-everywhere-src-6.6.3.tar.xz new file mode 100644 index 0000000..839ea4f --- /dev/null +++ b/qtnetworkauth-everywhere-src-6.6.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5db9a30b42d7ff22ce1a0048474c36b3b84e1e55f3af991ba3cc8e0dc9bb7594 +size 143676