all calls except the first one are made to api uri

we also parse the port number

3 files changed, 34 insertions, 41 deletions

diff --git a/src/leap/gui/firstrun/connect.py b/src/leap/gui/firstrun/connect.py
index 920ada50..b7688380 100644
--- a/src/leap/gui/firstrun/connect.py
+++ b/src/leap/gui/firstrun/connect.py
@@ -44,9 +44,15 @@ class ConnectionPage(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)
 
-        verify = True
+        pconfig = wizard.eipconfigchecker(domain=domain)
+        # this should be persisted...
+        pconfig.defaultprovider.load()
+        pconfig.set_api_domain()
+
+        pCertChecker = wizard.providercertchecker(
+            domain=domain)
+        pCertChecker.set_api_domain(pconfig.apidomain)
 
         ###########################################
         # Set Credentials.
@@ -63,11 +69,6 @@ class ConnectionPage(ValidationPage):
         password = self.field(passwk)
         credentials = username, password
 
-        eipconfigchecker = wizard.eipconfigchecker(domain=_domain)
-        #XXX change for _domain (sanitized)
-        pCertChecker = wizard.providercertchecker(
-            domain=full_domain)
-
         yield(("head_sentinel", 0), lambda: None)
 
         ##################################################
@@ -75,8 +76,7 @@ class ConnectionPage(ValidationPage):
         ##################################################
         def fetcheipconf():
             try:
-                eipconfigchecker.fetch_eip_service_config(
-                    domain=full_domain)
+                pconfig.fetch_eip_service_config()
 
             # XXX get specific exception
             except Exception as exc:
@@ -92,8 +92,7 @@ class ConnectionPage(ValidationPage):
         def fetcheipcert():
             try:
                 downloaded = pCertChecker.download_new_client_cert(
-                    credentials=credentials,
-                    verify=verify)
+                    credentials=credentials)
                 if not downloaded:
                     logger.error('Could not download client cert.')
                     return False
@@ -101,6 +100,9 @@ class ConnectionPage(ValidationPage):
             except auth.SRPAuthenticationError as exc:
                 return self.fail(self.tr(
                     "Authentication error: %s" % exc.message))
+
+            except Exception as exc:
+                return self.fail(exc.message)
             else:
                 return True
 
diff --git a/src/leap/gui/firstrun/providersetup.py b/src/leap/gui/firstrun/providersetup.py
index 48a89091..981e3214 100644
--- a/src/leap/gui/firstrun/providersetup.py
+++ b/src/leap/gui/firstrun/providersetup.py
@@ -4,6 +4,8 @@ used if First Run Wizard
 """
 import logging
 
+import requests
+
 from PyQt4 import QtGui
 
 from leap.base import exceptions as baseexceptions
@@ -110,26 +112,15 @@ class ProviderSetupValidationPage(ValidationPage):
         #########################
 
         def validatecacert():
-            pass
-            #api_uri = pconfig.get('api_uri', None)
-            #try:
-                #api_cert_verified = pCertChecker.verify_api_https(api_uri)
-            #except requests.exceptions.SSLError as exc:
-                #logger.error('BUG #638. %s' % exc.message)
-                # XXX RAISE! See #638
-                # bypassing until the hostname is fixed.
-                # We probably should raise yet-another-warning
-                # here saying user that the hostname "XX.XX.XX.XX' does not
-                # match 'foo.bar.baz'
-                #api_cert_verified = True
-
-            #if not api_cert_verified:
-                # XXX update validationMsg
-                # should catch exception
-                #return False
-
-            #???
-            #ca_cert_path = checker.ca_cert_path
+            api_uri = pconfig.get('api_uri', None)
+            try:
+                pCertChecker.verify_api_https(api_uri)
+            except requests.exceptions.SSLError as exc:
+                return self.fail("Validation Error")
+            except Exception as exc:
+                return self.fail(exc.msg)
+            else:
+                return True
 
         yield((self.tr('Validating api certificate'), 90), validatecacert)
 
@@ -141,8 +132,8 @@ class ProviderSetupValidationPage(ValidationPage):
         called after _do_checks has finished
         (connected to checker thread finished signal)
         """
-        prevpage = "providerselection" if self.is_signup else "login"
         wizard = self.wizard()
+        prevpage = "login" if wizard.from_login else "providerselection"
 
         if self.errors:
             logger.debug('going back with errors')
diff --git a/src/leap/gui/firstrun/register.py b/src/leap/gui/firstrun/register.py
index b04638e0..741b9267 100644
--- a/src/leap/gui/firstrun/register.py
+++ b/src/leap/gui/firstrun/register.py
@@ -224,11 +224,17 @@ class RegisterUserPage(InlineValidationPage, UserFormMixIn):
         generator that yields actual checks
         that are executed in a separate thread
         """
+        wizard = self.wizard()
+
         provider = self.field('provider_domain')
         username = self.userNameLineEdit.text()
         password = self.userPasswordLineEdit.text()
         password2 = self.userPassword2LineEdit.text()
 
+        pconfig = wizard.eipconfigchecker(domain=provider)
+        pconfig.defaultprovider.load()
+        pconfig.set_api_domain()
+
         def checkpass():
             # we better have here
             # some call to a password checker...
@@ -263,14 +269,11 @@ class RegisterUserPage(InlineValidationPage, UserFormMixIn):
             self, "showStepsFrame")
 
         def register():
-            # XXX FIXME!
-            verify = False
 
             signup = auth.LeapSRPRegister(
                 schema="https",
-                provider=provider,
-                verify=verify)
-            #import ipdb;ipdb.set_trace()
+                provider=pconfig.apidomain,
+                verify=pconfig.cacert)
             try:
                 ok, req = signup.register_user(
                     username, password)
@@ -381,7 +384,4 @@ class RegisterUserPage(InlineValidationPage, UserFormMixIn):
 
     def nextId(self):
         wizard = self.wizard()
-        #if not wizard:
-            #return
-        # XXX this should be called connect
-        return wizard.get_page_index('signupvalidation')
+        return wizard.get_page_index('connect')