Skip to content

Commit 81fa5aa

Browse files
authored
Merge pull request #27 from peppelinux/master
replaced try/except with get
2 parents e38f197 + 0c690b3 commit 81fa5aa

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed

Diff for: src/cryptojwt/key_jar.py

+6-24
Original file line numberDiff line numberDiff line change
@@ -579,36 +579,18 @@ def get_jwt_verify_keys(self, jwt, **kwargs):
579579
:return: list of usable keys
580580
"""
581581

582-
try:
583-
allow_missing_kid = kwargs['allow_missing_kid']
584-
except KeyError:
585-
allow_missing_kid = False
582+
allow_missing_kid = kwargs.get('allow_missing_kid', False)
586583

587-
try:
584+
_key_type = ''
585+
if jwt.headers.get('alg'):
588586
_key_type = jws_alg2keytype(jwt.headers['alg'])
589-
except KeyError:
590-
_key_type = ''
591587

592-
try:
593-
_kid = jwt.headers['kid']
594-
except KeyError:
595-
logger.info('Missing kid')
596-
_kid = ''
597-
598-
try:
599-
nki = kwargs['no_kid_issuer']
600-
except KeyError:
601-
nki = {}
588+
_kid = jwt.headers.get('kid', "")
589+
nki = kwargs.get('no_kid_issuer', {})
602590

603591
_payload = jwt.payload()
604592

605-
try:
606-
_iss = _payload['iss']
607-
except KeyError:
608-
try:
609-
_iss = kwargs['iss']
610-
except KeyError:
611-
_iss = ''
593+
_iss = _payload.get('iss') or kwargs.get('iss') or ""
612594

613595
if _iss:
614596
# First extend the key jar iff allowed

0 commit comments

Comments
 (0)