From 76c5100fa3cea1d2983f63fd1f13054d8a6d3e50 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 28 Sep 2022 10:48:41 +0200 Subject: [PATCH 01/11] return to copy base --- ereuse_devicehub/forms.py | 47 ++++++++++ .../ereuse_devicehub/user_login.html | 2 +- .../ereuse_devicehub/user_registration.html | 94 +++++++++++++++++++ ereuse_devicehub/views.py | 20 +++- 4 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 ereuse_devicehub/templates/ereuse_devicehub/user_registration.html diff --git a/ereuse_devicehub/forms.py b/ereuse_devicehub/forms.py index 0f4cefbe..022ea08e 100644 --- a/ereuse_devicehub/forms.py +++ b/ereuse_devicehub/forms.py @@ -101,3 +101,50 @@ class PasswordForm(FlaskForm): if commit: db.session.commit() return + + +class UserNewRegisterForm(FlaskForm): + email = EmailField('Email Address', [ + validators.DataRequired(), + validators.Length(min=6, max=35) + ]) + password = PasswordField('Password', [validators.DataRequired()]) + password2 = PasswordField('Password', [validators.DataRequired()]) + + error_messages = { + 'invalid_login': ( + "Please enter a correct email and password. Note that both " + "fields may be case-sensitive." + ), + 'inactive': "This account is inactive.", + } + + def validate(self, extra_validators=None): + is_valid = super().validate(extra_validators) + + if not is_valid: + return False + + email = self.email.data + password = self.password.data + password2 = self.password2.data + if password != password2: + self.form_errors.append('The passwords are not equal.') + + txt = 'This email are in use.' + email = self.email.data + if User.query.filter_by(email=email).first(): + self.form_errors.append(txt) + + # def authenticate(self, email, password): + # if email is None or password is None: + # return + # user = User.query.filter_by(email=email).first() + # if user is None: + # # Run the default password hasher once to reduce the timing + # # difference between an existing and a nonexistent user (#20760). + # generate_password_hash(password) + # else: + # if user.check_password(password): + # return user + diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html index f6423759..da621992 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html @@ -60,7 +60,7 @@
-

Don't have account? Create an account

+

Don't have account? Create an account

diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html b/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html new file mode 100644 index 00000000..549ea9a8 --- /dev/null +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html @@ -0,0 +1,94 @@ +{% extends "ereuse_devicehub/base.html" %} + +{% block page_title %}Login{% endblock %} + +{% block body %} +
+
+ +
+
+
+
+ +
+ +
+ +
+ +
+ +
+
Register as a new User
+

Enter an Email & password for to do a new register.

+ {% if form.form_errors %} +

+ {% for error in form.form_errors %} + {{ error }}
+ {% endfor %} +

+ {% endif %} +
+ +
+ {{ form.csrf_token }} + +
+ + +
Please enter your email.
+
+ +
+ + +
Please enter a password!
+
+ +
+ + +
Please enter a password again!
+
+ +
+ +
+
+

Don't have account? Create an account

