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

plugin account: email sending improvments:

Browse source 
the following new options are handled:
        - email_sender_domain (default None)
        - email_port (default 25)
        - email_username (defaut None)
        - email_password (default None)
        - email_starttls true to force starttls (default false)
        - email_auth true to require authentication (default false)
    in addition, admin_email has been deprecated in favor of email_admins_list which can handle several addresses
This commit is contained in:
Goffi 2016-02-27 14:49:20 +01:00
commit 63c5083839
1 changed files with 62 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

77
src/plugins/plugin_misc_account.py
View file

@ -25,7 +25,7 @@ from sat.tools import xml_tools
from sat.memory.memory import Sessions
from sat.memory.crypto import PasswordHasher
from sat.core.constants import Const as C
import ConfigParser
from twisted.internet import reactor, defer, protocol
from twisted.python.procutils import which
from twisted.python.failure import Failure
@ -56,7 +56,14 @@ CONFIG_SECTION = "plugin account"
default_conf = {"email_from": "NOREPLY@example.net",
"email_server": "localhost",
"admin_email": "admin@example.net",
"email_sender_domain": "",
"email_port": 25,
"email_username": "",
"email_password": "",
"email_starttls": "false",
"email_auth": "false",
"email_admins_list": [],
"admin_email": "",
"new_account_server": "localhost",
"new_account_domain": "example.net",
"prosody_path": None, # prosody path (where prosodyctl will be executed from), or None to automaticaly find it
@ -155,6 +162,17 @@ class MiscAccount(object):
self.__delete_account_id = host.registerCallback(self.__deleteAccountCb, with_data=True)
def getConfig(self, name):
if name.startswith("email_"):
# XXX: email_ parameters were first in [plugin account] section
# but as it make more sense to have them in common with other plugins,
# they can now be in [DEFAULT] section
try:
value = self.host.memory.getConfig(None, name, Exception)
except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
pass
else:
return value
return self.host.memory.getConfig(CONFIG_SECTION, name, default_conf[name])
def generatePassword(self):
@ -232,19 +250,42 @@ class MiscAccount(object):
email_host = self.getConfig('email_server')
email_from = self.getConfig("email_from")
email_sender_domain = self.getConfig("email_sender_domain") or None
email_port = int(self.getConfig("email_port"))
email_username = self.getConfig("email_username") or None
email_password = self.getConfig("email_password") or None
email_starttls = C.bool(self.getConfig("email_starttls"))
email_auth = C.bool(self.getConfig("email_auth"))
domain = self.getConfig('new_account_domain')
# email to the administrator
body = (u"""New account created: %(profile)s [%(email)s]""" % {'profile': profile, 'email': email}).encode('utf-8')
msg = MIMEText(body, 'plain', 'UTF-8')
msg['Subject'] = _('New Libervia account created')
msg['From'] = email_from
msg['To'] = self.getConfig('admin_email')
# admin
admins_emails = self.getConfig('email_admins_list')
admin_email = self.getConfig('admin_email')
d_admin = sendmail(email_host, email_from, admin_email, msg.as_string())
d_admin.addCallbacks(lambda dummy: log.debug(u"Account creation notification sent to admin <%s>" % admin_email),
lambda dummy: log.error(u"Failed to send account creation notification to admin <%s>" % admin_email))
if admin_email:
log.warning(u"admin_email parameter is deprecated, please use email_admins_list instead")
admins_emails.append(admin_email)
# email to the administrator
if not admins_emails:
log.warning(u"No known admin email, we can't send email to administrator(s).\nPlease fill email_admins_list parameter")
d_admin = defer.fail(exceptions.DataError("no admin email"))
else:
body = (u"""New account created: %(profile)s [%(email)s]""" % {'profile': profile, 'email': email}).encode('utf-8')
msg = MIMEText(body, 'plain', 'UTF-8')
msg['Subject'] = _('New Libervia account created')
msg['From'] = email_from
msg['To'] = ", ".join(admins_emails)
d_admin = sendmail(email_host, email_from, admins_emails, msg.as_string(),
senderDomainName=email_sender_domain,
port=email_port,
username=email_username,
password=email_password,
requireAuthentication=email_starttls,
requireTransportSecurity=email_auth)
admins_emails_txt = u', '.join([u"<{}>".format(addr) for addr in admins_emails])
d_admin.addCallbacks(lambda dummy: log.debug(u"Account creation notification sent to admin(s) {}".format(admins_emails_txt)),
lambda dummy: log.error(u"Failed to send account creation notification to admin {}".format(admins_emails_txt)))
if not email:
return d_admin
@ -282,7 +323,13 @@ http://www.salut-a-toi.org
# XXX: this will not fail when the email address doesn't exist
# FIXME: check email reception to validate email given by the user
# FIXME: delete the profile if the email could not been sent?
d_user = sendmail(email_host, email_from, email, msg.as_string())
d_user = sendmail(email_host, email_from, email, msg.as_string(),
senderDomainName=email_sender_domain,
port=email_port,
username=email_username,
password=email_password,
requireAuthentication=email_starttls,
requireTransportSecurity=email_auth)
d_user.addCallbacks(lambda dummy: log.debug(u"Account creation confirmation sent to <%s>" % email),
email_ko)
return defer.DeferredList([d_user, d_admin])
@ -308,7 +355,7 @@ http://www.salut-a-toi.org
form_ui.addLabel(D_("New password (again)"))
form_ui.addPassword("new_passwd2", value="")
# FIXME: uncomment and fix these features
# FIXME: uncomment and fix these features
"""
if 'GROUPBLOG' in self.host.plugins:
tab_container.addTab("delete_posts", D_("Delete your posts"), container=xml_tools.PairsContainer)
@ -349,7 +396,7 @@ http://www.salut-a-toi.org
return {'xmlui': error_ui.toXml()}
# check for account deletion
# FIXME: uncomment and fix these features
# FIXME: uncomment and fix these features
"""
delete_passwd = data[xml_tools.SAT_FORM_PREFIX + 'delete_passwd']
delete_checkbox = data[xml_tools.SAT_FORM_PREFIX + 'delete_checkbox']