summaryrefslogtreecommitdiff
path: root/src/leap/eip
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-01-10 02:00:21 +0900
committerkali <kali@leap.se>2013-01-10 02:00:21 +0900
commitf55dcd717a946651492142ed198853b1c667254b (patch)
tree5e058f6648f589933582fc27a65b58c5c4a39f0d /src/leap/eip
parent6fe187c4ea2a32105c712d34167058707f8f82f8 (diff)
renamed connection page
Diffstat (limited to 'src/leap/eip')
-rw-r--r--src/leap/eip/checks.py22
1 files changed, 8 insertions, 14 deletions
diff --git a/src/leap/eip/checks.py b/src/leap/eip/checks.py
index a002e2d9..b14e5dd3 100644
--- a/src/leap/eip/checks.py
+++ b/src/leap/eip/checks.py
@@ -164,13 +164,12 @@ class ProviderCertChecker(object):
try:
self.fetcher.get(uri, verify=verify)
- except requests.exceptions.SSLError as exc:
+ except requests.exceptions.SSLError: # as exc:
logger.error("SSLError")
- # XXX RAISE! See #638
- #raise eipexceptions.HttpsBadCertError
- logger.warning('BUG #638 CERT VERIFICATION FAILED! '
- '(this should be CRITICAL)')
- logger.warning('SSLError: %s', exc.message)
+ raise eipexceptions.HttpsBadCertError
+ #logger.warning('BUG #638 CERT VERIFICATION FAILED! '
+ #'(this should be CRITICAL)')
+ #logger.warning('SSLError: %s', exc.message)
except requests.exceptions.ConnectionError:
logger.error('ConnectionError')
@@ -225,12 +224,7 @@ class ProviderCertChecker(object):
return fgetfn(*args, **kwargs)
try:
- # XXX FIXME!!!!
- # verify=verify
- # Workaround for #638. return to verification
- # when That's done!!!
- #req = self.fetcher.get(uri, verify=False)
- req = getfn(uri, verify=False)
+ req = getfn(uri, verify=verify)
req.raise_for_status()
except requests.exceptions.SSLError:
@@ -444,8 +438,8 @@ class EIPConfigChecker(object):
# FIXME FIXME FIXME
self.defaultprovider.load(
from_uri=uri,
- fetcher=self.fetcher,
- verify=False)
+ fetcher=self.fetcher)
+ #verify=False)
self.defaultprovider.save()
def fetch_eip_service_config(self, skip_download=False,