plugin account, tools: some cleaning account + email and password tools:

- plugin misc account has been reordered and cleaned a bit.
    - new xmpp_domain setting is used to get the domain name of main XMPP server
    - password generation method has been moved to tools.utils
    - email sending method has been moved to tools.email
This commit is contained in:
Goffi 2017-03-12 19:32:59 +01:00
commit 25c07ce105
2 changed files with 138 additions and 80 deletions

67
src/tools/email.py Normal file
View file

@ -0,0 +1,67 @@
#!/usr/bin/env python2
# -*- coding: utf-8 -*-
# SàT: a jabber client
# Copyright (C) 2009-2016 Jérôme Poisson (goffi@goffi.org)
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
"""email sending facilities"""
from __future__ import absolute_import
from sat.core.constants import Const as C
from sat.core.log import getLogger
log = getLogger(__name__)
from twisted.mail import smtp
from email.mime.text import MIMEText
def sendEmail(host, to_emails, subject=u'', body=u'', from_email=None):
"""send an email using SàT configuration
@param to_emails(list[unicode]): list of recipients
@param subject(unicode): subject of the message
@param body(unicode): body of the message
@param from_email(unicode): address of the sender
@return (D): same as smtp.sendmail
"""
email_host = host.memory.getConfig(None, u'email_server') or u'localhost'
email_from = host.memory.getConfig(None, u'email_from')
if email_from is None:
# we suppose that email domain and XMPP domain are identical
domain = host.memory.getConfig(None, u'xmpp_domain', u'example.net')
email_from = u'no_reply@' + domain
email_sender_domain = host.memory.getConfig(None, u'email_sender_domain')
email_port = int(host.memory.getConfig(None, u'email_port', 25))
email_username = host.memory.getConfig(None, u'email_username')
email_password = host.memory.getConfig(None, u'email_password')
email_auth = C.bool(host.memory.getConfig(None, 'email_auth', False))
email_starttls = C.bool(host.memory.getConfig(None, 'email_starttls', False))
msg = MIMEText(body, 'plain', 'UTF-8')
msg[u'Subject'] = subject
msg[u'From'] = email_from
msg[u'To'] = u", ".join(to_emails)
return smtp.sendmail(email_host.encode("utf-8"),
email_from.encode("utf-8"),
[email.encode("utf-8") for email in to_emails],
msg.as_string(),
senderDomainName = email_sender_domain.encode("utf-8") if email_sender_domain else None,
port = email_port,
username = email_username.encode("utf-8") if email_username else None,
password = email_password.encode("utf-8") if email_password else None,
requireAuthentication = email_auth,
requireTransportSecurity = email_starttls)

View file

@ -26,6 +26,7 @@ log = getLogger(__name__)
import datetime
import time
import sys
import random
def clean_ustr(ustr):
@ -54,6 +55,17 @@ def xmpp_date(timestamp=None, with_time=True):
template = u"{}T{}".format(template_date, template_time) if with_time else template_date
return datetime.datetime.utcfromtimestamp(time.time() if timestamp is None else timestamp).strftime(template)
def generatePassword(vocabulary=None, size=20):
"""Generate a password with random characters.
@param vocabulary(iterable): characters to use to create password
@param size(int): number of characters in the password to generate
@return (unicode): generated password
"""
random.seed()
if vocabulary is None:
vocabulary = [chr(i) for i in range(0x30,0x3A) + range(0x41,0x5B) + range (0x61,0x7B)]
return u''.join([random.choice(vocabulary) for i in range(15)])
def getRepositoryData(module, as_string=True, is_path=False, save_dir_path=None):
"""Retrieve info on current mecurial repository