From 0d35f2a82bf15504ace2135af3e0c66ae1c16874 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Tue, 18 Sep 2012 11:11:43 +0900
Subject: do_branding command added to setup

---
 src/leap/eip/checks.py            | 14 +++++++++-----
 src/leap/eip/eipconnection.py     |  4 +++-
 src/leap/eip/openvpnconnection.py |  7 +++----
 src/leap/eip/specs.py             | 10 ++++++++--
 4 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'src/leap/eip')

diff --git a/src/leap/eip/checks.py b/src/leap/eip/checks.py
index f368c551..aea5a5d7 100644
--- a/src/leap/eip/checks.py
+++ b/src/leap/eip/checks.py
@@ -257,7 +257,7 @@ class ProviderCertChecker(object):
         return True
 
     def _get_client_cert_uri(self):
-        return "https://%s/cert/get" % (baseconstants.DEFAULT_TEST_PROVIDER)
+        return "https://%s/cert/get" % (baseconstants.DEFAULT_PROVIDER)
 
     def _get_client_cert_path(self):
         # MVS+ : get provider path
@@ -414,14 +414,18 @@ class EIPConfigChecker(object):
 
     def _get_provider_definition_uri(self, domain=None, path=None):
         if domain is None:
-            domain = baseconstants.DEFAULT_TEST_PROVIDER
+            domain = baseconstants.DEFAULT_PROVIDER
         if path is None:
             path = baseconstants.DEFINITION_EXPECTED_PATH
-        return "https://%s/%s" % (domain, path)
+        uri = u"https://%s/%s" % (domain, path)
+        logger.debug('getting provider definition from %s' % uri)
+        return uri
 
     def _get_eip_service_uri(self, domain=None, path=None):
         if domain is None:
-            domain = baseconstants.DEFAULT_TEST_PROVIDER
+            domain = baseconstants.DEFAULT_PROVIDER
         if path is None:
             path = eipconstants.EIP_SERVICE_EXPECTED_PATH
-        return "https://%s/%s" % (domain, path)
+        uri = "https://%s/%s" % (domain, path)
+        logger.debug('getting eip service file from %s', uri)
+        return uri
diff --git a/src/leap/eip/eipconnection.py b/src/leap/eip/eipconnection.py
index 3a879f01..d1c84b2a 100644
--- a/src/leap/eip/eipconnection.py
+++ b/src/leap/eip/eipconnection.py
@@ -4,6 +4,7 @@ EIP Connection Class
 from __future__ import (absolute_import,)
 import logging
 import Queue
+import sys
 
 from leap.eip.checks import EIPConfigChecker
 from leap.eip import config as eipconfig
@@ -48,7 +49,8 @@ class EIPConnection(OpenVPNConnection):
             self.config_checker.run_all(skip_download=skip_download)
             self.run_openvpn_checks()
         except Exception as exc:
-            self.error_queue.put(exc)
+            exc_traceback = sys.exc_info()[2]
+            self.error_queue.put((exc, exc_traceback))
 
     def connect(self):
         """
diff --git a/src/leap/eip/openvpnconnection.py b/src/leap/eip/openvpnconnection.py
index c280f70d..65683485 100644
--- a/src/leap/eip/openvpnconnection.py
+++ b/src/leap/eip/openvpnconnection.py
@@ -117,11 +117,10 @@ to be triggered for each one of them.
         """
         try:
             eip_config.check_vpn_keys()
-        except eip_exceptions.EIPInitNoKeyFileError:
-            self.missing_vpn_keyfile = True
         except eip_exceptions.EIPInitBadKeyFilePermError:
-            logger.error('error while checking vpn keys')
-            self.bad_keyfile_perms = True
+            logger.error('Bad VPN Keys permission!')
+            # do nothing now
+        # and raise the rest ...
 
     def _launch_openvpn(self):
         """
diff --git a/src/leap/eip/specs.py b/src/leap/eip/specs.py
index e617574c..05aef590 100644
--- a/src/leap/eip/specs.py
+++ b/src/leap/eip/specs.py
@@ -1,15 +1,21 @@
 from __future__ import (unicode_literals)
 import os
 
+from leap import __branding
 from leap.base import config as baseconfig
 
+PROVIDER_CA_CERT = __branding.get(
+    'provider_ca_file',
+    'testprovider-ca-cert.pem')
 
 provider_ca_path = lambda: unicode(os.path.join(
     baseconfig.get_default_provider_path(),
     'keys', 'ca',
-    'testprovider-ca-cert.pem'
+    PROVIDER_CA_CERT
 ))
 
+PROVIDER_DOMAIN = __branding.get('provider_domain', 'testprovider.example.org')
+
 
 client_cert_path = lambda: unicode(os.path.join(
     baseconfig.get_default_provider_path(),
@@ -20,7 +26,7 @@ client_cert_path = lambda: unicode(os.path.join(
 eipconfig_spec = {
     'provider': {
         'type': unicode,
-        'default': u"testprovider.example.org",
+        'default': u"%s" % PROVIDER_DOMAIN,
         'required': True,
     },
     'transport': {
-- 
cgit v1.2.3