diff options
| -rw-r--r-- | src/leap/eip/checks.py | 7 | ||||
| -rw-r--r-- | src/leap/gui/firstrun/regvalidation.py | 32 |
2 files changed, 11 insertions, 28 deletions
diff --git a/src/leap/eip/checks.py b/src/leap/eip/checks.py index 9bd96a1c..caaef2ea 100644 --- a/src/leap/eip/checks.py +++ b/src/leap/eip/checks.py @@ -212,11 +212,16 @@ class ProviderCertChecker(object): if credentials: user, passwd = credentials - @srpauth_protected(user, passwd, verify) + logger.debug('domain = %s', self.domain) + + @srpauth_protected(user, passwd, + server="https://%s" % self.domain, + verify=verify) def getfn(*args, **kwargs): return fgetfn(*args, **kwargs) else: + # XXX FIXME fix decorated args @magick_srpauth(verify) def getfn(*args, **kwargs): return fgetfn(*args, **kwargs) diff --git a/src/leap/gui/firstrun/regvalidation.py b/src/leap/gui/firstrun/regvalidation.py index f6d69a60..7f149ae7 100644 --- a/src/leap/gui/firstrun/regvalidation.py +++ b/src/leap/gui/firstrun/regvalidation.py @@ -68,38 +68,16 @@ class RegisterUserValidationPage(ValidationPage): eipconfigchecker = wizard.eipconfigchecker() pCertChecker = wizard.providercertchecker( - domain=domain) + domain=full_domain) ########################################### # XXX this only should be setup # if not from_login. - if wizard and wizard.debug_server: - # We're debugging - # XXX remove this branch? - dbgsrv = wizard.debug_server - schema = dbgsrv.scheme - netloc = dbgsrv.netloc - port = None - netloc_split = netloc.split(':') - if len(netloc_split) > 1: - provider, port = netloc_split - else: - provider = netloc - - signup = auth.LeapSRPRegister( - scheme=schema, - provider=provider, - port=port, - verify=verify) - - else: - # this is the real thing - signup = auth.LeapSRPRegister( - schema="https", - port=port, - provider=domain, - verify=verify) + signup = auth.LeapSRPRegister( + schema="https", + provider=full_domain, + verify=verify) update_signal.emit("head_sentinel", 0) |