From 9674b93f9d6fbe25e10330a6f807e5b7196c01b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Wed, 6 Nov 2013 11:54:03 -0300
Subject: Reject sender if it's not the logged in user

---
 src/leap/bitmask/gui/mainwindow.py          | 1 -
 src/leap/bitmask/services/mail/conductor.py | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index a91f4e71..91bbe9cb 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -915,7 +915,6 @@ class MainWindow(QtGui.QMainWindow):
             user = self._logged_user
             domain = self._provider_config.get_domain()
             userid = "%s@%s" % (user, domain)
-            logger.debug("USERID: " % userid)
             self._mail_conductor.userid = userid
             self._login_defer = None
             self._start_eip_bootstrap()
diff --git a/src/leap/bitmask/services/mail/conductor.py b/src/leap/bitmask/services/mail/conductor.py
index 4d34a13b..6dcf0c6f 100644
--- a/src/leap/bitmask/services/mail/conductor.py
+++ b/src/leap/bitmask/services/mail/conductor.py
@@ -200,6 +200,7 @@ class SMTPControl(object):
         from leap.mail.smtp import setup_smtp_relay
         self._smtp_service, self._smtp_port = setup_smtp_relay(
             port=2013,
+            userid=self.userid,
             keymanager=self._keymanager,
             smtp_host=host,
             smtp_port=port,
@@ -345,7 +346,7 @@ class MailConductor(IMAPControl, SMTPControl):
         return self._userid
 
     @userid.setter
-    def _userid(self, userid):
+    def userid(self, userid):
         """
         Sets the user id this conductor is configured for.
 
-- 
cgit v1.2.3


From 3237573421a5bfc2368878e324f030f0d7f3a3bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Thu, 7 Nov 2013 07:40:58 -0300
Subject: Add changes file

---
 changes/bug_reject_bad_sender | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/bug_reject_bad_sender

diff --git a/changes/bug_reject_bad_sender b/changes/bug_reject_bad_sender
new file mode 100644
index 00000000..0a4f360f
--- /dev/null
+++ b/changes/bug_reject_bad_sender
@@ -0,0 +1 @@
+- Give SMTP the current logged in userid. Related to #3952.
\ No newline at end of file
-- 
cgit v1.2.3