add timeout to config and httpbase

Author: Xiao Zhu

src/saml2/config.py

@@ -76,6 +76,7 @@
     "name_id_format",
     "signing_algorithm",
     "digest_algorithm",
+    "timeout",
 ]
 
 SP_ARGS = [
@@ -228,6 +229,7 @@ def __init__(self, homedir="."):
         self.delete_tmpfiles = True
         self.signing_algorithm = None
         self.digest_algorithm = None
+        self.timeout = None
 
     def setattr(self, context, attr, val):
         if context == "":

src/saml2/entity.py

@@ -175,7 +175,7 @@ def __init__(self, entity_type, config=None, config_file="",
 
         HTTPBase.__init__(self, self.config.verify_ssl_cert,
                           self.config.ca_certs, self.config.key_file,
-                          self.config.cert_file)
+                          self.config.cert_file, self.config.timeout)
 
         if self.config.vorg:
             for vo in self.config.vorg.values():

src/saml2/httpbase.py

@@ -100,7 +100,7 @@ def dict2set_list(dic):
 
 class HTTPBase(object):
     def __init__(self, verify=True, ca_bundle=None, key_file=None,
-                 cert_file=None):
+                 cert_file=None, timeout=None):
         self.request_args = {"allow_redirects": False}
         #self.cookies = {}
         self.cookiejar = http_cookiejar.CookieJar()
@@ -111,6 +111,7 @@ def __init__(self, verify=True, ca_bundle=None, key_file=None,
                 self.request_args["verify"] = ca_bundle
             if key_file:
                 self.request_args["cert"] = (cert_file, key_file)
+        self.request_args["timeout"] = timeout
 
         self.sec = None
         self.user = None

src/saml2/mdstore.py

@@ -1032,9 +1032,9 @@ def __init__(self, attrc, config, ca_certs=None,
         MetaData.__init__(self, attrc, check_validity=check_validity)
 
         if disable_ssl_certificate_validation:
-            self.http = HTTPBase(verify=False, ca_bundle=ca_certs)
+            self.http = HTTPBase(verify=False, ca_bundle=ca_certs, timeout=config.timeout)
         else:
-            self.http = HTTPBase(verify=True, ca_bundle=ca_certs)
+            self.http = HTTPBase(verify=True, ca_bundle=ca_certs, timeout=config.timeout)
 
         self.security = security_context(config)
         self.ii = 0