File tree Expand file tree Collapse file tree 4 files changed +11
-1
lines changed Expand file tree Collapse file tree 4 files changed +11
-1
lines changed Original file line number Diff line number Diff line change 35
35
KEYLOADERR = "Failed to load %s key from '%s' (%s)"
36
36
REMOTE_FAILED = "Remote key update from '{}' failed, HTTP status {}"
37
37
MALFORMED = "Remote key update from {} failed, malformed JWKS."
38
+ DEFAULT_HTTPC_TIMEOUT = 10
38
39
39
40
LOGGER = logging .getLogger (__name__ )
40
41
@@ -254,6 +255,8 @@ def __init__(
254
255
self .httpc = requests .request
255
256
256
257
self .httpc_params = httpc_params or {}
258
+ if "timeout" not in self .httpc_params :
259
+ self .httpc_params ["timeout" ] = DEFAULT_HTTPC_TIMEOUT
257
260
258
261
if keys :
259
262
self .source = None
Original file line number Diff line number Diff line change 8
8
9
9
from .jwe .utils import alg2keytype as jwe_alg2keytype
10
10
from .jws .utils import alg2keytype as jws_alg2keytype
11
+ from .key_bundle import DEFAULT_HTTPC_TIMEOUT
11
12
from .key_bundle import KeyBundle
12
13
from .key_bundle import build_key_bundle
13
14
from .key_bundle import key_diff
@@ -58,6 +59,8 @@ def __init__(
58
59
self .ca_certs = ca_certs
59
60
self .httpc = httpc or request
60
61
self .httpc_params = httpc_params or {}
62
+ if "timeout" not in self .httpc_params :
63
+ self .httpc_params ["timeout" ] = DEFAULT_HTTPC_TIMEOUT
61
64
self .keybundle_cls = keybundle_cls
62
65
self .name = name
63
66
self .remove_after = remove_after
Original file line number Diff line number Diff line change 8
8
from .exception import IssuerNotFound
9
9
from .jwe .jwe import alg2keytype as jwe_alg2keytype
10
10
from .jws .utils import alg2keytype as jws_alg2keytype
11
+ from .key_bundle import DEFAULT_HTTPC_TIMEOUT
11
12
from .key_bundle import KeyBundle
12
13
from .key_issuer import KeyIssuer
13
14
from .key_issuer import build_keyissuer
@@ -51,6 +52,9 @@ def __init__(
51
52
self .remove_after = remove_after
52
53
self .httpc = httpc or request
53
54
self .httpc_params = httpc_params or {}
55
+ if "timeout" not in self .httpc_params :
56
+ self .httpc_params ["timeout" ] = DEFAULT_HTTPC_TIMEOUT
57
+
54
58
# Now part of httpc_params
55
59
# self.verify_ssl = verify_ssl
56
60
if not self .httpc_params : # backward compatibility
Original file line number Diff line number Diff line change @@ -774,7 +774,7 @@ def test_localhost_url():
774
774
775
775
kb = issuer .find (url )
776
776
assert len (kb ) == 1
777
- assert kb [0 ].httpc_params == {"verify" : False }
777
+ assert kb [0 ].httpc_params == {"timeout" : 10 , " verify" : False }
778
778
779
779
780
780
def test_add_url ():
You can’t perform that action at this time.
0 commit comments