summaryrefslogtreecommitdiff
path: root/src/leap/services/mail
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-06-04 18:57:09 +0900
committerkali <kali@leap.se>2013-06-04 18:57:09 +0900
commit0da599e46b0cdffb0acaf77d8ba0251d7461ae87 (patch)
tree93484111842eb6e3488746fcd387eb017adba424 /src/leap/services/mail
parent4e43431086531370118e310f29d0730256537127 (diff)
parent4c726c1531abfe288604eaa4c1d347e85bed81eb (diff)
Merge branch 'feature/improve_soledad_usage_rev1' into develop
Diffstat (limited to 'src/leap/services/mail')
-rw-r--r--src/leap/services/mail/smtpbootstrapper.py142
1 files changed, 54 insertions, 88 deletions
diff --git a/src/leap/services/mail/smtpbootstrapper.py b/src/leap/services/mail/smtpbootstrapper.py
index 6e0a0a47..64bf3153 100644
--- a/src/leap/services/mail/smtpbootstrapper.py
+++ b/src/leap/services/mail/smtpbootstrapper.py
@@ -22,8 +22,6 @@ SMTP bootstrapping
import logging
import os
-import requests
-
from PySide import QtCore
from leap.common.check import leap_assert, leap_assert_type
@@ -31,44 +29,30 @@ from leap.common.files import get_mtime
from leap.config.providerconfig import ProviderConfig
from leap.crypto.srpauth import SRPAuth
from leap.util.request_helpers import get_content
+from leap.services.abstractbootstrapper import AbstractBootstrapper
logger = logging.getLogger(__name__)
-class SMTPBootstrapper(QtCore.QObject):
+class SMTPBootstrapper(AbstractBootstrapper):
"""
SMTP init procedure
"""
- PASSED_KEY = "passed"
- ERROR_KEY = "error"
-
- IDLE_SLEEP_INTERVAL = 100
-
# All dicts returned are of the form
# {"passed": bool, "error": str}
download_config = QtCore.Signal(dict)
def __init__(self):
- QtCore.QObject.__init__(self)
+ AbstractBootstrapper.__init__(self)
- # **************************************************** #
- # Dependency injection helpers, override this for more
- # granular testing
- self._fetcher = requests
- # **************************************************** #
-
- self._session = self._fetcher.session()
self._provider_config = None
self._smtp_config = None
self._download_if_needed = False
- def _download_config(self):
+ def _download_config(self, *args):
"""
Downloads the SMTP config for the given provider
-
- :return: True if everything went as expected, False otherwise
- :rtype: bool
"""
leap_assert(self._provider_config,
@@ -77,79 +61,59 @@ class SMTPBootstrapper(QtCore.QObject):
logger.debug("Downloading SMTP config for %s" %
(self._provider_config.get_domain(),))
- download_config_data = {
- self.PASSED_KEY: False,
- self.ERROR_KEY: ""
- }
-
- try:
- headers = {}
- mtime = get_mtime(os.path.join(self._smtp_config
- .get_path_prefix(),
- "leap",
- "providers",
- self._provider_config.get_domain(),
- "smtp-service.json"))
-
- if self._download_if_needed and mtime:
- headers['if-modified-since'] = mtime
-
- # there is some confusion with this uri,
- config_uri = "%s/%s/config/smtp-service.json" % (
- self._provider_config.get_api_uri(),
- self._provider_config.get_api_version())
- logger.debug('Downloading SMTP config from: %s' % config_uri)
-
- srp_auth = SRPAuth(self._provider_config)
- session_id = srp_auth.get_session_id()
- cookies = None
- if session_id:
- cookies = {"_session_id": session_id}
-
- res = self._session.get(config_uri,
- verify=self._provider_config
- .get_ca_cert_path(),
- headers=headers,
- cookies=cookies)
- res.raise_for_status()
-
- # 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"))
- else:
- smtp_definition, mtime = get_content(res)
-
- self._smtp_config.load(data=smtp_definition, mtime=mtime)
- self._smtp_config.save(["leap",
- "providers",
- self._provider_config.get_domain(),
- "smtp-service.json"])
-
- download_config_data[self.PASSED_KEY] = True
- except Exception as e:
- download_config_data[self.PASSED_KEY] = False
- download_config_data[self.ERROR_KEY] = "%s" % (e,)
-
- logger.debug("Emitting download_config %s" % (download_config_data,))
- self.download_config.emit(download_config_data)
-
- return download_config_data[self.PASSED_KEY]
+ headers = {}
+ mtime = get_mtime(os.path.join(self._smtp_config
+ .get_path_prefix(),
+ "leap",
+ "providers",
+ self._provider_config.get_domain(),
+ "smtp-service.json"))
+
+ if self._download_if_needed and mtime:
+ headers['if-modified-since'] = mtime
+
+ # there is some confusion with this uri,
+ config_uri = "%s/%s/config/smtp-service.json" % (
+ self._provider_config.get_api_uri(),
+ self._provider_config.get_api_version())
+ logger.debug('Downloading SMTP config from: %s' % config_uri)
+
+ srp_auth = SRPAuth(self._provider_config)
+ session_id = srp_auth.get_session_id()
+ cookies = None
+ if session_id:
+ cookies = {"_session_id": session_id}
+
+ res = self._session.get(config_uri,
+ verify=self._provider_config
+ .get_ca_cert_path(),
+ headers=headers,
+ cookies=cookies)
+ res.raise_for_status()
+
+ # 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"))
+ else:
+ smtp_definition, mtime = get_content(res)
+
+ self._smtp_config.load(data=smtp_definition, mtime=mtime)
+ self._smtp_config.save(["leap",
+ "providers",
+ self._provider_config.get_domain(),
+ "smtp-service.json"])
def run_smtp_setup_checks(self,
- checker,
provider_config,
smtp_config,
download_if_needed=False):
"""
Starts the checks needed for a new smtp setup
- :param checker: Object that executes actions in a different
- thread
- :type checker: leap.util.checkerthread.CheckerThread
:param provider_config: Provider configuration
:type provider_config: ProviderConfig
:param smtp_config: SMTP configuration to populate
@@ -164,6 +128,8 @@ class SMTPBootstrapper(QtCore.QObject):
self._smtp_config = smtp_config
self._download_if_needed = download_if_needed
- checker.add_checks([
- self._download_config
- ])
+ cb_chain = [
+ (self._download_config, self.download_config),
+ ]
+
+ self.addCallbackChain(cb_chain)