diff options
author | Tim Burke <tim.burke@gmail.com> | 2022-04-13 15:31:52 -0700 |
---|---|---|
committer | Tim Burke <tim.burke@gmail.com> | 2022-04-20 22:41:40 -0700 |
commit | 2829194bbf78058f1543819cad63fe596d0e358f (patch) | |
tree | dfe1e62b8b62b0e9fffbcd35466a19e9294eeb36 | |
parent | c0fb627c4a83e668a532276fd5437c0c6f8f390d (diff) | |
download | swift-2829194bbf78058f1543819cad63fe596d0e358f.tar.gz |
s3api: Use constant-time string comparisons in check_signature
Change-Id: Ibe514a7ab22d475517b1efc50de676f47d741a4c
(cherry picked from commit 6142ce88cc71037ba0cd23113eb6082fa91346ac)
-rw-r--r-- | swift/common/middleware/s3api/s3request.py | 6 | ||||
-rw-r--r-- | test/unit/common/middleware/s3api/test_s3request.py | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/swift/common/middleware/s3api/s3request.py b/swift/common/middleware/s3api/s3request.py index 9c79ac776..3d8fae453 100644 --- a/swift/common/middleware/s3api/s3request.py +++ b/swift/common/middleware/s3api/s3request.py @@ -26,7 +26,7 @@ from six.moves.urllib.parse import quote, unquote, parse_qsl import string from swift.common.utils import split_path, json, get_swift_info, \ - close_if_possible + close_if_possible, streq_const_time from swift.common import swob from swift.common.http import HTTP_OK, HTTP_CREATED, HTTP_ACCEPTED, \ HTTP_NO_CONTENT, HTTP_UNAUTHORIZED, HTTP_FORBIDDEN, HTTP_NOT_FOUND, \ @@ -159,7 +159,7 @@ class SigV4Mixin(object): derived_secret, scope_piece.encode('utf8'), sha256).digest() valid_signature = hmac.new( derived_secret, self.string_to_sign, sha256).hexdigest() - return user_signature == valid_signature + return streq_const_time(user_signature, valid_signature) @property def _is_query_auth(self): @@ -564,7 +564,7 @@ class S3Request(swob.Request): secret, self.string_to_sign, sha1).digest()).strip() if not six.PY2: valid_signature = valid_signature.decode('ascii') - return user_signature == valid_signature + return streq_const_time(user_signature, valid_signature) @property def timestamp(self): diff --git a/test/unit/common/middleware/s3api/test_s3request.py b/test/unit/common/middleware/s3api/test_s3request.py index 5258db085..a2c432655 100644 --- a/test/unit/common/middleware/s3api/test_s3request.py +++ b/test/unit/common/middleware/s3api/test_s3request.py @@ -780,6 +780,11 @@ class TestRequest(S3ApiTestCase): self.assertEqual(expected_sts, sigv2_req._string_to_sign()) self.assertTrue(sigv2_req.check_signature(secret)) + with patch('swift.common.middleware.s3api.s3request.streq_const_time', + return_value=True) as mock_eq: + self.assertTrue(sigv2_req.check_signature(secret)) + mock_eq.assert_called_once() + def test_check_signature_sigv2(self): self._test_check_signature_sigv2( 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY') @@ -819,6 +824,12 @@ class TestRequest(S3ApiTestCase): self.assertFalse(sigv4_req.check_signature( u'\u30c9\u30e9\u30b4\u30f3')) + with patch('swift.common.middleware.s3api.s3request.streq_const_time', + return_value=False) as mock_eq: + self.assertFalse(sigv4_req.check_signature( + u'\u30c9\u30e9\u30b4\u30f3')) + mock_eq.assert_called_once() + class TestHashingInput(S3ApiTestCase): def test_good(self): |