summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/crypto/srpauth.py9
-rw-r--r--src/leap/services/eip/eipspec.py4
-rw-r--r--src/leap/services/eip/providerbootstrapper.py10
-rw-r--r--src/leap/services/eip/tests/test_eipconfig.py25
-rw-r--r--src/leap/services/mail/smtpbootstrapper.py8
-rw-r--r--src/leap/services/mail/smtpconfig.py1
-rw-r--r--src/leap/services/soledad/soledadbootstrapper.py8
-rw-r--r--src/leap/services/soledad/soledadconfig.py1
8 files changed, 40 insertions, 26 deletions
diff --git a/src/leap/crypto/srpauth.py b/src/leap/crypto/srpauth.py
index 2f3cbd1c..f1897e1d 100644
--- a/src/leap/crypto/srpauth.py
+++ b/src/leap/crypto/srpauth.py
@@ -22,6 +22,9 @@ import requests
import srp
import json
+#this error is raised from requests
+from simplejson.decoder import JSONDecodeError
+
from PySide import QtCore, QtGui
from leap.common.check import leap_assert
@@ -232,7 +235,10 @@ class SRPAuth(QtCore.QObject):
raise SRPAuthenticationError(self.tr("Could not connect to "
"the server"))
- content, mtime = get_content(auth_result)
+ try:
+ content, mtime = get_content(auth_result)
+ except JSONDecodeError:
+ raise SRPAuthenticationError("Bad JSON content in auth result")
if auth_result.status_code == 422:
logger.error("[%s] Wrong password (HAMK): [%s]" %
@@ -319,6 +325,7 @@ class SRPAuth(QtCore.QObject):
self._authentication_preprocessing(username, password)
salt, B = self._start_authentication(username, password)
M2 = self._process_challenge(salt, B, username)
+
self._verify_session(M2)
leap_assert(self.get_session_id(), "Something went wrong because"
diff --git a/src/leap/services/eip/eipspec.py b/src/leap/services/eip/eipspec.py
index 7fa782c7..94ba674f 100644
--- a/src/leap/services/eip/eipspec.py
+++ b/src/leap/services/eip/eipspec.py
@@ -22,12 +22,12 @@ eipservice_config_spec = {
'serial': {
'type': int,
'default': 1,
- 'required': True
+ 'required': ["True"]
},
'version': {
'type': int,
'default': 1,
- 'required': True
+ 'required': ["True"]
},
'clusters': {
'type': list,
diff --git a/src/leap/services/eip/providerbootstrapper.py b/src/leap/services/eip/providerbootstrapper.py
index 734d3867..289d212b 100644
--- a/src/leap/services/eip/providerbootstrapper.py
+++ b/src/leap/services/eip/providerbootstrapper.py
@@ -209,13 +209,16 @@ class ProviderBootstrapper(QtCore.QObject):
def run_provider_select_checks(self, checker,
domain, download_if_needed=False):
"""
- Populates the check queue
+ Populates the check queue.
:param checker: checker thread to be used to run this check
:type checker: CheckerThread
+
:param domain: domain to check
:type domain: str
- :param download_if_needed: if True, makes the checks do not overwrite already downloaded data
+
+ :param download_if_needed: if True, makes the checks do not
+ overwrite already downloaded data
:type download_if_needed: bool
:return: True if the checks passed, False otherwise
@@ -407,7 +410,8 @@ class ProviderBootstrapper(QtCore.QObject):
:param provider_config: Provider configuration
:type provider_config: ProviderConfig
- :param download_if_needed: if True, makes the checks do not overwrite already downloaded data.
+ :param download_if_needed: if True, makes the checks do not
+ overwrite already downloaded data.
:type download_if_needed: bool
"""
leap_assert(provider_config, "We need a provider config!")
diff --git a/src/leap/services/eip/tests/test_eipconfig.py b/src/leap/services/eip/tests/test_eipconfig.py
index ce04c2fc..0bd19d5e 100644
--- a/src/leap/services/eip/tests/test_eipconfig.py
+++ b/src/leap/services/eip/tests/test_eipconfig.py
@@ -97,10 +97,12 @@ class EIPConfigTest(BaseLeapTest):
"""
self.write_config(sample_config)
config = EIPConfig()
- self.assertRaises(
- AssertionError,
- config.get_clusters)
- self.assertTrue(config.load(self.configfile))
+ #self.assertRaises(
+ #AssertionError,
+ #config.get_clusters)
+
+ self.assertTrue(config.load(
+ self.configfile, relative=False))
self.assertEqual(
config.get_openvpn_configuration(),
sample_config["openvpn_configuration"])
@@ -123,7 +125,8 @@ class EIPConfigTest(BaseLeapTest):
data['openvpn_configuration']["extra_param"] = "FOO"
self.write_config(data)
config = EIPConfig()
- config.load(self.configfile)
+ config.load(
+ self.configfile, relative=False)
self.assertEqual(
config.get_openvpn_configuration(),
sample_config["openvpn_configuration"])
@@ -133,7 +136,7 @@ class EIPConfigTest(BaseLeapTest):
data['openvpn_configuration']["auth"] = "SHA1;"
self.write_config(data)
config = EIPConfig()
- config.load(self.configfile)
+ config.load(self.configfile, relative=False)
self.assertEqual(
config.get_openvpn_configuration(),
sample_config["openvpn_configuration"])
@@ -143,7 +146,7 @@ class EIPConfigTest(BaseLeapTest):
data['openvpn_configuration']["auth"] = "SHA1>`&|"
self.write_config(data)
config = EIPConfig()
- config.load(self.configfile)
+ config.load(self.configfile, relative=False)
self.assertEqual(
config.get_openvpn_configuration(),
sample_config["openvpn_configuration"])
@@ -153,7 +156,7 @@ class EIPConfigTest(BaseLeapTest):
data['openvpn_configuration']["auth"] = "shaSHA1"
self.write_config(data)
config = EIPConfig()
- config.load(self.configfile)
+ config.load(self.configfile, relative=False)
self.assertEqual(
config.get_openvpn_configuration(),
sample_config["openvpn_configuration"])
@@ -163,7 +166,7 @@ class EIPConfigTest(BaseLeapTest):
data['openvpn_configuration']["auth"] = "sha&*!@#;"
self.write_config(data)
config = EIPConfig()
- config.load(self.configfile)
+ config.load(self.configfile, relative=False)
self.assertEqual(
config.get_openvpn_configuration(),
{'cipher': 'AES-128-CBC',
@@ -174,7 +177,7 @@ class EIPConfigTest(BaseLeapTest):
data['gateways'][0]["ip_address"] = "11.22.33.44;"
self.write_config(data)
config = EIPConfig()
- config.load(self.configfile)
+ config.load(self.configfile, relative=False)
self.assertEqual(
config.get_gateway_ip(),
None)
@@ -183,7 +186,7 @@ class EIPConfigTest(BaseLeapTest):
data['gateways'][0]["ip_address"] = "11.22.33.44`"
self.write_config(data)
config = EIPConfig()
- config.load(self.configfile)
+ config.load(self.configfile, relative=False)
self.assertEqual(
config.get_gateway_ip(),
None)
diff --git a/src/leap/services/mail/smtpbootstrapper.py b/src/leap/services/mail/smtpbootstrapper.py
index 7e0f10de..6e0a0a47 100644
--- a/src/leap/services/mail/smtpbootstrapper.py
+++ b/src/leap/services/mail/smtpbootstrapper.py
@@ -116,10 +116,10 @@ class SMTPBootstrapper(QtCore.QObject):
# Not modified
if res.status_code == 304:
logger.debug("SMTP definition has not been modified")
- self._smtp_config.load(os.path.join("leap",
- "providers",
- self._provider_config.get_domain(),
- "smtp-service.json"))
+ self._smtp_config.load(os.path.join(
+ "leap", "providers",
+ self._provider_config.get_domain(),
+ "smtp-service.json"))
else:
smtp_definition, mtime = get_content(res)
diff --git a/src/leap/services/mail/smtpconfig.py b/src/leap/services/mail/smtpconfig.py
index e7e2895a..30371005 100644
--- a/src/leap/services/mail/smtpconfig.py
+++ b/src/leap/services/mail/smtpconfig.py
@@ -45,4 +45,3 @@ class SMTPConfig(BaseConfig):
def get_locations(self):
return self._safe_get_value("locations")
-
diff --git a/src/leap/services/soledad/soledadbootstrapper.py b/src/leap/services/soledad/soledadbootstrapper.py
index bae933de..db019a87 100644
--- a/src/leap/services/soledad/soledadbootstrapper.py
+++ b/src/leap/services/soledad/soledadbootstrapper.py
@@ -218,7 +218,8 @@ class SoledadBootstrapper(QtCore.QObject):
self._keymanager.get_key(address, openpgp.OpenPGPKey,
private=True, fetch_remote=False)
except KeyNotFound:
- logger.debug("Key not found. Generating key for %s" % (address,))
+ logger.debug(
+ "Key not found. Generating key for %s" % (address,))
self._keymanager.gen_key(openpgp.OpenPGPKey)
logger.debug("Key generated successfully.")
@@ -235,8 +236,9 @@ class SoledadBootstrapper(QtCore.QObject):
logger.debug("Uploading public key to %s" % (key_uri,))
- pubkey = self._keymanager.get_key(address, openpgp.OpenPGPKey,
- private=False, fetch_remote=False)
+ pubkey = self._keymanager.get_key(
+ address, openpgp.OpenPGPKey,
+ private=False, fetch_remote=False)
key_data = {
self.PUBKEY_KEY: pubkey.key_data,
}
diff --git a/src/leap/services/soledad/soledadconfig.py b/src/leap/services/soledad/soledadconfig.py
index 836265f3..80a82d11 100644
--- a/src/leap/services/soledad/soledadconfig.py
+++ b/src/leap/services/soledad/soledadconfig.py
@@ -45,4 +45,3 @@ class SoledadConfig(BaseConfig):
def get_locations(self):
return self._safe_get_value("locations")
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 08:33:56 +0000