diff options
| author | Xiao Zhu <xzhu@twitter.com> | 2021-10-20 17:41:45 -0700 |
|---|---|---|
| committer | Ivan Kanakarakis <ivan.kanak@gmail.com> | 2022-04-19 14:05:13 +0300 |
| commit | c290f1c06e0548ed850403d46959b36cf62c0ba6 (patch) | |
| tree | 5c5218b9454dffe5f236d187b063f9952c0a81ba | |
| parent | f08d6d4e7f64c2b84c2acf7dee56e24387ce7dcc (diff) | |
| download | pysaml2-c290f1c06e0548ed850403d46959b36cf62c0ba6.tar.gz | |
tests fixed
| -rw-r--r-- | src/saml2/config.py | 8 | ||||
| -rw-r--r-- | src/saml2/ecp_client.py | 2 | ||||
| -rw-r--r-- | src/saml2/mdstore.py | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/saml2/config.py b/src/saml2/config.py index f7cf76c3..a5dea2aa 100644 --- a/src/saml2/config.py +++ b/src/saml2/config.py @@ -383,11 +383,13 @@ class Config(object): disable_validation = False mds = MetadataStore( - acs, self, ca_certs, disable_ssl_certificate_validation=disable_validation + acs, + self, + ca_certs, + disable_ssl_certificate_validation=disable_validation, + timeout=self.timeout, ) - mds.imp(metadata_conf) - return mds def endpoint(self, service, binding=None, context=None): diff --git a/src/saml2/ecp_client.py b/src/saml2/ecp_client.py index 94cfe135..9e1936c0 100644 --- a/src/saml2/ecp_client.py +++ b/src/saml2/ecp_client.py @@ -78,7 +78,7 @@ class Client(Entity): self._verbose = verbose if metadata_file: - self._metadata = MetadataStore([saml, samlp], None, config) + self._metadata = MetadataStore([saml, samlp], None, config, timeout=config.timeout) self._metadata.load("local", metadata_file) logger.debug("Loaded metadata from '%s'", metadata_file) else: diff --git a/src/saml2/mdstore.py b/src/saml2/mdstore.py index d882dc1e..974fb169 100644 --- a/src/saml2/mdstore.py +++ b/src/saml2/mdstore.py @@ -1022,7 +1022,7 @@ class MetadataStore(MetaData): def __init__(self, attrc, config, ca_certs=None, check_validity=True, disable_ssl_certificate_validation=False, - filter=None): + filter=None, timeout=None): """ :params attrc: :params config: Config() @@ -1032,9 +1032,9 @@ class MetadataStore(MetaData): MetaData.__init__(self, attrc, check_validity=check_validity) if disable_ssl_certificate_validation: - self.http = HTTPBase(verify=False, ca_bundle=ca_certs, timeout=config.timeout) + self.http = HTTPBase(verify=False, ca_bundle=ca_certs, timeout=timeout) else: - self.http = HTTPBase(verify=True, ca_bundle=ca_certs, timeout=config.timeout) + self.http = HTTPBase(verify=True, ca_bundle=ca_certs, timeout=timeout) self.security = security_context(config) self.ii = 0 |