Skip to content

Commit 5f05c22

Browse files
committed
Merged
2 parents 9cf2593 + 7b5d58b commit 5f05c22

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

src/cryptojwt/key_jar.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@ def _get_issuer(self, issuer_id: str) -> Optional[KeyIssuer]:
9393

9494
@deprecated_alias(issuer='issuer_id', owner='issuer_id')
9595
def _add_issuer(self, issuer_id) -> KeyIssuer:
96-
_iss = KeyIssuer(ca_certs=self.ca_certs, name=issuer_id,
97-
keybundle_cls=self.keybundle_cls,
98-
remove_after=self.remove_after,
99-
httpc=self.httpc, httpc_params=self.httpc_params)
100-
self._issuers[issuer_id] = _iss
101-
return _iss
96+
_issuer = KeyIssuer(ca_certs=self.ca_certs, name=issuer_id,
97+
keybundle_cls=self.keybundle_cls,
98+
remove_after=self.remove_after,
99+
httpc=self.httpc, httpc_params=self.httpc_params)
100+
self._issuers[issuer_id] = _issuer
101+
return _issuer
102102

103103
def items(self):
104104
"""
@@ -121,10 +121,10 @@ def return_issuer(self, issuer_id):
121121
:param issuer_id: The issuer ID
122122
:return: A KeyIssuer instance
123123
"""
124-
_iss = self._get_issuer(issuer_id)
125-
if _iss is None:
124+
_issuer = self._get_issuer(issuer_id)
125+
if _issuer is None:
126126
return self._add_issuer(issuer_id)
127-
return _iss
127+
return _issuer
128128

129129
@deprecated_alias(issuer='issuer_id', owner='issuer_id')
130130
def add_url(self, issuer_id: str, url: str, **kwargs) -> KeyBundle:
@@ -252,9 +252,8 @@ def get_issuer_keys(self, issuer_id):
252252
"""
253253
_issuer = self._get_issuer(issuer_id)
254254
if _issuer is None:
255-
raise KeyError(issuer_id)
256-
else:
257-
return _issuer.all_keys()
255+
return []
256+
return _issuer.all_keys()
258257

259258
@deprecated_alias(issuer='issuer_id', owner='issuer_id')
260259
def __contains__(self, issuer_id):
@@ -272,7 +271,10 @@ def __getitem__(self, issuer_id=''):
272271
:param issuer_id: The entity ID
273272
:return: A KeyIssuer instance
274273
"""
275-
return self._get_issuer(issuer_id)
274+
_issuer = self._get_issuer(issuer_id)
275+
if _issuer is None:
276+
raise KeyError(issuer_id)
277+
return _issuer
276278

277279
@deprecated_alias(issuer='issuer_id', owner='issuer_id')
278280
def __setitem__(self, issuer_id, key_issuer):

tests/test_04_key_jar.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,8 @@ def test_get_wrong_owner():
733733
assert kj.get('sig', 'rsa') == []
734734

735735
assert 'https://delphi.example.com' not in kj
736-
assert kj['https://delphi.example.com'] == None
736+
with pytest.raises(KeyError):
737+
kj['https://delphi.example.com']
737738

738739

739740
def test_match_owner():

0 commit comments

Comments
 (0)