summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-07 09:54:55 -0400
committerKali Kaneko <kali@leap.se>2016-04-07 09:54:55 -0400
commit861b16d49e81a30be9386d529d4a3339d91ff30c (patch)
tree1a364cb187b20e1d1a855e83690def8ca6a0aba7 /src/leap
parent727a14957928a4d6f99d70a5a8521a6fe183c70d (diff)
[feature] use same token for imap/stmp authentication
This greatly simplifies the handling of the password in the thunderbird extension. Related: #6041
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/mail/imap/service/imap.py6
-rw-r--r--src/leap/mail/smtp/gateway.py6
2 files changed, 8 insertions, 4 deletions
diff --git a/src/leap/mail/imap/service/imap.py b/src/leap/mail/imap/service/imap.py
index 9e34454..6a2fca8 100644
--- a/src/leap/mail/imap/service/imap.py
+++ b/src/leap/mail/imap/service/imap.py
@@ -87,8 +87,10 @@ class LocalSoledadIMAPRealm(object):
class IMAPTokenChecker(LocalSoledadTokenChecker):
- """A credentials checker that will lookup a token for the IMAP service."""
- service = 'imap'
+ """A credentials checker that will lookup a token for the IMAP service.
+ For now it will be using the same identifier than SMTPTokenChecker"""
+
+ service = 'mail_auth'
class LocalSoledadIMAPServer(LEAPIMAPServer):
diff --git a/src/leap/mail/smtp/gateway.py b/src/leap/mail/smtp/gateway.py
index cb1b060..bd0be6f 100644
--- a/src/leap/mail/smtp/gateway.py
+++ b/src/leap/mail/smtp/gateway.py
@@ -144,8 +144,10 @@ class LocalSMTPRealm(object):
class SMTPTokenChecker(LocalSoledadTokenChecker):
- """A credentials checker that will lookup a token for the SMTP service."""
- service = 'smtp'
+ """A credentials checker that will lookup a token for the SMTP service.
+ For now it will be using the same identifier than IMAPTokenChecker"""
+
+ service = 'mail_auth'
# TODO besides checking for token credential,
# we could also verify the certificate here.