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

Jump to bottom

Allow audience claims to be arrays #278

Merged
merged 1 commit into from
May 10, 2022
Merged

Allow audience claims to be arrays #278

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
25 changes: 17 additions & 8 deletions jwcrypto/jwt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ def _check_default_claims(self, claims):
def _check_check_claims(self, check_claims):
self._check_string_claim('iss', check_claims)
self._check_string_claim('sub', check_claims)
self._check_string_claim('aud', check_claims)
self._check_array_or_string_claim('aud', check_claims)
self._check_integer_claim('exp', check_claims)
self._check_integer_claim('nbf', check_claims)
self._check_integer_claim('iat', check_claims)
Expand Down Expand Up @@ -398,14 +398,23 @@ def _check_provided_claims(self):

elif name == 'aud':
if value is not None:
if value == claims[name]:
continue
if isinstance(claims[name], list):
if value in claims[name]:
continue
raise JWTInvalidClaimValue(
"Invalid '%s' value. Expected '%s' to be in '%s'" % (
name, claims[name], value))
tclaims = claims[name]
else:
tclaims = [claims[name]]
if isinstance(value, list):
cclaims = value
else:
cclaims = [value]
found = False
for v in cclaims:
if v in tclaims:
found = True
break
if not found:
raise JWTInvalidClaimValue(
"Invalid '{}' value. Expected '{}' in '{}'".format(
name, claims[name], value))

elif name == 'exp':
if value is not None:
Expand Down
23 changes: 18 additions & 5 deletions jwcrypto/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,14 +1657,27 @@ def test_Issue_209(self):
# the oct key before hitting the ES one
jwt.JWT(jwt=token, key=ks)

def test_Issue_239(self):
claims = {"aud": "www.example.com"}
check_claims = {"aud": ["www.example.com", "account"]}
def test_Issue_277(self):
claims = {"aud": ["www.example.com", "www.test.net"]}
key = jwk.JWK(generate='oct', size=256)
token = jwt.JWT(header={"alg": "HS256"}, claims=claims)
token.make_signed_token(key)
self.assertRaises(jwt.JWTInvalidClaimFormat, jwt.JWT, key=key,
jwt=token.serialize(), check_claims=check_claims)
sertok = token.serialize()
jwt.JWT(key=key, jwt=sertok, check_claims={"aud": "www.example.com"})
jwt.JWT(key=key, jwt=sertok, check_claims={"aud": "www.test.net"})
jwt.JWT(key=key, jwt=sertok, check_claims={"aud": ["www.example.com"]})
jwt.JWT(key=key, jwt=sertok, check_claims={"aud": ["www.test.net"]})
jwt.JWT(key=key, jwt=sertok, check_claims={"aud": ["www.example.com",
"www.test.net"]})
jwt.JWT(key=key, jwt=sertok, check_claims={"aud": ["www.example.com",
"nomatch"]})
self.assertRaises(jwt.JWTInvalidClaimValue, jwt.JWT, key=key,
jwt=sertok, check_claims={"aud": "nomatch"})
self.assertRaises(jwt.JWTInvalidClaimValue, jwt.JWT, key=key,
jwt=sertok, check_claims={"aud": ["nomatch"]})
self.assertRaises(jwt.JWTInvalidClaimValue, jwt.JWT, key=key,
jwt=sertok, check_claims={"aud": ["nomatch",
"failmatch"]})


class ConformanceTests(unittest.TestCase):
Expand Down