From 54aafd3b12764940f6484e49dae6f93a44a25b43 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 7 Apr 2016 09:54:55 -0400 Subject: [feature] use same token for imap/stmp authentication This greatly simplifies the handling of the password in the thunderbird extension. Related: #6041 --- mail/src/leap/mail/imap/service/imap.py | 6 ++++-- mail/src/leap/mail/smtp/gateway.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'mail') diff --git a/mail/src/leap/mail/imap/service/imap.py b/mail/src/leap/mail/imap/service/imap.py index 9e344547..6a2fca85 100644 --- a/mail/src/leap/mail/imap/service/imap.py +++ b/mail/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/mail/src/leap/mail/smtp/gateway.py b/mail/src/leap/mail/smtp/gateway.py index cb1b060f..bd0be6fc 100644 --- a/mail/src/leap/mail/smtp/gateway.py +++ b/mail/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. -- cgit v1.2.3