From d2dcf5a1060d60c451570349a6a06ad102d6924c Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Tue, 13 Nov 2012 21:54:04 +0900
Subject: fix missing provider parameter in leapconfig objects chain

---
 src/leap/gui/firstrun/last.py          | 1 +
 src/leap/gui/firstrun/providerinfo.py  | 9 ++++++---
 src/leap/gui/firstrun/regvalidation.py | 9 +++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'src/leap/gui/firstrun')

diff --git a/src/leap/gui/firstrun/last.py b/src/leap/gui/firstrun/last.py
index 6f9abbb5..13b2f548 100644
--- a/src/leap/gui/firstrun/last.py
+++ b/src/leap/gui/firstrun/last.py
@@ -28,6 +28,7 @@ class LastPage(QtGui.QWizardPage):
         self.label = QtGui.QLabel()
         self.label.setWordWrap(True)
 
+        # XXX REFACTOR to a Validating Page...
         self.status_line_1 = QtGui.QLabel()
         self.status_line_2 = QtGui.QLabel()
         self.status_line_3 = QtGui.QLabel()
diff --git a/src/leap/gui/firstrun/providerinfo.py b/src/leap/gui/firstrun/providerinfo.py
index ef3b32c1..e642fcd0 100644
--- a/src/leap/gui/firstrun/providerinfo.py
+++ b/src/leap/gui/firstrun/providerinfo.py
@@ -99,9 +99,6 @@ class ProviderInfoPage(ValidationPage):
 
         wizard = self.wizard()
         prevpage = "providerselection"
-        netchecker = wizard.netchecker()
-        providercertchecker = wizard.providercertchecker()
-        eipconfigchecker = wizard.eipconfigchecker()
 
         full_domain = self.field('provider_domain')
 
@@ -109,6 +106,10 @@ class ProviderInfoPage(ValidationPage):
         domain, port = get_https_domain_and_port(full_domain)
         _domain = u"%s:%s" % (domain, port) if port != 443 else unicode(domain)
 
+        netchecker = wizard.netchecker()
+        providercertchecker = wizard.providercertchecker()
+        eipconfigchecker = wizard.eipconfigchecker(domain=_domain)
+
         update_signal.emit("head_sentinel", 0)
         pause_for_user()
 
@@ -178,6 +179,8 @@ class ProviderInfoPage(ValidationPage):
 
         update_signal.emit("Downloading provider info", 70)
         try:
+            # XXX we already set _domain in the initialization
+            # so it should not be needed here.
             eipconfigchecker.fetch_definition(domain=_domain)
             wizard.set_providerconfig(
                 eipconfigchecker.defaultprovider.config)
diff --git a/src/leap/gui/firstrun/regvalidation.py b/src/leap/gui/firstrun/regvalidation.py
index e85c2ac6..6681b953 100644
--- a/src/leap/gui/firstrun/regvalidation.py
+++ b/src/leap/gui/firstrun/regvalidation.py
@@ -57,6 +57,7 @@ class RegisterUserValidationPage(ValidationPage):
         wizard = self.wizard()
         full_domain = self.field('provider_domain')
         domain, port = get_https_domain_and_port(full_domain)
+        _domain = u"%s:%s" % (domain, port) if port != 443 else unicode(domain)
 
         # FIXME #BUG 638 FIXME FIXME FIXME
         verify = False  # !!!!!!!!!!!!!!!!
@@ -77,7 +78,8 @@ class RegisterUserValidationPage(ValidationPage):
         password = self.field(passwk)
         credentials = username, password
 
-        eipconfigchecker = wizard.eipconfigchecker()
+        eipconfigchecker = wizard.eipconfigchecker(domain=_domain)
+        #XXX change for _domain (sanitized)
         pCertChecker = wizard.providercertchecker(
             domain=full_domain)
 
@@ -174,6 +176,7 @@ class RegisterUserValidationPage(ValidationPage):
         # 3) getting client certificate
         ##################################################
         # XXX maybe only do this if we come from signup
+
         step = "fetch_eipcert"
         fetching_clientcert_msg = "Fetching eip certificate"
         update_signal.emit(fetching_clientcert_msg, 80)
@@ -199,7 +202,7 @@ class RegisterUserValidationPage(ValidationPage):
         pause_for_user()
 
         # here we go! :)
-        self.run_eip_checks_for_provider_and_connect(domain)
+        self.run_eip_checks_for_provider_and_connect(_domain)
 
     def run_eip_checks_for_provider_and_connect(self, domain):
         wizard = self.wizard()
@@ -208,6 +211,8 @@ class RegisterUserValidationPage(ValidationPage):
             wizard,
             'start_eipconnection_signal', None)
 
+        import pdb4qt; pdb4qt.set_trace()
+
         if conductor:
             conductor.set_provider_domain(domain)
             conductor.run_checks()
-- 
cgit v1.2.3