From 5173c0ee937696782a2f62078a860246ec388c39 Mon Sep 17 00:00:00 2001 From: kali Date: Tue, 25 Sep 2012 05:48:06 +0900 Subject: workaround for #638 and fix for eip config check for gateways (we were picking gateway in a wrong way) Closes #610. --- src/leap/eip/checks.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/leap/eip/checks.py') diff --git a/src/leap/eip/checks.py b/src/leap/eip/checks.py index ef09a582..9b7b1cee 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 -- cgit v1.2.3