summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-03-13 14:15:02 -0300
committerTomás Touceda <chiiph@leap.se>2013-03-13 14:15:02 -0300
commitfdc1d749a859cefd325e1de712f90eba79d3f678 (patch)
tree9c7a7af6ae61d0143f98a71f1efe82c66b657440
parentef43dff37c6db915757184ad51bc017d45e70c98 (diff)
Display a more related error message for https wizard checks
Differentiate between SSLError and other type of errors, so to its clear when the certificate fails and when the connection fails or other kind of problems
-rw-r--r--src/leap/gui/wizard.py4
-rw-r--r--src/leap/services/eip/providerbootstrapper.py8
2 files changed, 9 insertions, 3 deletions
diff --git a/src/leap/gui/wizard.py b/src/leap/gui/wizard.py
index 83f64020..4e811fb9 100644
--- a/src/leap/gui/wizard.py
+++ b/src/leap/gui/wizard.py
@@ -351,8 +351,8 @@ class Wizard(QtGui.QWizard):
status = ""
passed = data[self._provider_bootstrapper.PASSED_KEY]
if not passed:
- status = self.tr("<font color='red'><b>Provider does not "
- "support HTTPS</b></font>")
+ status = self.tr("<font color='red'><b>%s</b></font>") \
+ % (data[self._provider_bootstrapper.ERROR_KEY])
self.ui.lblProviderSelectStatus.setText(status)
self.ui.btnCheck.setEnabled(not passed)
self.ui.lnProvider.setEnabled(not passed)
diff --git a/src/leap/services/eip/providerbootstrapper.py b/src/leap/services/eip/providerbootstrapper.py
index dc87a1bd..82c62f90 100644
--- a/src/leap/services/eip/providerbootstrapper.py
+++ b/src/leap/services/eip/providerbootstrapper.py
@@ -127,8 +127,14 @@ class ProviderBootstrapper(QtCore.QObject):
res = self._session.get("https://%s" % (self._domain,))
res.raise_for_status()
https_data[self.PASSED_KEY] = True
+ except requests.exceptions.SSLError as e:
+ logger.error("%s" % (e,))
+ https_data[self.ERROR_KEY] = self.tr("Provider certificate could "
+ "not verify")
except Exception as e:
- https_data[self.ERROR_KEY] = "%s" % (e,)
+ logger.error("%s" % (e,))
+ https_data[self.ERROR_KEY] = self.tr("Provider does not support "
+ "HTTPS")
logger.debug("Emitting https_connection %s" % (https_data,))
self.https_connection.emit(https_data)