summaryrefslogtreecommitdiff
path: root/src/leap/mail/smtp/__init__.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-06 11:51:33 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-07 07:43:34 -0300
commit08c13654268e986d03341c564d7cc91db80d940d (patch)
tree08fc10d8fba1a473f60381000bfbd88a33591658 /src/leap/mail/smtp/__init__.py
parentacaca84e6749e2d2ffed46a8480ab0bf22fde670 (diff)
Reject senders if they aren't the logged in user
Diffstat (limited to 'src/leap/mail/smtp/__init__.py')
-rw-r--r--src/leap/mail/smtp/__init__.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/leap/mail/smtp/__init__.py b/src/leap/mail/smtp/__init__.py
index b30cd20..be568b8 100644
--- a/src/leap/mail/smtp/__init__.py
+++ b/src/leap/mail/smtp/__init__.py
@@ -29,7 +29,7 @@ from leap.common.events import proto, signal
from leap.mail.smtp.smtprelay import SMTPFactory
-def setup_smtp_relay(port, keymanager, smtp_host, smtp_port,
+def setup_smtp_relay(port, userid, keymanager, smtp_host, smtp_port,
smtp_cert, smtp_key, encrypted_only):
"""
Setup SMTP relay to run with Twisted.
@@ -39,6 +39,8 @@ def setup_smtp_relay(port, keymanager, smtp_host, smtp_port,
:param port: The port in which to run the server.
:type port: int
+ :param userid: The user currently logged in
+ :type userid: unicode
:param keymanager: A Key Manager from where to get recipients' public
keys.
:type keymanager: leap.common.keymanager.KeyManager
@@ -75,7 +77,7 @@ def setup_smtp_relay(port, keymanager, smtp_host, smtp_port,
}
# configure the use of this service with twistd
- factory = SMTPFactory(keymanager, config)
+ factory = SMTPFactory(userid, keymanager, config)
try:
tport = reactor.listenTCP(port, factory,
interface="localhost")