+
+
+ +
+
+ +
+ Designed by BootstrapMade +
+ +
+
+
+ +
+ +
+
+ + + +{% endblock body %} diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py index dc426d8e..b1b18c3f 100644 --- a/ereuse_devicehub/views.py +++ b/ereuse_devicehub/views.py @@ -6,7 +6,7 @@ from sqlalchemy import or_ from ereuse_devicehub import __version__, messages from ereuse_devicehub.db import db -from ereuse_devicehub.forms import LoginForm, PasswordForm +from ereuse_devicehub.forms import LoginForm, PasswordForm, UserNewRegisterForm from ereuse_devicehub.resources.action.models import Trade from ereuse_devicehub.resources.lot.models import Lot from ereuse_devicehub.resources.user.models import User @@ -108,7 +108,25 @@ class UserPasswordView(View): return flask.redirect(flask.url_for('core.user-profile')) +class UserRegistrationView(View): + methods = ['GET', 'POST'] + template_name = 'ereuse_devicehub/user_registration.html' + + def dispatch_request(self): + form = UserNewRegisterForm() + if form.validate_on_submit(): + + next_url = flask.request.args.get('next') + if not is_safe_url(flask.request, next_url): + return flask.abort(400) + + return flask.redirect(next_url or flask.url_for('core.login')) + context = {'form': form, 'version': __version__} + return flask.render_template(self.template_name, **context) + + core.add_url_rule('/login/', view_func=LoginView.as_view('login')) core.add_url_rule('/logout/', view_func=LogoutView.as_view('logout')) core.add_url_rule('/profile/', view_func=UserProfileView.as_view('user-profile')) +core.add_url_rule('/new_register/', view_func=UserRegistrationView.as_view('user-registration')) core.add_url_rule('/set_password/', view_func=UserPasswordView.as_view('set-password')) From d36008934a82375c84c67cdb03e62b3adef9a3c8 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 28 Sep 2022 17:51:31 +0200 Subject: [PATCH 02/11] details in register --- ereuse_devicehub/forms.py | 44 ++++++++++++------- .../ereuse_devicehub/user_registration.html | 12 ++++- ereuse_devicehub/views.py | 13 +++--- 3 files changed, 45 insertions(+), 24 deletions(-) diff --git a/ereuse_devicehub/forms.py b/ereuse_devicehub/forms.py index 022ea08e..36b3f91f 100644 --- a/ereuse_devicehub/forms.py +++ b/ereuse_devicehub/forms.py @@ -1,9 +1,17 @@ from flask import g from flask_wtf import FlaskForm from werkzeug.security import generate_password_hash -from wtforms import BooleanField, EmailField, PasswordField, validators +from wtforms import ( + BooleanField, + EmailField, + PasswordField, + StringField, + TelField, + validators, +) from ereuse_devicehub.db import db +from ereuse_devicehub.resources.agent.models import Person from ereuse_devicehub.resources.user.models import User @@ -104,12 +112,15 @@ class PasswordForm(FlaskForm): class UserNewRegisterForm(FlaskForm): - email = EmailField('Email Address', [ - validators.DataRequired(), - validators.Length(min=6, max=35) - ]) + email = EmailField( + 'Email Address', [validators.DataRequired(), validators.Length(min=6, max=35)] + ) password = PasswordField('Password', [validators.DataRequired()]) password2 = PasswordField('Password', [validators.DataRequired()]) + name = StringField( + 'Name', [validators.DataRequired(), validators.Length(min=3, max=35)] + ) + telephone = TelField('Telephone', [validators.DataRequired()]) error_messages = { 'invalid_login': ( @@ -130,21 +141,22 @@ class UserNewRegisterForm(FlaskForm): password2 = self.password2.data if password != password2: self.form_errors.append('The passwords are not equal.') + return False txt = 'This email are in use.' email = self.email.data if User.query.filter_by(email=email).first(): self.form_errors.append(txt) + return False - # def authenticate(self, email, password): - # if email is None or password is None: - # return - # user = User.query.filter_by(email=email).first() - # if user is None: - # # Run the default password hasher once to reduce the timing - # # difference between an existing and a nonexistent user (#20760). - # generate_password_hash(password) - # else: - # if user.check_password(password): - # return user + return True + def save(self, commit=True): + user = User(email=self.email.data, password=self.password.data) + person = Person( + email=self.email.data, name=self.name.data, telephone=self.telephone.data + ) + user.individuals.add(person) + db.session.add(user) + if commit: + db.session.commit() diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html b/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html index 549ea9a8..92c07c23 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html @@ -55,7 +55,17 @@
- + + +
+ +
+ + +
+ +
+

Don't have account? Create an account

diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py index b1b18c3f..53e10b9a 100644 --- a/ereuse_devicehub/views.py +++ b/ereuse_devicehub/views.py @@ -115,12 +115,9 @@ class UserRegistrationView(View): def dispatch_request(self): form = UserNewRegisterForm() if form.validate_on_submit(): - - next_url = flask.request.args.get('next') - if not is_safe_url(flask.request, next_url): - return flask.abort(400) - - return flask.redirect(next_url or flask.url_for('core.login')) + form.save() + messages.success('User created successfully!') + return flask.redirect(flask.url_for('core.login')) context = {'form': form, 'version': __version__} return flask.render_template(self.template_name, **context) @@ -128,5 +125,7 @@ class UserRegistrationView(View): core.add_url_rule('/login/', view_func=LoginView.as_view('login')) core.add_url_rule('/logout/', view_func=LogoutView.as_view('logout')) core.add_url_rule('/profile/', view_func=UserProfileView.as_view('user-profile')) -core.add_url_rule('/new_register/', view_func=UserRegistrationView.as_view('user-registration')) +core.add_url_rule( + '/new_register/', view_func=UserRegistrationView.as_view('user-registration') +) core.add_url_rule('/set_password/', view_func=UserPasswordView.as_view('set-password')) From 6357a15f01bc7a0e48830bb6d34d0c233f2a7ebf Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 30 Sep 2022 17:54:26 +0200 Subject: [PATCH 03/11] fix migrations --- ereuse_devicehub/forms.py | 13 +++- .../versions/abba37ff5c80_user_validation.py | 60 +++++++++++++++++++ ereuse_devicehub/resources/user/models.py | 16 +++++ .../ereuse_devicehub/user_registration.html | 9 +++ ereuse_devicehub/views.py | 2 - 5 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 ereuse_devicehub/migrations/versions/abba37ff5c80_user_validation.py diff --git a/ereuse_devicehub/forms.py b/ereuse_devicehub/forms.py index 36b3f91f..b31f22f9 100644 --- a/ereuse_devicehub/forms.py +++ b/ereuse_devicehub/forms.py @@ -12,7 +12,7 @@ from wtforms import ( from ereuse_devicehub.db import db from ereuse_devicehub.resources.agent.models import Person -from ereuse_devicehub.resources.user.models import User +from ereuse_devicehub.resources.user.models import User, UserValidation class LoginForm(FlaskForm): @@ -152,11 +152,20 @@ class UserNewRegisterForm(FlaskForm): return True def save(self, commit=True): - user = User(email=self.email.data, password=self.password.data) + user = User(email=self.email.data, password=self.password.data, active=False) + person = Person( email=self.email.data, name=self.name.data, telephone=self.telephone.data ) + user.individuals.add(person) db.session.add(user) + + user_validation = UserValidation( + user=user, + ) + self._token = user_validation.token + db.session.add(user_validation) + if commit: db.session.commit() diff --git a/ereuse_devicehub/migrations/versions/abba37ff5c80_user_validation.py b/ereuse_devicehub/migrations/versions/abba37ff5c80_user_validation.py new file mode 100644 index 00000000..223a9634 --- /dev/null +++ b/ereuse_devicehub/migrations/versions/abba37ff5c80_user_validation.py @@ -0,0 +1,60 @@ +"""user validation + +Revision ID: abba37ff5c80 +Revises: e919fe0611ff +Create Date: 2022-09-30 10:01:19.761864 + +""" +import sqlalchemy as sa +from alembic import context, op +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = 'abba37ff5c80' +down_revision = 'e919fe0611ff' +branch_labels = None +depends_on = None + + +def get_inv(): + INV = context.get_x_argument(as_dictionary=True).get('inventory') + if not INV: + raise ValueError("Inventory value is not specified") + return INV + + +def upgrade(): + op.create_table( + 'user_validation', + sa.Column('id', sa.BigInteger(), nullable=False), + sa.Column( + 'updated', + sa.TIMESTAMP(timezone=True), + server_default=sa.text('CURRENT_TIMESTAMP'), + nullable=False, + ), + sa.Column( + 'created', + sa.TIMESTAMP(timezone=True), + server_default=sa.text('CURRENT_TIMESTAMP'), + nullable=False, + ), + sa.Column('joined_at', sa.TIMESTAMP(timezone=True), nullable=True), + sa.Column('expired', sa.BigInteger(), nullable=False), + sa.Column('token', postgresql.UUID(as_uuid=True), nullable=False), + sa.Column('user_id', postgresql.UUID(as_uuid=True), nullable=False), + sa.PrimaryKeyConstraint('id'), + sa.ForeignKeyConstraint( + ['user_id'], + ['common.user.id'], + ), + sa.UniqueConstraint('token'), + schema=f'{get_inv()}', + ) + + op.execute(f"CREATE SEQUENCE {get_inv()}.user_validation_seq;") + + +def downgrade(): + op.drop_table('user_validation', schema=f'{get_inv()}') + op.execute(f"DROP SEQUENCE {get_inv()}.user_validation_seq;") diff --git a/ereuse_devicehub/resources/user/models.py b/ereuse_devicehub/resources/user/models.py index 5eadb21d..a65554ee 100644 --- a/ereuse_devicehub/resources/user/models.py +++ b/ereuse_devicehub/resources/user/models.py @@ -119,3 +119,19 @@ class Session(Thing): def __str__(self) -> str: return '{0.token}'.format(self) + + +class UserValidation(Thing): + id = Column(BigInteger, Sequence('user_validation_seq'), primary_key=True) + expired = Column(BigInteger, default=0) + joined_at = db.Column(db.DateTime()) + token = Column(UUID(as_uuid=True), default=uuid4, unique=True, nullable=False) + user_id = db.Column(db.UUID(as_uuid=True), db.ForeignKey(User.id)) + user = db.relationship( + User, + backref=db.backref('user_validation', lazy=True, collection_class=set), + collection_class=set, + ) + + def __str__(self) -> str: + return '{0.token}'.format(self) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html b/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html index 92c07c23..5a1babcc 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html @@ -23,6 +23,7 @@
Register as a new User
+ {% if not form._token %}

Enter an Email & password for to do a new register.

{% if form.form_errors %}

@@ -71,6 +72,14 @@

Don't have account? Create an account

+ {% else %} +
+ We have sent you a validation email. Please check your email. +
+
+ {{ form._token }} +
+ {% endif %}
diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py index 53e10b9a..cfd449af 100644 --- a/ereuse_devicehub/views.py +++ b/ereuse_devicehub/views.py @@ -116,8 +116,6 @@ class UserRegistrationView(View): form = UserNewRegisterForm() if form.validate_on_submit(): form.save() - messages.success('User created successfully!') - return flask.redirect(flask.url_for('core.login')) context = {'form': form, 'version': __version__} return flask.render_template(self.template_name, **context) From 9184edf9b1cfb4a7e5854684430dc80fb537a3a9 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 30 Sep 2022 19:04:37 +0200 Subject: [PATCH 04/11] add mail configs --- ereuse_devicehub/config.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ereuse_devicehub/config.py b/ereuse_devicehub/config.py index 490336a7..0a5a06ae 100644 --- a/ereuse_devicehub/config.py +++ b/ereuse_devicehub/config.py @@ -86,3 +86,9 @@ class DevicehubConfig(Config): """Definition of path where save the documents of customers""" PATH_DOCUMENTS_STORAGE = config('PATH_DOCUMENTS_STORAGE', '/tmp/') JWT_PASS = config('JWT_PASS', '') + + MAIL_SERVER = config('MAIL_SERVER', '') + MAIL_USERNAME = config('MAIL_USERNAME', '') + MAIL_PASSWORD = config('MAIL_PASSWORD', '') + MAIL_PORT = config('MAIL_PORT', 587) + MAIL_USE_TLS = config('MAIL_USE_TLS', True) From a9d6ac22f9505001805da0f78a54a9bf362b0a5f Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 30 Sep 2022 19:05:10 +0200 Subject: [PATCH 05/11] mail sender --- ereuse_devicehub/mail/__init__.py | 3 ++ ereuse_devicehub/mail/mail.py | 48 +++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 ereuse_devicehub/mail/__init__.py create mode 100644 ereuse_devicehub/mail/mail.py diff --git a/ereuse_devicehub/mail/__init__.py b/ereuse_devicehub/mail/__init__.py new file mode 100644 index 00000000..97987ead --- /dev/null +++ b/ereuse_devicehub/mail/__init__.py @@ -0,0 +1,3 @@ +from flask_mail import Mail + +mail = Mail() diff --git a/ereuse_devicehub/mail/mail.py b/ereuse_devicehub/mail/mail.py new file mode 100644 index 00000000..14e63f17 --- /dev/null +++ b/ereuse_devicehub/mail/mail.py @@ -0,0 +1,48 @@ +import logging +from smtplib import SMTPException +from threading import Thread +from flask import current_app +from flask_mail import Message, Mail + +logger = logging.getLogger(__name__) + + +def _send_async_email(app, msg): + with app.app_context(): + if not app.config['MAIL_SERVER']: + logger.exception("Mail server is not config") + return + + try: + mail.send(msg) + except SMTPException: + logger.exception("Ocurrió un error al enviar el email") + + +def send_email(subject, sender, recipients, text_body, + cc=None, bcc=None, html_body=None): + + msg = Message( + subject, + sender=sender, + recipients=recipients, + cc=cc, + bcc=bcc + ) + + msg.body = text_body + + if html_body: + msg.html = html_body + + Thread( + target=_send_async_email, + args=(current_app._get_current_object(), msg) + ).start() + + +# from flask_mail import Message +# from ereuse_devicehub import mail +# msg = Message("Hola", sender="cayo@usody.com", recipients=["cayo@usody.com"] +# msg.body = "hola como te va?" +# mail.send(msg) From 9e86f0e3ae8fd51abf401d9e36acb7687dca74bd Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 19 Oct 2022 13:35:53 +0200 Subject: [PATCH 06/11] send email --- ereuse_devicehub/config.py | 1 + ereuse_devicehub/forms.py | 35 +- ereuse_devicehub/mail/__init__.py | 3 - ereuse_devicehub/mail/flask_mail.py | 583 ++++++++++++++++++ ereuse_devicehub/mail/mail.py | 48 -- ereuse_devicehub/mail/sender.py | 34 + .../versions/abba37ff5c80_user_validation.py | 4 +- examples/app.py | 4 + 8 files changed, 655 insertions(+), 57 deletions(-) create mode 100644 ereuse_devicehub/mail/flask_mail.py delete mode 100644 ereuse_devicehub/mail/mail.py create mode 100644 ereuse_devicehub/mail/sender.py diff --git a/ereuse_devicehub/config.py b/ereuse_devicehub/config.py index 0a5a06ae..86500e26 100644 --- a/ereuse_devicehub/config.py +++ b/ereuse_devicehub/config.py @@ -92,3 +92,4 @@ class DevicehubConfig(Config): MAIL_PASSWORD = config('MAIL_PASSWORD', '') MAIL_PORT = config('MAIL_PORT', 587) MAIL_USE_TLS = config('MAIL_USE_TLS', True) + MAIL_DEFAULT_SENDER = config('MAIL_DEFAULT_SENDER', '') diff --git a/ereuse_devicehub/forms.py b/ereuse_devicehub/forms.py index b31f22f9..2940623d 100644 --- a/ereuse_devicehub/forms.py +++ b/ereuse_devicehub/forms.py @@ -1,4 +1,5 @@ from flask import g +from flask import current_app as app from flask_wtf import FlaskForm from werkzeug.security import generate_password_hash from wtforms import ( @@ -11,6 +12,7 @@ from wtforms import ( ) from ereuse_devicehub.db import db +from ereuse_devicehub.mail.sender import send_email from ereuse_devicehub.resources.agent.models import Person from ereuse_devicehub.resources.user.models import User, UserValidation @@ -113,7 +115,10 @@ class PasswordForm(FlaskForm): class UserNewRegisterForm(FlaskForm): email = EmailField( - 'Email Address', [validators.DataRequired(), validators.Length(min=6, max=35)] + 'Email Address', [ + validators.DataRequired(), + validators.Length(min=6, max=35) + ] ) password = PasswordField('Password', [validators.DataRequired()]) password2 = PasswordField('Password', [validators.DataRequired()]) @@ -149,13 +154,22 @@ class UserNewRegisterForm(FlaskForm): self.form_errors.append(txt) return False + self.email.data = self.email.data.strip() + self.password.data = self.password.data.strip() + return True def save(self, commit=True): - user = User(email=self.email.data, password=self.password.data, active=False) + user = User( + email=self.email.data, + password=self.password.data, + active=False + ) person = Person( - email=self.email.data, name=self.name.data, telephone=self.telephone.data + email=self.email.data, + name=self.name.data, + telephone=self.telephone.data ) user.individuals.add(person) @@ -164,8 +178,21 @@ class UserNewRegisterForm(FlaskForm): user_validation = UserValidation( user=user, ) - self._token = user_validation.token db.session.add(user_validation) if commit: db.session.commit() + + self._token = user_validation.token + self.send_mail() + + def send_mail(self): + host = app.config.get('HOST') + token = self._token + url = f'https://{ host }/validate/{ token }' + message = """Hello, you are register in Usody.com + Please for activate your account click in the next address: """ + message += url + subject = "Validate email for register in Usody.com" + + send_email(subject, [self.email.data], message) diff --git a/ereuse_devicehub/mail/__init__.py b/ereuse_devicehub/mail/__init__.py index 97987ead..e69de29b 100644 --- a/ereuse_devicehub/mail/__init__.py +++ b/ereuse_devicehub/mail/__init__.py @@ -1,3 +0,0 @@ -from flask_mail import Mail - -mail = Mail() diff --git a/ereuse_devicehub/mail/flask_mail.py b/ereuse_devicehub/mail/flask_mail.py new file mode 100644 index 00000000..7f2b87b4 --- /dev/null +++ b/ereuse_devicehub/mail/flask_mail.py @@ -0,0 +1,583 @@ +# -*- coding: utf-8 -*- +""" + flaskext.mail + ~~~~~~~~~~~~~ + + Flask extension for sending email. + + :copyright: (c) 2010 by Dan Jacob. + :license: BSD, see LICENSE for more details. +""" + +from __future__ import with_statement + +__version__ = '0.9.1' + +import re +import blinker +import smtplib +import sys +import time +import unicodedata + +from email import charset +from email.encoders import encode_base64 +from email.mime.base import MIMEBase +from email.mime.multipart import MIMEMultipart +from email.mime.text import MIMEText +from email.header import Header +from email.utils import formatdate, formataddr, make_msgid, parseaddr +from contextlib import contextmanager + +from flask import current_app + +PY3 = sys.version_info[0] == 3 + +PY34 = PY3 and sys.version_info[1] >= 4 + +if PY3: + string_types = str, + text_type = str + from email import policy + message_policy = policy.SMTP +else: + string_types = basestring, + text_type = unicode + message_policy = None + +charset.add_charset('utf-8', charset.SHORTEST, None, 'utf-8') + + +class FlaskMailUnicodeDecodeError(UnicodeDecodeError): + def __init__(self, obj, *args): + self.obj = obj + UnicodeDecodeError.__init__(self, *args) + + def __str__(self): + original = UnicodeDecodeError.__str__(self) + return '%s. You passed in %r (%s)' % (original, self.obj, type(self.obj)) + + +def force_text(s, encoding='utf-8', errors='strict'): + """ + Similar to smart_text, except that lazy instances are resolved to + strings, rather than kept as lazy objects. + + If strings_only is True, don't convert (some) non-string-like objects. + """ + if isinstance(s, text_type): + return s + + try: + if not isinstance(s, string_types): + if PY3: + if isinstance(s, bytes): + s = text_type(s, encoding, errors) + else: + s = text_type(s) + elif hasattr(s, '__unicode__'): + s = s.__unicode__() + else: + s = text_type(bytes(s), encoding, errors) + else: + s = s.decode(encoding, errors) + except UnicodeDecodeError as e: + if not isinstance(s, Exception): + raise FlaskMailUnicodeDecodeError(s, *e.args) + else: + s = ' '.join([force_text(arg, encoding, strings_only, + errors) for arg in s]) + return s + +def sanitize_subject(subject, encoding='utf-8'): + try: + subject.encode('ascii') + except UnicodeEncodeError: + try: + subject = Header(subject, encoding).encode() + except UnicodeEncodeError: + subject = Header(subject, 'utf-8').encode() + return subject + +def sanitize_address(addr, encoding='utf-8'): + if isinstance(addr, string_types): + addr = parseaddr(force_text(addr)) + nm, addr = addr + + try: + nm = Header(nm, encoding).encode() + except UnicodeEncodeError: + nm = Header(nm, 'utf-8').encode() + try: + addr.encode('ascii') + except UnicodeEncodeError: # IDN + if '@' in addr: + localpart, domain = addr.split('@', 1) + localpart = str(Header(localpart, encoding)) + domain = domain.encode('idna').decode('ascii') + addr = '@'.join([localpart, domain]) + else: + addr = Header(addr, encoding).encode() + return formataddr((nm, addr)) + + +def sanitize_addresses(addresses, encoding='utf-8'): + return map(lambda e: sanitize_address(e, encoding), addresses) + + +def _has_newline(line): + """Used by has_bad_header to check for \\r or \\n""" + if line and ('\r' in line or '\n' in line): + return True + return False + +class Connection(object): + """Handles connection to host.""" + + def __init__(self, mail): + self.mail = mail + + def __enter__(self): + if self.mail.suppress: + self.host = None + else: + self.host = self.configure_host() + + self.num_emails = 0 + + return self + + def __exit__(self, exc_type, exc_value, tb): + if self.host: + self.host.quit() + + def configure_host(self): + if self.mail.use_ssl: + host = smtplib.SMTP_SSL(self.mail.server, self.mail.port) + else: + host = smtplib.SMTP(self.mail.server, self.mail.port) + + host.set_debuglevel(int(self.mail.debug)) + + if self.mail.use_tls: + host.starttls() + if self.mail.username and self.mail.password: + host.login(self.mail.username, self.mail.password) + + return host + + def send(self, message, envelope_from=None): + """Verifies and sends message. + + :param message: Message instance. + :param envelope_from: Email address to be used in MAIL FROM command. + """ + assert message.send_to, "No recipients have been added" + + assert message.sender, ( + "The message does not specify a sender and a default sender " + "has not been configured") + + if message.has_bad_headers(): + raise BadHeaderError + + if message.date is None: + message.date = time.time() + + if self.host: + self.host.sendmail(sanitize_address(envelope_from or message.sender), + list(sanitize_addresses(message.send_to)), + message.as_bytes() if PY3 else message.as_string(), + message.mail_options, + message.rcpt_options) + + email_dispatched.send(message, app=current_app._get_current_object()) + + self.num_emails += 1 + + if self.num_emails == self.mail.max_emails: + self.num_emails = 0 + if self.host: + self.host.quit() + self.host = self.configure_host() + + def send_message(self, *args, **kwargs): + """Shortcut for send(msg). + + Takes same arguments as Message constructor. + + :versionadded: 0.3.5 + """ + + self.send(Message(*args, **kwargs)) + + +class BadHeaderError(Exception): + pass + + +class Attachment(object): + """Encapsulates file attachment information. + + :versionadded: 0.3.5 + + :param filename: filename of attachment + :param content_type: file mimetype + :param data: the raw file data + :param disposition: content-disposition (if any) + """ + + def __init__(self, filename=None, content_type=None, data=None, + disposition=None, headers=None): + self.filename = filename + self.content_type = content_type + self.data = data + self.disposition = disposition or 'attachment' + self.headers = headers or {} + + +class Message(object): + """Encapsulates an email message. + + :param subject: email subject header + :param recipients: list of email addresses + :param body: plain text message + :param html: HTML message + :param sender: email sender address, or **MAIL_DEFAULT_SENDER** by default + :param cc: CC list + :param bcc: BCC list + :param attachments: list of Attachment instances + :param reply_to: reply-to address + :param date: send date + :param charset: message character set + :param extra_headers: A dictionary of additional headers for the message + :param mail_options: A list of ESMTP options to be used in MAIL FROM command + :param rcpt_options: A list of ESMTP options to be used in RCPT commands + """ + + def __init__(self, subject='', + recipients=None, + body=None, + html=None, + sender=None, + cc=None, + bcc=None, + attachments=None, + reply_to=None, + date=None, + charset=None, + extra_headers=None, + mail_options=None, + rcpt_options=None): + + sender = sender or current_app.extensions['mail'].default_sender + + if isinstance(sender, tuple): + sender = "%s <%s>" % sender + + self.recipients = recipients or [] + self.subject = subject + self.sender = sender + self.reply_to = reply_to + self.cc = cc or [] + self.bcc = bcc or [] + self.body = body + self.html = html + self.date = date + self.msgId = make_msgid() + self.charset = charset + self.extra_headers = extra_headers + self.mail_options = mail_options or [] + self.rcpt_options = rcpt_options or [] + self.attachments = attachments or [] + + @property + def send_to(self): + return set(self.recipients) | set(self.bcc or ()) | set(self.cc or ()) + + def _mimetext(self, text, subtype='plain'): + """Creates a MIMEText object with the given subtype (default: 'plain') + If the text is unicode, the utf-8 charset is used. + """ + charset = self.charset or 'utf-8' + return MIMEText(text, _subtype=subtype, _charset=charset) + + def _message(self): + """Creates the email""" + ascii_attachments = current_app.extensions['mail'].ascii_attachments + encoding = self.charset or 'utf-8' + + attachments = self.attachments or [] + + if len(attachments) == 0 and not self.html: + # No html content and zero attachments means plain text + msg = self._mimetext(self.body) + elif len(attachments) > 0 and not self.html: + # No html and at least one attachment means multipart + msg = MIMEMultipart() + msg.attach(self._mimetext(self.body)) + else: + # Anything else + msg = MIMEMultipart() + alternative = MIMEMultipart('alternative') + alternative.attach(self._mimetext(self.body, 'plain')) + alternative.attach(self._mimetext(self.html, 'html')) + msg.attach(alternative) + + if self.subject: + msg['Subject'] = sanitize_subject(force_text(self.subject), encoding) + + msg['From'] = sanitize_address(self.sender, encoding) + msg['To'] = ', '.join(list(set(sanitize_addresses(self.recipients, encoding)))) + + msg['Date'] = formatdate(self.date, localtime=True) + # see RFC 5322 section 3.6.4. + msg['Message-ID'] = self.msgId + + if self.cc: + msg['Cc'] = ', '.join(list(set(sanitize_addresses(self.cc, encoding)))) + + if self.reply_to: + msg['Reply-To'] = sanitize_address(self.reply_to, encoding) + + if self.extra_headers: + for k, v in self.extra_headers.items(): + msg[k] = v + + SPACES = re.compile(r'[\s]+', re.UNICODE) + for attachment in attachments: + f = MIMEBase(*attachment.content_type.split('/')) + f.set_payload(attachment.data) + encode_base64(f) + + filename = attachment.filename + if filename and ascii_attachments: + # force filename to ascii + filename = unicodedata.normalize('NFKD', filename) + filename = filename.encode('ascii', 'ignore').decode('ascii') + filename = SPACES.sub(u' ', filename).strip() + + try: + filename and filename.encode('ascii') + except UnicodeEncodeError: + if not PY3: + filename = filename.encode('utf8') + filename = ('UTF8', '', filename) + + f.add_header('Content-Disposition', + attachment.disposition, + filename=filename) + + for key, value in attachment.headers: + f.add_header(key, value) + + msg.attach(f) + if message_policy: + msg.policy = message_policy + + return msg + + def as_string(self): + return self._message().as_string() + + def as_bytes(self): + # if PY34: + # return self._message().as_bytes() + # else: # fallback for old Python (3) versions + # return self._message().as_string().encode(self.charset or 'utf-8') + return self._message().as_string().encode(self.charset or 'utf-8') + + def __str__(self): + return self.as_string() + + def __bytes__(self): + return self.as_bytes() + + def has_bad_headers(self): + """Checks for bad headers i.e. newlines in subject, sender or recipients. + RFC5322: Allows multiline CRLF with trailing whitespace (FWS) in headers + """ + + headers = [self.sender, self.reply_to] + self.recipients + for header in headers: + if _has_newline(header): + return True + + if self.subject: + if _has_newline(self.subject): + for linenum, line in enumerate(self.subject.split('\r\n')): + if not line: + return True + if linenum > 0 and line[0] not in '\t ': + return True + if _has_newline(line): + return True + if len(line.strip()) == 0: + return True + return False + + def is_bad_headers(self): + from warnings import warn + msg = 'is_bad_headers is deprecated, use the new has_bad_headers method instead.' + warn(DeprecationWarning(msg), stacklevel=1) + return self.has_bad_headers() + + def send(self, connection): + """Verifies and sends the message.""" + + connection.send(self) + + def add_recipient(self, recipient): + """Adds another recipient to the message. + + :param recipient: email address of recipient. + """ + + self.recipients.append(recipient) + + def attach(self, + filename=None, + content_type=None, + data=None, + disposition=None, + headers=None): + """Adds an attachment to the message. + + :param filename: filename of attachment + :param content_type: file mimetype + :param data: the raw file data + :param disposition: content-disposition (if any) + """ + self.attachments.append( + Attachment(filename, content_type, data, disposition, headers)) + + +class _MailMixin(object): + + @contextmanager + def record_messages(self): + """Records all messages. Use in unit tests for example:: + + with mail.record_messages() as outbox: + response = app.test_client.get("/email-sending-view/") + assert len(outbox) == 1 + assert outbox[0].subject == "testing" + + You must have blinker installed in order to use this feature. + :versionadded: 0.4 + """ + + if not email_dispatched: + raise RuntimeError("blinker must be installed") + + outbox = [] + + def _record(message, app): + outbox.append(message) + + email_dispatched.connect(_record) + + try: + yield outbox + finally: + email_dispatched.disconnect(_record) + + def send(self, message): + """Sends a single message instance. If TESTING is True the message will + not actually be sent. + + :param message: a Message instance. + """ + + with self.connect() as connection: + message.send(connection) + + def send_message(self, *args, **kwargs): + """Shortcut for send(msg). + + Takes same arguments as Message constructor. + + :versionadded: 0.3.5 + """ + + self.send(Message(*args, **kwargs)) + + def connect(self): + """Opens a connection to the mail host.""" + app = getattr(self, "app", None) or current_app + try: + return Connection(app.extensions['mail']) + except KeyError: + raise RuntimeError("The curent application was not configured with Flask-Mail") + + +class _Mail(_MailMixin): + def __init__(self, server, username, password, port, use_tls, use_ssl, + default_sender, debug, max_emails, suppress, + ascii_attachments=False): + self.server = server + self.username = username + self.password = password + self.port = port + self.use_tls = use_tls + self.use_ssl = use_ssl + self.default_sender = default_sender + self.debug = debug + self.max_emails = max_emails + self.suppress = suppress + self.ascii_attachments = ascii_attachments + + +class Mail(_MailMixin): + """Manages email messaging + + :param app: Flask instance + """ + + def __init__(self, app=None): + self.app = app + if app is not None: + self.state = self.init_app(app) + else: + self.state = None + + def init_mail(self, config, debug=False, testing=False): + return _Mail( + config.get('MAIL_SERVER', '127.0.0.1'), + config.get('MAIL_USERNAME'), + config.get('MAIL_PASSWORD'), + config.get('MAIL_PORT', 25), + config.get('MAIL_USE_TLS', False), + config.get('MAIL_USE_SSL', False), + config.get('MAIL_DEFAULT_SENDER'), + int(config.get('MAIL_DEBUG', debug)), + config.get('MAIL_MAX_EMAILS'), + config.get('MAIL_SUPPRESS_SEND', testing), + config.get('MAIL_ASCII_ATTACHMENTS', False) + ) + + def init_app(self, app): + """Initializes your mail settings from the application settings. + + You can use this if you want to set up your Mail instance + at configuration time. + + :param app: Flask application instance + """ + state = self.init_mail(app.config, app.debug, app.testing) + + # register extension with app + app.extensions = getattr(app, 'extensions', {}) + app.extensions['mail'] = state + return state + + def __getattr__(self, name): + return getattr(self.state, name, None) + + +signals = blinker.Namespace() + +email_dispatched = signals.signal("email-dispatched", doc=""" +Signal sent when an email is dispatched. This signal will also be sent +in testing mode, even though the email will not actually be sent. +""") diff --git a/ereuse_devicehub/mail/mail.py b/ereuse_devicehub/mail/mail.py deleted file mode 100644 index 14e63f17..00000000 --- a/ereuse_devicehub/mail/mail.py +++ /dev/null @@ -1,48 +0,0 @@ -import logging -from smtplib import SMTPException -from threading import Thread -from flask import current_app -from flask_mail import Message, Mail - -logger = logging.getLogger(__name__) - - -def _send_async_email(app, msg): - with app.app_context(): - if not app.config['MAIL_SERVER']: - logger.exception("Mail server is not config") - return - - try: - mail.send(msg) - except SMTPException: - logger.exception("Ocurrió un error al enviar el email") - - -def send_email(subject, sender, recipients, text_body, - cc=None, bcc=None, html_body=None): - - msg = Message( - subject, - sender=sender, - recipients=recipients, - cc=cc, - bcc=bcc - ) - - msg.body = text_body - - if html_body: - msg.html = html_body - - Thread( - target=_send_async_email, - args=(current_app._get_current_object(), msg) - ).start() - - -# from flask_mail import Message -# from ereuse_devicehub import mail -# msg = Message("Hola", sender="cayo@usody.com", recipients=["cayo@usody.com"] -# msg.body = "hola como te va?" -# mail.send(msg) diff --git a/ereuse_devicehub/mail/sender.py b/ereuse_devicehub/mail/sender.py new file mode 100644 index 00000000..9d99e80f --- /dev/null +++ b/ereuse_devicehub/mail/sender.py @@ -0,0 +1,34 @@ +import logging +from smtplib import SMTPException +from threading import Thread + +from flask import current_app as app + +from ereuse_devicehub.mail.flask_mail import Message + +logger = logging.getLogger(__name__) + + +def _send_async_email(app, msg): + with app.app_context(): + try: + app.mail.send(msg) + except SMTPException: + logger.exception("An error occurred while sending the email") + + +def send_email( + subject, recipients, text_body, sender=None, cc=None, bcc=None, html_body=None +): + + msg = Message(subject, sender=sender, recipients=recipients, cc=cc, bcc=bcc) + + msg.body = text_body + + if html_body: + msg.html = html_body + + Thread( + target=_send_async_email, + args=(app._get_current_object(), msg) + ).start() diff --git a/ereuse_devicehub/migrations/versions/abba37ff5c80_user_validation.py b/ereuse_devicehub/migrations/versions/abba37ff5c80_user_validation.py index 223a9634..3b738257 100644 --- a/ereuse_devicehub/migrations/versions/abba37ff5c80_user_validation.py +++ b/ereuse_devicehub/migrations/versions/abba37ff5c80_user_validation.py @@ -1,7 +1,7 @@ """user validation Revision ID: abba37ff5c80 -Revises: e919fe0611ff +Revises: d65745749e34 Create Date: 2022-09-30 10:01:19.761864 """ @@ -11,7 +11,7 @@ from sqlalchemy.dialects import postgresql # revision identifiers, used by Alembic. revision = 'abba37ff5c80' -down_revision = 'e919fe0611ff' +down_revision = 'd65745749e34' branch_labels = None depends_on = None diff --git a/examples/app.py b/examples/app.py index 623bfaef..7dcd0792 100644 --- a/examples/app.py +++ b/examples/app.py @@ -6,6 +6,7 @@ Use this as a starting point. from decouple import config +from ereuse_devicehub.mail.flask_mail import Mail from ereuse_devicehub.api.views import api from ereuse_devicehub.config import DevicehubConfig from ereuse_devicehub.devicehub import Devicehub @@ -44,6 +45,9 @@ app.register_blueprint(labels) app.register_blueprint(api) app.register_blueprint(workbench) +mail = Mail(app) +app.mail = mail + # configure & enable CSRF of Flask-WTF # NOTE: enable by blueprint to exclude API views # TODO(@slamora: enable by default & exclude API views when decouple of Teal is completed From c93c143cc82dffc44467f6a71b92c7e8fb3e9521 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 19 Oct 2022 18:55:34 +0200 Subject: [PATCH 07/11] add token to user registration and admin email --- ereuse_devicehub/forms.py | 60 +++++--- ereuse_devicehub/inventory/forms.py | 4 - ereuse_devicehub/mail/flask_mail.py | 137 +++++++++++------- .../ereuse_devicehub/user_registration.html | 50 ++++--- .../ereuse_devicehub/user_validation.html | 66 +++++++++ ereuse_devicehub/views.py | 24 ++- examples/app.py | 2 +- 7 files changed, 243 insertions(+), 100 deletions(-) create mode 100644 ereuse_devicehub/templates/ereuse_devicehub/user_validation.html diff --git a/ereuse_devicehub/forms.py b/ereuse_devicehub/forms.py index 2940623d..daa0760f 100644 --- a/ereuse_devicehub/forms.py +++ b/ereuse_devicehub/forms.py @@ -1,5 +1,5 @@ -from flask import g from flask import current_app as app +from flask import g from flask_wtf import FlaskForm from werkzeug.security import generate_password_hash from wtforms import ( @@ -115,17 +115,16 @@ class PasswordForm(FlaskForm): class UserNewRegisterForm(FlaskForm): email = EmailField( - 'Email Address', [ - validators.DataRequired(), - validators.Length(min=6, max=35) - ] + 'Email Address', [validators.DataRequired(), validators.Length(min=6, max=35)] ) password = PasswordField('Password', [validators.DataRequired()]) password2 = PasswordField('Password', [validators.DataRequired()]) name = StringField( 'Name', [validators.DataRequired(), validators.Length(min=3, max=35)] ) - telephone = TelField('Telephone', [validators.DataRequired()]) + telephone = TelField( + 'Telephone', [validators.DataRequired(), validators.Length(min=9, max=35)] + ) error_messages = { 'invalid_login': ( @@ -160,16 +159,19 @@ class UserNewRegisterForm(FlaskForm): return True def save(self, commit=True): - user = User( - email=self.email.data, - password=self.password.data, - active=False - ) + user_validation = self.new_user() + if commit: + db.session.commit() + + self._token = user_validation.token + self.send_mail() + self.send_mail_admin(user_validation.user) + + def new_user(self): + user = User(email=self.email.data, password=self.password.data, active=False) person = Person( - email=self.email.data, - name=self.name.data, - telephone=self.telephone.data + email=self.email.data, name=self.name.data, telephone=self.telephone.data ) user.individuals.add(person) @@ -180,19 +182,33 @@ class UserNewRegisterForm(FlaskForm): ) db.session.add(user_validation) - if commit: - db.session.commit() - - self._token = user_validation.token - self.send_mail() + return user_validation def send_mail(self): host = app.config.get('HOST') - token = self._token - url = f'https://{ host }/validate/{ token }' - message = """Hello, you are register in Usody.com + token = self._token + url = f'https://{ host }/validate_user/{ token }' + message = """ + Hello, you are register in Usody.com Please for activate your account click in the next address: """ message += url subject = "Validate email for register in Usody.com" send_email(subject, [self.email.data], message) + + def send_mail_admin(self, user): + person = next(iter(user.individuals)) + email = person.email + name = person.name + telephone = person.telephone + + message = f"""A new user has been registered. These are your data" + Name: {name} + Telephone: {telephone} + Email: {email} + """ + subject = "New Register" + + email_admin = app.config.get("EMAIL_ADMIN") + if email_admin: + send_email(subject, [email_admin], message) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 69f0b4ba..4d934dfb 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -187,10 +187,6 @@ class FilterForm(FlaskForm): if filter_type: self.devices = self.devices.filter(Device.type.in_(filter_type)) - # if self.device_type in STORAGE + ["All DataStorage"]: - # import pdb; pdb.set_trace() - # self.devices = self.devices.filter(Component.parent_id.is_(None)) - return self.devices.order_by(Device.updated.desc()) diff --git a/ereuse_devicehub/mail/flask_mail.py b/ereuse_devicehub/mail/flask_mail.py index 7f2b87b4..44e968af 100644 --- a/ereuse_devicehub/mail/flask_mail.py +++ b/ereuse_devicehub/mail/flask_mail.py @@ -14,21 +14,20 @@ from __future__ import with_statement __version__ = '0.9.1' import re -import blinker import smtplib import sys import time import unicodedata - +from contextlib import contextmanager from email import charset from email.encoders import encode_base64 +from email.header import Header from email.mime.base import MIMEBase from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText -from email.header import Header -from email.utils import formatdate, formataddr, make_msgid, parseaddr -from contextlib import contextmanager +from email.utils import formataddr, formatdate, make_msgid, parseaddr +import blinker from flask import current_app PY3 = sys.version_info[0] == 3 @@ -36,12 +35,13 @@ PY3 = sys.version_info[0] == 3 PY34 = PY3 and sys.version_info[1] >= 4 if PY3: - string_types = str, + string_types = (str,) text_type = str from email import policy + message_policy = policy.SMTP else: - string_types = basestring, + string_types = (basestring,) text_type = unicode message_policy = None @@ -85,10 +85,10 @@ def force_text(s, encoding='utf-8', errors='strict'): if not isinstance(s, Exception): raise FlaskMailUnicodeDecodeError(s, *e.args) else: - s = ' '.join([force_text(arg, encoding, strings_only, - errors) for arg in s]) + s = ' '.join([force_text(arg, encoding, strings_only, errors) for arg in s]) return s + def sanitize_subject(subject, encoding='utf-8'): try: subject.encode('ascii') @@ -99,6 +99,7 @@ def sanitize_subject(subject, encoding='utf-8'): subject = Header(subject, 'utf-8').encode() return subject + def sanitize_address(addr, encoding='utf-8'): if isinstance(addr, string_types): addr = parseaddr(force_text(addr)) @@ -131,6 +132,7 @@ def _has_newline(line): return True return False + class Connection(object): """Handles connection to host.""" @@ -175,8 +177,9 @@ class Connection(object): assert message.send_to, "No recipients have been added" assert message.sender, ( - "The message does not specify a sender and a default sender " - "has not been configured") + "The message does not specify a sender and a default sender " + "has not been configured" + ) if message.has_bad_headers(): raise BadHeaderError @@ -185,11 +188,13 @@ class Connection(object): message.date = time.time() if self.host: - self.host.sendmail(sanitize_address(envelope_from or message.sender), - list(sanitize_addresses(message.send_to)), - message.as_bytes() if PY3 else message.as_string(), - message.mail_options, - message.rcpt_options) + self.host.sendmail( + sanitize_address(envelope_from or message.sender), + list(sanitize_addresses(message.send_to)), + message.as_bytes() if PY3 else message.as_string(), + message.mail_options, + message.rcpt_options, + ) email_dispatched.send(message, app=current_app._get_current_object()) @@ -227,8 +232,14 @@ class Attachment(object): :param disposition: content-disposition (if any) """ - def __init__(self, filename=None, content_type=None, data=None, - disposition=None, headers=None): + def __init__( + self, + filename=None, + content_type=None, + data=None, + disposition=None, + headers=None, + ): self.filename = filename self.content_type = content_type self.data = data @@ -255,20 +266,23 @@ class Message(object): :param rcpt_options: A list of ESMTP options to be used in RCPT commands """ - def __init__(self, subject='', - recipients=None, - body=None, - html=None, - sender=None, - cc=None, - bcc=None, - attachments=None, - reply_to=None, - date=None, - charset=None, - extra_headers=None, - mail_options=None, - rcpt_options=None): + def __init__( + self, + subject='', + recipients=None, + body=None, + html=None, + sender=None, + cc=None, + bcc=None, + attachments=None, + reply_to=None, + date=None, + charset=None, + extra_headers=None, + mail_options=None, + rcpt_options=None, + ): sender = sender or current_app.extensions['mail'].default_sender @@ -364,9 +378,9 @@ class Message(object): filename = filename.encode('utf8') filename = ('UTF8', '', filename) - f.add_header('Content-Disposition', - attachment.disposition, - filename=filename) + f.add_header( + 'Content-Disposition', attachment.disposition, filename=filename + ) for key, value in attachment.headers: f.add_header(key, value) @@ -418,7 +432,10 @@ class Message(object): def is_bad_headers(self): from warnings import warn - msg = 'is_bad_headers is deprecated, use the new has_bad_headers method instead.' + + msg = ( + 'is_bad_headers is deprecated, use the new has_bad_headers method instead.' + ) warn(DeprecationWarning(msg), stacklevel=1) return self.has_bad_headers() @@ -435,12 +452,14 @@ class Message(object): self.recipients.append(recipient) - def attach(self, - filename=None, - content_type=None, - data=None, - disposition=None, - headers=None): + def attach( + self, + filename=None, + content_type=None, + data=None, + disposition=None, + headers=None, + ): """Adds an attachment to the message. :param filename: filename of attachment @@ -449,11 +468,11 @@ class Message(object): :param disposition: content-disposition (if any) """ self.attachments.append( - Attachment(filename, content_type, data, disposition, headers)) + Attachment(filename, content_type, data, disposition, headers) + ) class _MailMixin(object): - @contextmanager def record_messages(self): """Records all messages. Use in unit tests for example:: @@ -508,13 +527,26 @@ class _MailMixin(object): try: return Connection(app.extensions['mail']) except KeyError: - raise RuntimeError("The curent application was not configured with Flask-Mail") + raise RuntimeError( + "The curent application was not configured with Flask-Mail" + ) class _Mail(_MailMixin): - def __init__(self, server, username, password, port, use_tls, use_ssl, - default_sender, debug, max_emails, suppress, - ascii_attachments=False): + def __init__( + self, + server, + username, + password, + port, + use_tls, + use_ssl, + default_sender, + debug, + max_emails, + suppress, + ascii_attachments=False, + ): self.server = server self.username = username self.password = password @@ -553,7 +585,7 @@ class Mail(_MailMixin): int(config.get('MAIL_DEBUG', debug)), config.get('MAIL_MAX_EMAILS'), config.get('MAIL_SUPPRESS_SEND', testing), - config.get('MAIL_ASCII_ATTACHMENTS', False) + config.get('MAIL_ASCII_ATTACHMENTS', False), ) def init_app(self, app): @@ -577,7 +609,10 @@ class Mail(_MailMixin): signals = blinker.Namespace() -email_dispatched = signals.signal("email-dispatched", doc=""" +email_dispatched = signals.signal( + "email-dispatched", + doc=""" Signal sent when an email is dispatched. This signal will also be sent in testing mode, even though the email will not actually be sent. -""") +""", +) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html b/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html index 5a1babcc..a2dfafbf 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html @@ -41,6 +41,13 @@
Please enter your email.
+ {% if form.email.errors %} +

+ {% for error in form.email.errors %} + {{ error }}
+ {% endfor %} +

+ {% endif %}
@@ -58,27 +65,42 @@
+ {% if form.name.errors %} +

+ {% for error in form.name.errors %} + {{ error }}
+ {% endfor %} +

+ {% endif %}
+ {% if form.telephone.errors %} +

+ {% for error in form.telephone.errors %} + {{ error }}
+ {% endfor %} +

+ {% endif %}
-

Don't have account? Create an account

+

+ You have account? Create an account +

{% else %} -
- We have sent you a validation email. Please check your email. -
-
- {{ form._token }} -
+
+
+ We have sent you a validation email.
+ Please check your email. +
{% endif %} @@ -96,18 +118,4 @@ - - - {% endblock body %} diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_validation.html b/ereuse_devicehub/templates/ereuse_devicehub/user_validation.html new file mode 100644 index 00000000..dde06b84 --- /dev/null +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_validation.html @@ -0,0 +1,66 @@ +{% extends "ereuse_devicehub/base.html" %} + +{% block page_title %}Login{% endblock %} + +{% block body %} +
+
+ +
+
+
+
+ +
+ +
+ +
+ +
+ + {% if is_valid %} +
+
User is valid
+ +
+ Your new user is activate.
+ Now you can do Login and entry. +
+
+ {% else %} +
+
User is Invalid
+
+
+ Invalid +
+
+ +
+
+ Sorry, your token not exist or is expired. +
+
+
+ {% endif %} + +
+
+ +
+ Designed by BootstrapMade +
+ +
+
+
+ +
+ +
+
+ +{% endblock body %} diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py index cfd449af..4c80b270 100644 --- a/ereuse_devicehub/views.py +++ b/ereuse_devicehub/views.py @@ -9,7 +9,7 @@ from ereuse_devicehub.db import db from ereuse_devicehub.forms import LoginForm, PasswordForm, UserNewRegisterForm from ereuse_devicehub.resources.action.models import Trade from ereuse_devicehub.resources.lot.models import Lot -from ereuse_devicehub.resources.user.models import User +from ereuse_devicehub.resources.user.models import User, UserValidation from ereuse_devicehub.utils import is_safe_url core = Blueprint('core', __name__) @@ -120,10 +120,32 @@ class UserRegistrationView(View): return flask.render_template(self.template_name, **context) +class UserValidationView(View): + methods = ['GET'] + template_name = 'ereuse_devicehub/user_validation.html' + + def dispatch_request(self, token): + context = {'is_valid': self.is_valid(token), 'version': __version__} + return flask.render_template(self.template_name, **context) + + def is_valid(self, token): + user_valid = UserValidation.query.filter_by(token=token).first() + if not user_valid: + return False + user = user_valid.user + user.active = True + db.session.commit() + return True + + core.add_url_rule('/login/', view_func=LoginView.as_view('login')) core.add_url_rule('/logout/', view_func=LogoutView.as_view('logout')) core.add_url_rule('/profile/', view_func=UserProfileView.as_view('user-profile')) core.add_url_rule( '/new_register/', view_func=UserRegistrationView.as_view('user-registration') ) +core.add_url_rule( + '/validate_user/', + view_func=UserValidationView.as_view('user-validation'), +) core.add_url_rule('/set_password/', view_func=UserPasswordView.as_view('set-password')) diff --git a/examples/app.py b/examples/app.py index 7dcd0792..5cb282c8 100644 --- a/examples/app.py +++ b/examples/app.py @@ -6,12 +6,12 @@ Use this as a starting point. from decouple import config -from ereuse_devicehub.mail.flask_mail import Mail from ereuse_devicehub.api.views import api from ereuse_devicehub.config import DevicehubConfig from ereuse_devicehub.devicehub import Devicehub from ereuse_devicehub.inventory.views import devices from ereuse_devicehub.labels.views import labels +from ereuse_devicehub.mail.flask_mail import Mail from ereuse_devicehub.views import core from ereuse_devicehub.workbench.views import workbench From 469ce1c6e049865ed1c83c22f7f8d965ef28c270 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 20 Oct 2022 12:51:20 +0200 Subject: [PATCH 08/11] pass emails to templates --- ereuse_devicehub/forms.py | 24 ++++++++----------- ereuse_devicehub/mail/sender.py | 5 +--- .../ereuse_devicehub/email_admin_new_user.txt | 4 ++++ .../ereuse_devicehub/email_validation.txt | 2 ++ .../ereuse_devicehub/user_registration.html | 2 +- 5 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 ereuse_devicehub/templates/ereuse_devicehub/email_admin_new_user.txt create mode 100644 ereuse_devicehub/templates/ereuse_devicehub/email_validation.txt diff --git a/ereuse_devicehub/forms.py b/ereuse_devicehub/forms.py index daa0760f..2b2bce2d 100644 --- a/ereuse_devicehub/forms.py +++ b/ereuse_devicehub/forms.py @@ -1,5 +1,5 @@ from flask import current_app as app -from flask import g +from flask import g, render_template from flask_wtf import FlaskForm from werkzeug.security import generate_password_hash from wtforms import ( @@ -188,25 +188,21 @@ class UserNewRegisterForm(FlaskForm): host = app.config.get('HOST') token = self._token url = f'https://{ host }/validate_user/{ token }' - message = """ - Hello, you are register in Usody.com - Please for activate your account click in the next address: """ - message += url + template = 'ereuse_devicehub/email_validation.txt' + message = render_template(template, url=url) subject = "Validate email for register in Usody.com" send_email(subject, [self.email.data], message) def send_mail_admin(self, user): person = next(iter(user.individuals)) - email = person.email - name = person.name - telephone = person.telephone - - message = f"""A new user has been registered. These are your data" - Name: {name} - Telephone: {telephone} - Email: {email} - """ + context = { + 'email': person.email, + 'name': person.name, + 'telephone': person.telephone, + } + template = 'ereuse_devicehub/email_admin_new_user.txt' + message = render_template(template, **context) subject = "New Register" email_admin = app.config.get("EMAIL_ADMIN") diff --git a/ereuse_devicehub/mail/sender.py b/ereuse_devicehub/mail/sender.py index 9d99e80f..3b099cba 100644 --- a/ereuse_devicehub/mail/sender.py +++ b/ereuse_devicehub/mail/sender.py @@ -28,7 +28,4 @@ def send_email( if html_body: msg.html = html_body - Thread( - target=_send_async_email, - args=(app._get_current_object(), msg) - ).start() + Thread(target=_send_async_email, args=(app._get_current_object(), msg)).start() diff --git a/ereuse_devicehub/templates/ereuse_devicehub/email_admin_new_user.txt b/ereuse_devicehub/templates/ereuse_devicehub/email_admin_new_user.txt new file mode 100644 index 00000000..96759431 --- /dev/null +++ b/ereuse_devicehub/templates/ereuse_devicehub/email_admin_new_user.txt @@ -0,0 +1,4 @@ +A new user has been registered. These are your data +Name: {{ name }} +Telephone: {{ telephone }} +Email: {{ email }} diff --git a/ereuse_devicehub/templates/ereuse_devicehub/email_validation.txt b/ereuse_devicehub/templates/ereuse_devicehub/email_validation.txt new file mode 100644 index 00000000..daeaf7fd --- /dev/null +++ b/ereuse_devicehub/templates/ereuse_devicehub/email_validation.txt @@ -0,0 +1,2 @@ +Hello, you are register in Usody.com +Please for activate your account click in the next address: {{ url }} diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html b/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html index a2dfafbf..1e969a97 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_registration.html @@ -91,7 +91,7 @@

- You have account? Create an account + You have account? do Login

From 61bd4e0642a5826d2c0410ab5b4e6d049d8fd626 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 20 Oct 2022 15:59:17 +0200 Subject: [PATCH 09/11] add tests --- tests/conftest.py | 4 ++++ tests/test_basic.py | 2 ++ tests/test_render_2_0.py | 29 ++++++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 23573d81..8e5c52d1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -21,6 +21,7 @@ from ereuse_devicehub.db import db from ereuse_devicehub.devicehub import Devicehub from ereuse_devicehub.inventory.views import devices from ereuse_devicehub.labels.views import labels +from ereuse_devicehub.mail.flask_mail import Mail from ereuse_devicehub.resources.agent.models import Person from ereuse_devicehub.resources.enums import SessionType from ereuse_devicehub.resources.tag import Tag @@ -46,6 +47,7 @@ class TestConfig(DevicehubConfig): EMAIL_ADMIN = 'foo@foo.com' PATH_DOCUMENTS_STORAGE = '/tmp/trade_documents' JWT_PASS = config('JWT_PASS', '') + MAIL_SUPPRESS_SEND = True @pytest.fixture(scope='session') @@ -66,6 +68,8 @@ def _app(config: TestConfig) -> Devicehub: app.config["SQLALCHEMY_RECORD_QUERIES"] = True app.config['PROFILE'] = True # app.wsgi_app = ProfilerMiddleware(app.wsgi_app, restrictions=[30]) + mail = Mail(app) + app.mail = mail return app diff --git a/tests/test_basic.py b/tests/test_basic.py index 3d7a0ad8..b75cc6e6 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -106,6 +106,8 @@ def test_api_docs(client: Client): '/versions/', '/workbench/', '/workbench/erasure_host/{id}/', + '/new_register/', + '/validate_user/{token}', } assert docs['info'] == {'title': 'Devicehub', 'version': '0.2'} assert docs['components']['securitySchemes']['bearerAuth'] == { diff --git a/tests/test_render_2_0.py b/tests/test_render_2_0.py index 40c87687..9d344b38 100644 --- a/tests/test_render_2_0.py +++ b/tests/test_render_2_0.py @@ -15,7 +15,7 @@ from ereuse_devicehub.devicehub import Devicehub from ereuse_devicehub.resources.action.models import Snapshot from ereuse_devicehub.resources.device.models import Device, Placeholder from ereuse_devicehub.resources.lot.models import Lot -from ereuse_devicehub.resources.user.models import User +from ereuse_devicehub.resources.user.models import User, UserValidation from tests import conftest @@ -2578,3 +2578,30 @@ def test_snapshot_is_server_erase(user3: UserClientFlask): assert snapshot2.is_server_erase assert snapshot in snapshot.device.actions assert snapshot2 in snapshot.device.actions + + +@pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) +def test_new_register(user3: UserClientFlask, app: Devicehub): + uri = '/new_register/' + user3.get(uri) + data = { + 'csrf_token': generate_csrf(), + 'email': "foo@bar.cxm", + 'password': "1234", + 'password2': "1234", + 'name': "booBar", + 'telephone': "555555555", + } + body, status = user3.post(uri, data=data) + assert status == '200 OK' + assert "Please check your email." in body + + user_valid = UserValidation.query.one() + assert user_valid.user.active is False + + uri = '/validate_user/' + str(user_valid.token) + body, status = user3.get(uri) + assert status == '200 OK' + assert "Your new user is activate" in body + assert user_valid.user.active From da7f03aa5310cd029f9b0c4db5081e34480f5ae4 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 20 Oct 2022 17:31:33 +0200 Subject: [PATCH 10/11] fix flask_mail --- ereuse_devicehub/mail/flask_mail.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ereuse_devicehub/mail/flask_mail.py b/ereuse_devicehub/mail/flask_mail.py index 44e968af..ced76377 100644 --- a/ereuse_devicehub/mail/flask_mail.py +++ b/ereuse_devicehub/mail/flask_mail.py @@ -34,6 +34,9 @@ PY3 = sys.version_info[0] == 3 PY34 = PY3 and sys.version_info[1] >= 4 +basestring = str +unicode = str + if PY3: string_types = (str,) text_type = str @@ -65,6 +68,7 @@ def force_text(s, encoding='utf-8', errors='strict'): If strings_only is True, don't convert (some) non-string-like objects. """ + strings_only = True if isinstance(s, text_type): return s @@ -316,7 +320,7 @@ class Message(object): charset = self.charset or 'utf-8' return MIMEText(text, _subtype=subtype, _charset=charset) - def _message(self): + def _message(self): # noqa: C901 """Creates the email""" ascii_attachments = current_app.extensions['mail'].ascii_attachments encoding = self.charset or 'utf-8' From 72b139a2bc4fd19ca74f3556e34ab303f9d982a1 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 20 Oct 2022 17:41:06 +0200 Subject: [PATCH 11/11] fix requirements --- requirements.in | 3 +++ requirements.txt | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 13862036..9fbc32da 100644 --- a/requirements.in +++ b/requirements.in @@ -39,3 +39,6 @@ et_xmlfile==1.1.0 # pandas dependency # manual dependency marshmallow-enum==1.4.1 + +# flask_mail dependency +blinker==1.5 diff --git a/requirements.txt b/requirements.txt index d698c4c8..11ca5758 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # -# pip-compile --output-file=requirements.txt requirements.in +# pip-compile # alembic==1.4.2 # via -r requirements.in @@ -12,6 +12,8 @@ apispec==0.39.0 # via teal atomicwrites==1.4.0 # via -r requirements.in +blinker==1.5 + # via -r requirements.in boltons==18.0.1 # via # ereuse-utils