Skip to content

Commit a77d427

Browse files
committed
do_remote is private
1 parent ae77810 commit a77d427

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/cryptojwt/key_bundle.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ def _do_local_der(self, filename, keytype, keyusage=None, kid=""):
442442
self.time_out = self.last_local + self.cache_time
443443
return True
444444

445-
def do_remote(self):
445+
def _do_remote(self):
446446
"""
447447
Load a JWKS from a webpage.
448448
@@ -564,7 +564,7 @@ def update(self):
564564
elif self.fileformat == "der":
565565
updated = self._do_local_der(self.source, self.keytype, self.keyusage)
566566
elif self.remote:
567-
updated = self.do_remote()
567+
updated = self._do_remote()
568568
except Exception as err:
569569
LOGGER.error("Key bundle update failed: %s", err)
570570
self._keys = _old_keys # restore

tests/test_03_key_bundle.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ def test_httpc_params_1():
480480
rsps.add(method=responses.GET, url=source, json=JWKS_DICT, status=200)
481481
httpc_params = {"timeout": (2, 2)} # connect, read timeouts in seconds
482482
kb = KeyBundle(source=source, httpc=requests.request, httpc_params=httpc_params)
483-
assert kb.do_remote()
483+
assert kb._do_remote()
484484

485485

486486
@pytest.mark.network
@@ -926,7 +926,7 @@ def test_remote():
926926
rsps.add(method="GET", url=source, json=JWKS_DICT, status=200)
927927
httpc_params = {"timeout": (2, 2)} # connect, read timeouts in seconds
928928
kb = KeyBundle(source=source, httpc=requests.request, httpc_params=httpc_params)
929-
kb.do_remote()
929+
kb._do_remote()
930930

931931
exp = kb.dump()
932932
kb2 = KeyBundle().load(exp)
@@ -954,13 +954,13 @@ def test_remote_not_modified():
954954

955955
with responses.RequestsMock() as rsps:
956956
rsps.add(method="GET", url=source, json=JWKS_DICT, status=200, headers=headers)
957-
assert kb.do_remote()
957+
assert kb._do_remote()
958958
assert kb.last_remote == headers.get("Last-Modified")
959959
timeout1 = kb.time_out
960960

961961
with responses.RequestsMock() as rsps:
962962
rsps.add(method="GET", url=source, status=304, headers=headers)
963-
assert not kb.do_remote()
963+
assert not kb._do_remote()
964964
assert kb.last_remote == headers.get("Last-Modified")
965965
timeout2 = kb.time_out
966966

@@ -994,19 +994,19 @@ def test_ignore_errors_period():
994994
httpc_params=httpc_params,
995995
ignore_errors_period=ignore_errors_period,
996996
)
997-
res = kb.do_remote()
997+
res = kb._do_remote()
998998
assert res == True
999999
assert kb.ignore_errors_until is None
10001000

10011001
# refetch, but fail by using a bad source
10021002
kb.source = source_bad
10031003
try:
1004-
res = kb.do_remote()
1004+
res = kb._do_remote()
10051005
except UpdateFailed:
10061006
pass
10071007

10081008
# retry should fail silently as we're in holddown
1009-
res = kb.do_remote()
1009+
res = kb._do_remote()
10101010
assert kb.ignore_errors_until is not None
10111011
assert res == False
10121012

@@ -1015,7 +1015,7 @@ def test_ignore_errors_period():
10151015

10161016
# try again
10171017
kb.source = source_good
1018-
res = kb.do_remote()
1018+
res = kb._do_remote()
10191019
assert res == True
10201020

10211021

@@ -1037,7 +1037,7 @@ def test_exclude_attributes():
10371037
rsps.add(method="GET", url=source, json=JWKS_DICT, status=200)
10381038
httpc_params = {"timeout": (2, 2)} # connect, read timeouts in seconds
10391039
kb = KeyBundle(source=source, httpc=requests.request, httpc_params=httpc_params)
1040-
kb.do_remote()
1040+
kb._do_remote()
10411041

10421042
exp = kb.dump(exclude_attributes=["cache_time", "ignore_invalid_keys"])
10431043
kb2 = KeyBundle(cache_time=600, ignore_invalid_keys=False).load(exp)
@@ -1052,7 +1052,7 @@ def test_remote_dump_json():
10521052
rsps.add(method="GET", url=source, json=JWKS_DICT, status=200)
10531053
httpc_params = {"timeout": (2, 2)} # connect, read timeouts in seconds
10541054
kb = KeyBundle(source=source, httpc=requests.request, httpc_params=httpc_params)
1055-
kb.do_remote()
1055+
kb._do_remote()
10561056

10571057
exp = kb.dump()
10581058
assert json.dumps(exp)

0 commit comments

Comments
 (0)