From c4d239f56947cf5ae4c4d260946bf5ff9fe040cf Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Wed, 23 Sep 2015 15:32:22 -0300 Subject: [feat] disable email firewall on docker containers - Related: #7471 --- src/leap/bitmask/services/mail/emailfirewall.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/leap/bitmask/services/mail/emailfirewall.py b/src/leap/bitmask/services/mail/emailfirewall.py index 2cd2ec31..f7b5d7a2 100644 --- a/src/leap/bitmask/services/mail/emailfirewall.py +++ b/src/leap/bitmask/services/mail/emailfirewall.py @@ -34,6 +34,11 @@ def get_email_firewall(): """ Return the email firewall handler for the current platform. """ + # disable email firewall on a docker container so we can access from an + # external MUA + if os.environ.get("LEAP_DOCKERIZED"): + return None + if not (IS_LINUX): error_msg = "Email firewall not implemented for this platform." raise NotImplementedError(error_msg) -- cgit v1.2.3 From 709812ce05b908616efb536820185e1a0eecc1b0 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Fri, 2 Oct 2015 14:14:14 +0200 Subject: [bug] remove bubble argument from the logbook NullHandler NullHandler doesn't have anymore the argument bubble. https://pythonhosted.org/Logbook/changelog.html#version-0-11-0 --- src/leap/bitmask/logs/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/leap/bitmask/logs/utils.py b/src/leap/bitmask/logs/utils.py index f709da8b..e38839c7 100644 --- a/src/leap/bitmask/logs/utils.py +++ b/src/leap/bitmask/logs/utils.py @@ -55,7 +55,7 @@ def get_logger(perform_rollover=False): level = logbook.NOTSET # This handler consumes logs not handled by the others - null_handler = logbook.NullHandler(bubble=False) + null_handler = logbook.NullHandler() null_handler.push_application() silencer = SelectiveSilencerFilter() -- cgit v1.2.3 From bb8646d9769cb3c1d2b84b43047e6feaf8e40966 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 2 Oct 2015 11:52:24 -0300 Subject: [bug] signal soledad bootstrap fail on init - Resolves: #7503 Signed-off-by: Ivan Alejandro --- src/leap/bitmask/services/soledad/soledadbootstrapper.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 57ae3849..ec758833 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -253,6 +253,7 @@ class SoledadBootstrapper(AbstractBootstrapper): logger.warning(msg) continue + self._signaler.signal(self._signaler.soledad_bootstrap_failed) logger.exception(exc) raise SoledadInitError() @@ -668,5 +669,6 @@ class Syncer(object): self._try_sync() else: logger.error("Sync failed {0} times".format(self._tries)) + self._signaler.signal(self._signaler.soledad_bootstrap_failed) self._callback_deferred.errback( SoledadSyncError("Too many retries")) -- cgit v1.2.3 From bc0fecfdf6c7bd681b44ba4e39a054e05f16463d Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 2 Oct 2015 14:56:07 -0300 Subject: [bug] move assign to prevent race condition When the error happens too quickly, the errback is called before the assign of the callLater. And in the errback we cancel that call which gives an error. - Related: #7451 --- src/leap/bitmask/services/soledad/soledadbootstrapper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index ec758833..f3d50925 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -623,10 +623,10 @@ class Syncer(object): logger.debug("BOOTSTRAPPER: trying to sync Soledad....") # pass defer_decryption=False to get inline decryption # for debugging. - self._sync_deferred = self._soledad.sync(defer_decryption=True) - self._sync_deferred.addCallbacks(self._success, self._error) self._timeout_delayed_call = reactor.callLater(self.WAIT_MAX_SECONDS, self._timeout) + self._sync_deferred = self._soledad.sync(defer_decryption=True) + self._sync_deferred.addCallbacks(self._success, self._error) def _success(self, result): logger.debug("Soledad has been synced!") -- cgit v1.2.3