From a38e61691a79b20199cdedf23f60a5760bba7a06 Mon Sep 17 00:00:00 2001 From: kali Date: Fri, 21 Sep 2012 06:44:19 +0900 Subject: add property to baseconfig config instead of get_config() --- src/leap/eip/checks.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/leap/eip/checks.py') diff --git a/src/leap/eip/checks.py b/src/leap/eip/checks.py index ef09a582..5ace1479 100644 --- a/src/leap/eip/checks.py +++ b/src/leap/eip/checks.py @@ -388,7 +388,7 @@ class EIPConfigChecker(object): This is catched by ui and runs FirstRunWizard (MVS+) """ if config is None: - config = self.eipconfig.get_config() + config = self.eipconfig.config logger.debug('checking default provider') provider = config.get('provider', None) if provider is None: @@ -412,7 +412,7 @@ class EIPConfigChecker(object): logger.debug('(fetching def skipped)') return True if config is None: - config = self.defaultprovider.get_config() + config = self.defaultprovider.config if uri is None: domain = config.get('provider', None) uri = self._get_provider_definition_uri(domain=domain) @@ -429,7 +429,7 @@ class EIPConfigChecker(object): if skip_download: return True if config is None: - config = self.eipserviceconfig.get_config() + config = self.eipserviceconfig.config if uri is None: domain = config.get('provider', None) uri = self._get_eip_service_uri(domain=domain) @@ -440,7 +440,7 @@ class EIPConfigChecker(object): def check_complete_eip_config(self, config=None): # TODO check for gateway if config is None: - config = self.eipconfig.get_config() + config = self.eipconfig.config try: 'trying assertions' assert 'provider' in config -- cgit v1.2.3 From abf481cab381a86d8a9c5607a131b56636081382 Mon Sep 17 00:00:00 2001 From: kali Date: Tue, 25 Sep 2012 05:48:06 +0900 Subject: refactored jsonconfig, included jsonschema validation and type casting. --- 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 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 -- cgit v1.2.3