Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix potential DoS issue with p2c header #336

Merged
merged 1 commit into from
Dec 26, 2023
Merged

Fix potential DoS issue with p2c header #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions jwcrypto/jwa.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@

# Implements RFC 7518 - JSON Web Algorithms (JWA)

default_max_pbkdf2_iterations = 16384


class JWAAlgorithm(metaclass=ABCMeta):

Expand Down Expand Up @@ -588,6 +590,9 @@ def __init__(self):
self.aeskwmap = {128: _A128KW, 192: _A192KW, 256: _A256KW}

def _get_key(self, alg, key, p2s, p2c):
if p2c > default_max_pbkdf2_iterations:
raise ValueError('Invalid p2c value, too large')

if not isinstance(key, JWK):
# backwards compatibility for old interface
if isinstance(key, bytes):
Expand Down
12 changes: 12 additions & 0 deletions jwcrypto/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2099,6 +2099,18 @@ def test_pbes2_hs256_aeskw_custom_params(self):
key = jwk.JWK.from_password('password')
self.assertRaises(ValueError, enc.add_recipient, key)

# Test p2c iteration checks
maxiter = jwa.default_max_pbkdf2_iterations
p2cenc = jwe.JWE(plaintext='plain',
protected={"alg": "PBES2-HS256+A128KW",
"enc": "A256CBC-HS512",
"p2c": maxiter + 1,
"p2s": base64url_encode("A" * 16)})
with self.assertRaisesRegex(ValueError, 'too large'):
p2cenc.add_recipient(key)
jwa.default_max_pbkdf2_iterations += 2
p2cenc.add_recipient(key)


class JWATests(unittest.TestCase):
def test_jwa_create(self):
Expand Down
Loading