erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core, plugin imap, plugin smtp: fixed SMTP/IMAP integration. /!\ Profile need to be connected for IMAP server to work (will change in the future)

Browse source
This commit is contained in:
Goffi 2013-01-08 00:46:38 +01:00
commit 2596ea291b
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/memory/memory.py
View file

@ -844,6 +844,9 @@ class Memory:
def getParamA(self, name, category, attr="value", profile_key='@DEFAULT@'): def getParamA(self, name, category, attr="value", profile_key='@DEFAULT@'):
return self.params.getParamA(name, category, attr, profile_key) return self.params.getParamA(name, category, attr, profile_key)
def asyncGetParamA(self, name, category, attr="value", profile_key='@DEFAULT@'):
return self.params.asyncGetParamA(name, category, attr, profile_key)
def asyncGetStringParamA(self, name, category, attr="value", profile_key='@DEFAULT@'): def asyncGetStringParamA(self, name, category, attr="value", profile_key='@DEFAULT@'):
return self.params.asyncGetStringParamA(name, category, attr, profile_key) return self.params.asyncGetStringParamA(name, category, attr, profile_key)

9
src/plugins/plugin_misc_imap.py
View file

@ -426,11 +426,10 @@ class SatProfileCredentialChecker:
profiles = self.host.memory.getProfilesList() profiles = self.host.memory.getProfilesList()
if not credentials.username in profiles: if not credentials.username in profiles:
return defer.fail(cred_error.UnauthorizedLogin()) return defer.fail(cred_error.UnauthorizedLogin())
password = self.host.memory.getParamA("Password", "Connection", profile_key=credentials.username) d = self.host.memory.asyncGetParamA("Password", "Connection", profile_key=credentials.username)
return defer.maybeDeferred( d.addCallback(lambda password: credentials.checkPassword(password))
credentials.checkPassword, d.addCallback(self._cbPasswordMatch, credentials.username)
password).addCallback( return d
self._cbPasswordMatch, credentials.username)
class ImapServerFactory(protocol.ServerFactory): class ImapServerFactory(protocol.ServerFactory):
protocol = imap4.IMAP4Server protocol = imap4.IMAP4Server

2
src/plugins/plugin_misc_smtp.py
View file

@ -91,7 +91,7 @@ class SatSmtpMessage:
mail = Parser().parsestr("\n".join(self.message)) mail = Parser().parsestr("\n".join(self.message))
try: try:
self.host.sendMessage(parseaddr(mail['to'].decode('utf-8','replace'))[1], mail.get_payload().decode('utf-8','replace'), #TODO: manage other charsets self.host.sendMessage(parseaddr(mail['to'].decode('utf-8','replace'))[1], mail.get_payload().decode('utf-8','replace'), #TODO: manage other charsets
subject=mail['subject'].decode('utf-8','replace'), type='normal', profile_key=self.profile) subject=mail['subject'].decode('utf-8','replace'), mess_type='normal', profile_key=self.profile)
except: except:
exc_type, exc_value, exc_traceback = sys.exc_info() exc_type, exc_value, exc_traceback = sys.exc_info()
error(_("Can't send message: %s") % exc_value) #The email is invalid or incorreclty parsed error(_("Can't send message: %s") % exc_value) #The email is invalid or incorreclty parsed