diff options
author | Ruben Pollan <meskio@sindominio.net> | 2017-07-18 15:43:35 +0200 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2017-08-24 17:13:39 -0400 |
commit | 8cebf955ad71975a20275a780a67b31099759e3a (patch) | |
tree | 998562d9398e0aee9b7adb7cfbb28170b816c00a /src/leap/bitmask/core/mail_services.py | |
parent | 3b4508dff9dc1a681f3c96edcef4e43aa3da29a8 (diff) |
[feat] add a mock mixnet_status call to the API
For now we say it will be mixed on every request if the mixnet is
enabled. We might want a better mock in the future.
- Resolves: #8972
Diffstat (limited to 'src/leap/bitmask/core/mail_services.py')
-rw-r--r-- | src/leap/bitmask/core/mail_services.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py index 20d6a342..be84b3cf 100644 --- a/src/leap/bitmask/core/mail_services.py +++ b/src/leap/bitmask/core/mail_services.py @@ -469,13 +469,14 @@ class StandardMailService(service.MultiService, HookableService): # TODO factor out Mail Service to inside mail package. - def __init__(self, basedir): + def __init__(self, basedir, mixnet_enabled=False): self._basedir = basedir self._soledad_sessions = {} self._keymanager_sessions = {} self._sendmail_opts = {} self._service_tokens = {} self._active_user = None + self._mixnet_enabled = mixnet_enabled super(StandardMailService, self).__init__() self.initializeChildrenServices() @@ -603,6 +604,14 @@ class StandardMailService(service.MultiService, HookableService): } defer.returnValue(merge_status(childrenStatus)) + def do_mixnet_status(self, userid, address): + # XXX: for now there is no support in the provider + # we'll mock it if it's enabled + status = 'disabled' + if self._mixnet_enabled: + status = 'ok' + return {'status': status} + def get_token(self): active_user = self._active_user if not active_user: |