summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-11-14 02:41:07 +0900
committerkali <kali@leap.se>2012-11-14 02:41:07 +0900
commitbd33a6bf8e6b56b4cfa5e2b008edc18d5f6a0c3a (patch)
treed0e1a8145d4a17ee7febee302335a9f22651e105 /src/leap
parent21875404282522a9c83bfb9c85d6a24fa59d20f8 (diff)
make the check for valid client cert the trigger for first-run-wizard
Closes #803 And with this we've completed all features blocking the release goal: generic client.
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/baseapp/mainwindow.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index 918f1568..41130852 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -14,6 +14,7 @@ from leap.baseapp.log import LogPaneMixin
from leap.baseapp.systray import StatusAwareTrayIconMixin
from leap.baseapp.network import NetworkCheckerAppMixin
from leap.baseapp.leap_app import MainWindowMixin
+from leap.eip.checks import ProviderCertChecker
from leap.gui.threads import FunThread
logger = logging.getLogger(name=__name__)
@@ -125,8 +126,14 @@ class LeapWindow(QtGui.QMainWindow,
# do checks (can overlap if wizard was interrupted)
if not self.wizard_done:
need_wizard = True
+
if not self.provider_domain:
need_wizard = True
+ else:
+ pcertchecker = ProviderCertChecker(domain=self.provider_domain)
+ if not pcertchecker.is_cert_valid(do_raise=False):
+ logger.warning('missing valid client cert. need wizard')
+ need_wizard = True
# launch wizard if needed
if need_wizard: