mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-01-27 12:01:38 +01:00
740980aaba
Reference:
https://nvd.nist.gov/vuln/detail/CVE-2024-39329
Upstream-patch:
156d3186c9
Signed-off-by: Saravanan <saravanan.kadambathursubramaniyam@windriver.com>
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
112 lines
4.7 KiB
Diff
112 lines
4.7 KiB
Diff
From 156d3186c96e3ec2ca73b8b25dc2ef366e38df14 Mon Sep 17 00:00:00 2001
|
|
From: Michael Manfre <mike@manfre.net>
|
|
Date: Fri, 14 Jun 2024 22:12:58 -0400
|
|
Subject: [PATCH] Fixed CVE-2024-39329 -- Standarized timing of
|
|
verify_password() when checking unusuable passwords.
|
|
|
|
Refs #20760.
|
|
|
|
Thanks Michael Manfre for the fix and to Adam Johnson for the review.
|
|
|
|
CVE: CVE-2024-39329
|
|
|
|
Upstream-Status: Backport
|
|
https://github.com/django/django/commit/156d3186c96e3ec2ca73b8b25dc2ef366e38df14
|
|
|
|
Signed-off-by: Michael Manfre <mike@manfre.net>
|
|
Signed-off-by: Saravanan <saravanan.kadambathursubramaniyam@windriver.com>
|
|
---
|
|
django/contrib/auth/hashers.py | 10 ++++++++--
|
|
docs/releases/2.2.28.txt | 7 +++++++
|
|
tests/auth_tests/test_hashers.py | 32 ++++++++++++++++++++++++++++++++
|
|
3 files changed, 47 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py
|
|
index 1e8d754..4acb81d 100644
|
|
--- a/django/contrib/auth/hashers.py
|
|
+++ b/django/contrib/auth/hashers.py
|
|
@@ -36,14 +36,20 @@ def check_password(password, encoded, setter=None, preferred='default'):
|
|
If setter is specified, it'll be called when you need to
|
|
regenerate the password.
|
|
"""
|
|
- if password is None or not is_password_usable(encoded):
|
|
- return False
|
|
+ fake_runtime = password is None or not is_password_usable(encoded)
|
|
|
|
preferred = get_hasher(preferred)
|
|
try:
|
|
hasher = identify_hasher(encoded)
|
|
except ValueError:
|
|
# encoded is gibberish or uses a hasher that's no longer installed.
|
|
+ fake_runtime = True
|
|
+
|
|
+ if fake_runtime:
|
|
+ # Run the default password hasher once to reduce the timing difference
|
|
+ # between an existing user with an unusable password and a nonexistent
|
|
+ # user or missing hasher (similar to #20760).
|
|
+ make_password(get_random_string(UNUSABLE_PASSWORD_SUFFIX_LENGTH))
|
|
return False
|
|
|
|
hasher_changed = hasher.algorithm != preferred.algorithm
|
|
diff --git a/docs/releases/2.2.28.txt b/docs/releases/2.2.28.txt
|
|
index f3fb298..22fa80e 100644
|
|
--- a/docs/releases/2.2.28.txt
|
|
+++ b/docs/releases/2.2.28.txt
|
|
@@ -124,3 +124,10 @@ CVE-2025-57833: Potential SQL injection in ``FilteredRelation`` column aliases
|
|
using a suitably crafted dictionary, with dictionary expansion, as the
|
|
``**kwargs`` passed to :meth:`.QuerySet.annotate` or :meth:`.QuerySet.alias`.
|
|
|
|
+CVE-2024-39329: Username enumeration through timing difference for users with unusable passwords
|
|
+================================================================================================
|
|
+
|
|
+The :meth:`~django.contrib.auth.backends.ModelBackend.authenticate()` method
|
|
+allowed remote attackers to enumerate users via a timing attack involving login
|
|
+requests for users with unusable passwords.
|
|
+
|
|
diff --git a/tests/auth_tests/test_hashers.py b/tests/auth_tests/test_hashers.py
|
|
index ee6441b..391b3cc 100644
|
|
--- a/tests/auth_tests/test_hashers.py
|
|
+++ b/tests/auth_tests/test_hashers.py
|
|
@@ -433,6 +433,38 @@ class TestUtilsHashPass(SimpleTestCase):
|
|
check_password('wrong_password', encoded)
|
|
self.assertEqual(hasher.harden_runtime.call_count, 1)
|
|
|
|
+ def test_check_password_calls_make_password_to_fake_runtime(self):
|
|
+ hasher = get_hasher("default")
|
|
+ cases = [
|
|
+ (None, None, None), # no plain text password provided
|
|
+ ("foo", make_password(password=None), None), # unusable encoded
|
|
+ ("letmein", make_password(password="letmein"), ValueError), # valid encoded
|
|
+ ]
|
|
+ for password, encoded, hasher_side_effect in cases:
|
|
+ with (
|
|
+ self.subTest(encoded=encoded),
|
|
+ mock.patch(
|
|
+ "django.contrib.auth.hashers.identify_hasher",
|
|
+ side_effect=hasher_side_effect,
|
|
+ ) as mock_identify_hasher,
|
|
+ mock.patch(
|
|
+ "django.contrib.auth.hashers.make_password"
|
|
+ ) as mock_make_password,
|
|
+ mock.patch(
|
|
+ "django.contrib.auth.hashers.get_random_string",
|
|
+ side_effect=lambda size: "x" * size,
|
|
+ ),
|
|
+ mock.patch.object(hasher, "verify"),
|
|
+ ):
|
|
+ # Ensure make_password is called to standardize timing.
|
|
+ check_password(password, encoded)
|
|
+ self.assertEqual(hasher.verify.call_count, 0)
|
|
+ self.assertEqual(mock_identify_hasher.mock_calls, [mock.call(encoded)])
|
|
+ self.assertEqual(
|
|
+ mock_make_password.mock_calls,
|
|
+ [mock.call("x" * UNUSABLE_PASSWORD_SUFFIX_LENGTH)],
|
|
+ )
|
|
+
|
|
|
|
class BasePasswordHasherTests(SimpleTestCase):
|
|
not_implemented_msg = 'subclasses of BasePasswordHasher must provide %s() method'
|
|
--
|
|
2.40.0
|
|
|