diff options
author | kali <kali@leap.se> | 2012-09-25 05:48:06 +0900 |
---|---|---|
committer | kali <kali@leap.se> | 2012-10-02 05:27:15 +0900 |
commit | abf481cab381a86d8a9c5607a131b56636081382 (patch) | |
tree | 813ef6de78207cde08da6afa5f73e5d52af1e385 /src/leap/eip/checks.py | |
parent | 5d8e518d03e9fd045a75a63fec79b52392266c26 (diff) |
refactored jsonconfig, included jsonschema validation
and type casting.
Diffstat (limited to 'src/leap/eip/checks.py')
-rw-r--r-- | src/leap/eip/checks.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/leap/eip/checks.py b/src/leap/eip/checks.py index 5ace1479..898af2fe 100644 --- a/src/leap/eip/checks.py +++ b/src/leap/eip/checks.py @@ -197,7 +197,8 @@ class ProviderCertChecker(object): logger.warning('False! CERT VERIFICATION FAILED! ' '(this should be CRITICAL)') logger.warning('SSLError: %s', exc.message) - raise eipexceptions.EIPBadCertError + # XXX RAISE! See #638 + #raise eipexceptions.EIPBadCertError # XXX get requests.exceptions.ConnectionError Errno 110 # Connection timed out, and raise ours. else: @@ -227,7 +228,11 @@ class ProviderCertChecker(object): if verify is True and self.cacert is not None: verify = self.cacert try: - req = self.fetcher.get(uri, verify=verify) + # XXX FIXME!!!! + # verify=verify + # Workaround for #638. return to verification + # when That's done!!! + req = self.fetcher.get(uri, verify=False) req.raise_for_status() except requests.exceptions.SSLError: logger.warning('SSLError while fetching cert. ' @@ -452,6 +457,7 @@ class EIPConfigChecker(object): # XXX TODO: # We should WRITE eip config if missing or # incomplete at this point + #self.eipconfig.save() # # private helpers |