libervia-backend: sat/plugins/plugin_misc

comparison sat/plugins/plugin_misc_account.py @ 3028:ab2696e34d29

Python 3 port: /!\ this is a huge commit /!\ starting from this commit, SàT is needs Python 3.6+ /!\ SàT maybe be instable or some feature may not work anymore, this will improve with time This patch port backend, bridge and frontends to Python 3. Roughly this has been done this way: - 2to3 tools has been applied (with python 3.7) - all references to python2 have been replaced with python3 (notably shebangs) - fixed files not handled by 2to3 (notably the shell script) - several manual fixes - fixed issues reported by Python 3 that where not handled in Python 2 - replaced "async" with "async_" when needed (it's a reserved word from Python 3.7) - replaced zope's "implements" with @implementer decorator - temporary hack to handle data pickled in database, as str or bytes may be returned, to be checked later - fixed hash comparison for password - removed some code which is not needed anymore with Python 3 - deactivated some code which needs to be checked (notably certificate validation) - tested with jp, fixed reported issues until some basic commands worked - ported Primitivus (after porting dependencies like urwid satext) - more manual fixes

author	Goffi <goffi@goffi.org>
date	Tue, 13 Aug 2019 19:08:41 +0200
parents	420897488080
children	82eee2c383d9

comparison

equal deleted inserted replaced

-:ff5bcb12ae60
+:ab2696e34d29
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # SAT plugin for account creation (experimental)
 # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org)
 from sat.core import exceptions
 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
+import configparser
 from twisted.internet import defer
 from twisted.python.failure import Failure
 from twisted.words.protocols.jabber import jid
 from sat.tools.common import email as sat_email
 C.PI_PROTOCOLS: [],
 C.PI_DEPENDENCIES: ["XEP-0077"],
 C.PI_RECOMMENDATIONS: ["GROUPBLOG"],
 C.PI_MAIN: "MiscAccount",
 C.PI_HANDLER: "no",
-C.PI_DESCRIPTION: _(u"""SàT account creation"""),
+C.PI_DESCRIPTION: _("""SàT account creation"""),
 }
 CONFIG_SECTION = "plugin account"
 # You need do adapt the following consts to your server
 "new_account_domain": "",  #  use xmpp_domain if not found
 "reserved_list": ["libervia"],  # profiles which can't be used
 }
 WELCOME_MSG = D_(
-u"""Welcome to Libervia, the web interface of Salut à Toi.
+"""Welcome to Libervia, the web interface of Salut à Toi.
 Your account on {domain} has been successfully created.
 This is a demonstration version to show you the current status of the project.
 It is still under development, please keep it in mind!
 Salut à Toi association
 https://www.salut-a-toi.org
 """
 )
-DEFAULT_DOMAIN = u"example.net"
+DEFAULT_DOMAIN = "example.net"
 class MiscAccount(object):
 """Account plugin: create a SàT + XMPP account, used by Libervia"""
 # XXX: This plugin was initialy a Q&D one used for the demo.
 # TODO: cleaning, separate email handling, more configuration/tests, fixes
 def __init__(self, host):
-log.info(_(u"Plugin Account initialization"))
+log.info(_("Plugin Account initialization"))
 self.host = host
 host.bridge.addMethod(
 "registerSatAccount",
 ".plugin",
 in_sign="sss",
 out_sign="",
 method=self._registerAccount,
-async=True,
+async_=True,
 )
 host.bridge.addMethod(
 "getNewAccountDomain",
 ".plugin",
 in_sign="",
 out_sign="s",
 method=self.getNewAccountDomain,
-async=False,
+async_=False,
 )
 host.bridge.addMethod(
 "getAccountDialogUI",
 ".plugin",
 in_sign="s",
 out_sign="s",
 method=self._getAccountDialogUI,
-async=False,
+async_=False,
 )
 host.bridge.addMethod(
 "asyncConnectWithXMPPCredentials",
 ".plugin",
 in_sign="ss",
 out_sign="b",
 method=self.asyncConnectWithXMPPCredentials,
-async=True,
+async_=True,
 )
 self.fixEmailAdmins()
 self._sessions = Sessions()
 """Handle deprecated config option "admin_email" to fix the admin emails list"""
 admin_email = self.getConfig("admin_email")
 if not admin_email:
 return
 log.warning(
-u"admin_email parameter is deprecated, please use email_admins_list instead"
+"admin_email parameter is deprecated, please use email_admins_list instead"
 )
 param_name = "email_admins_list"
 try:
 section = ""
 value = self.host.memory.getConfig(section, param_name, Exception)
-except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
+except (configparser.NoOptionError, configparser.NoSectionError):
 section = CONFIG_SECTION
 value = self.host.memory.getConfig(
 section, param_name, default_conf[param_name]
 )
 # 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):
+except (configparser.NoOptionError, configparser.NoSectionError):
 pass
 else:
 return value
 if section == CONFIG_SECTION:
 """
 if jid_s:
 d = defer.succeed(None)
 jid_ = jid.JID(jid_s)
 else:
-jid_s = profile + u"@" + self.getNewAccountDomain()
+jid_s = profile + "@" + self.getNewAccountDomain()
 jid_ = jid.JID(jid_s)
 d = self.host.plugins["XEP-0077"].registerNewAccount(jid_, password)
 def setParams(__):
 self.host.memory.setParam(
 return d
 def _sendEmailEb(self, failure_, email):
 # TODO: return error code to user
 log.error(
-_(u"Failed to send account creation confirmation to {email}: {msg}").format(
+_("Failed to send account creation confirmation to {email}: {msg}").format(
 email=email, msg=failure_
 )
 )
 def sendEmails(self, email, profile):
 # email to the administrators
 admins_emails = self.getConfig("email_admins_list")
 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"
+"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:
-subject = _(u"New Libervia account created")
+subject = _("New Libervia account created")
-body = u"""New account created: {profile} [{email}]""".format(
+body = """New account created: {profile} [{email}]""".format(
 profile=profile,
 # there is no email when an existing XMPP account is used
-email=email or u"<no email>",
+email=email or "<no email>",
 )
 d_admin = sat_email.sendEmail(self.host, admins_emails, subject, body)
-admins_emails_txt = u", ".join([u"<" + addr + u">" for addr in admins_emails])
+admins_emails_txt = ", ".join(["<" + addr + ">" for addr in admins_emails])
 d_admin.addCallbacks(
 lambda __: log.debug(
-u"Account creation notification sent to admin(s) {}".format(
+"Account creation notification sent to admin(s) {}".format(
 admins_emails_txt
 )
 ),
 lambda __: log.error(
-u"Failed to send account creation notification to admin {}".format(
+"Failed to send account creation notification to admin {}".format(
 admins_emails_txt
 )
 ),
 )
 if not email:
 # TODO: if use register with an existing account, an XMPP message should be sent
 return d_admin
 jid_s = self.host.memory.getParamA(
-u"JabberID", u"Connection", profile_key=profile
+"JabberID", "Connection", profile_key=profile
 )
-subject = _(u"Your Libervia account has been created")
+subject = _("Your Libervia account has been created")
 body = _(WELCOME_MSG).format(profile=profile, jid=jid_s, domain=domain)
 # 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 = sat_email.sendEmail(self.host, [email], subject, body)
 d_user.addCallbacks(
 lambda __: log.debug(
-u"Account creation confirmation sent to <{}>".format(email)
+"Account creation confirmation sent to <{}>".format(email)
 ),
 self._sendEmailEb,
 )
 return defer.DeferredList([d_user, d_admin])
 "xmpp_domain", None
 )
 if not domain:
 log.warning(
 _(
-u'xmpp_domain needs to be set in sat.conf. Using "{default}" meanwhile'
+'xmpp_domain needs to be set in sat.conf. Using "{default}" meanwhile'
 ).format(default=DEFAULT_DOMAIN)
 )
 return DEFAULT_DOMAIN
 return domain

Mercurial > libervia-backend

comparison sat/plugins/plugin_misc_account.py @ 3028:ab2696e34d29