From 9c1a3e8f55d5996bed3bcc38f7101123ce995732 Mon Sep 17 00:00:00 2001 From: Josako Date: Fri, 26 Apr 2024 16:23:17 +0200 Subject: [PATCH] refactor security to Flask-Security - Part 2 --- config.py | 13 ++-- eveai_app/__init__.py | 7 +- eveai_app/models/user.py | 2 +- eveai_app/static/assets/css/eveai.css | 0 eveai_app/templates/base.html | 38 ++++++++--- eveai_app/templates/header.html | 2 +- eveai_app/templates/login.html | 17 ----- eveai_app/templates/login_user.html | 17 ----- eveai_app/templates/security/base.html | 3 + .../templates/security/forgot_password.html | 18 +++++ eveai_app/templates/security/login_user.html | 29 ++++++++ .../templates/security/reset_password.html | 19 ++++++ eveai_app/templates/user/edit_user.html | 25 +++++++ eveai_app/templates/user/user.html | 29 ++++---- eveai_app/views/auth_forms.py | 10 --- eveai_app/views/auth_views.py | 46 ------------- eveai_app/views/user_views.py | 21 ++++++ templates/base.html | 61 ----------------- templates/header.html | 13 ---- templates/login.html | 17 ----- templates/login_user.html | 17 ----- templates/navbar.html | 68 ------------------- 22 files changed, 173 insertions(+), 299 deletions(-) create mode 100644 eveai_app/static/assets/css/eveai.css delete mode 100644 eveai_app/templates/login.html delete mode 100644 eveai_app/templates/login_user.html create mode 100644 eveai_app/templates/security/base.html create mode 100644 eveai_app/templates/security/forgot_password.html create mode 100644 eveai_app/templates/security/login_user.html create mode 100644 eveai_app/templates/security/reset_password.html create mode 100644 eveai_app/templates/user/edit_user.html delete mode 100644 eveai_app/views/auth_forms.py delete mode 100644 eveai_app/views/auth_views.py delete mode 100644 templates/base.html delete mode 100644 templates/header.html delete mode 100644 templates/login.html delete mode 100644 templates/login_user.html delete mode 100644 templates/navbar.html diff --git a/config.py b/config.py index 21ae3ec..1f391fc 100644 --- a/config.py +++ b/config.py @@ -8,6 +8,8 @@ class Config(object): DEVELOPMENT = False SECRET_KEY = '97867c1491bea5ee6a8e8436eb11bf2ba6a69ff53ab1b17ecba450d0f2e572e1' + # WTF_CSRF_ENABLED = True + # flask-security-too settings SECURITY_PASSWORD_SALT = '228614859439123264035565568761433607235' REMEMBER_COOKIE_SAMESITE = 'strict' @@ -16,9 +18,7 @@ class Config(object): SECURITY_TRACKABLE = True SECURITY_PASSWORD_COMPLEXITY_CHECKER = 'zxcvbn' SECURITY_POST_LOGIN_VIEW = '/user/tenant' - SECURITY_REGISTERABLE = False - SECURITY_LOGINABLE = False - SECURITY_LOGOUTABLE = False + SECURITY_RECOVERABLE = True @@ -26,6 +26,9 @@ class Config(object): MAIL_SERVER = 'mail.flow-it.net' MAIL_PORT = 465 MAIL_USE_TLS = True + MAIL_USE_SSL = False + MAIL_DEFAULT_SENDER = 'eveAI Admin ' + class DevConfig(Config): @@ -36,8 +39,8 @@ class DevConfig(Config): EXPLAIN_TEMPLATE_LOADING = True # flask-mailman settings - MAIL_USERNAME = 'eveai_admin@flow-it.net' - MAIL_PASSWORD = 'FgV650K3ow#5FeBcZc5' + MAIL_USERNAME = 'eveai_super@flow-it.net' + MAIL_PASSWORD = '$6xsWGbNtx$CFMQZqc*' class ProdConfig(Config): diff --git a/eveai_app/__init__.py b/eveai_app/__init__.py index 2b214a7..65f9d97 100644 --- a/eveai_app/__init__.py +++ b/eveai_app/__init__.py @@ -1,3 +1,4 @@ +import logging import os from flask import Flask from flask_security import SQLAlchemyUserDatastore @@ -29,7 +30,9 @@ def create_app(config_file=None): register_blueprints(app) - print(app.config.get('SQLALCHEMY_DATABASE_URI')) + if app.config['DEBUG'] is True: + app.logger.setLevel(logging.DEBUG) + return app @@ -45,8 +48,6 @@ def register_extensions(app): def register_blueprints(app): from .views.user_views import user_bp app.register_blueprint(user_bp) - from .views.auth_views import auth_bp - app.register_blueprint(auth_bp) def register_api(app): diff --git a/eveai_app/models/user.py b/eveai_app/models/user.py index 12ff78e..8e50acd 100644 --- a/eveai_app/models/user.py +++ b/eveai_app/models/user.py @@ -76,7 +76,7 @@ class User(db.Model, UserMixin): login_count = db.Column(db.Integer, nullable=False, default=0) # Relations - roles = db.relationship('Role', secondary='public.roles_users', backref=db.backref('users', lazy='dynamic')) + roles = db.relationship('Role', secondary=RolesUsers.__table__, backref=db.backref('users', lazy='dynamic')) tenant_id = db.Column(db.Integer, db.ForeignKey('public.tenant.id'), nullable=False) def __repr__(self): diff --git a/eveai_app/static/assets/css/eveai.css b/eveai_app/static/assets/css/eveai.css new file mode 100644 index 0000000..e69de29 diff --git a/eveai_app/templates/base.html b/eveai_app/templates/base.html index 4a03a63..fe17e51 100644 --- a/eveai_app/templates/base.html +++ b/eveai_app/templates/base.html @@ -35,17 +35,36 @@
-
- -
- {% block content %}{% endblock %} +
+
+
+
+
+
+

+ {% block content_title %}{% endblock %} +

+

+ {% block content_description %}{% endblock %} +

+
+
+
+ {% block content %}{% endblock %} +
+
+

+ {% block content_footer %}{% endblock %} +

+
+
+
+
+
-
- -
@@ -56,6 +75,7 @@ - - + {% block scripts %} + {%- endblock scripts %} + \ No newline at end of file diff --git a/eveai_app/templates/header.html b/eveai_app/templates/header.html index b7e584f..f81b23e 100644 --- a/eveai_app/templates/header.html +++ b/eveai_app/templates/header.html @@ -1,5 +1,5 @@
-
+
diff --git a/eveai_app/templates/login.html b/eveai_app/templates/login.html deleted file mode 100644 index 0044689..0000000 --- a/eveai_app/templates/login.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends 'base.html' %} - -{% block title %}Login{% endblock %} - -{% block content %} -
-

- {{ form.email.label }}
- {{ form.email(size=80) }} -

-

- {{ form.password.label }}
- {{ form.password(size=80) }} -

-

{{ form.submit() }}

-
-{% endblock %} \ No newline at end of file diff --git a/eveai_app/templates/login_user.html b/eveai_app/templates/login_user.html deleted file mode 100644 index 0044689..0000000 --- a/eveai_app/templates/login_user.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends 'base.html' %} - -{% block title %}Login{% endblock %} - -{% block content %} -
-

- {{ form.email.label }}
- {{ form.email(size=80) }} -

-

- {{ form.password.label }}
- {{ form.password(size=80) }} -

-

{{ form.submit() }}

-
-{% endblock %} \ No newline at end of file diff --git a/eveai_app/templates/security/base.html b/eveai_app/templates/security/base.html new file mode 100644 index 0000000..325d777 --- /dev/null +++ b/eveai_app/templates/security/base.html @@ -0,0 +1,3 @@ +{# djlint:off H030,H031 #} +{% extends 'base.html' %} + diff --git a/eveai_app/templates/security/forgot_password.html b/eveai_app/templates/security/forgot_password.html new file mode 100644 index 0000000..eaa91dd --- /dev/null +++ b/eveai_app/templates/security/forgot_password.html @@ -0,0 +1,18 @@ +{% extends "security/base.html" %} +{% from "security/_macros.html" import render_field_with_errors, render_field, render_field_errors, render_form_errors %} + +{% block content_title %} + {{ _fsdomain('Send password reset instructions') }} +{% endblock content_title %} + +{% block content %} + {% include "security/_messages.html" %} +
+ {{ forgot_password_form.hidden_tag() }} + {{ render_form_errors(forgot_password_form) }} + {{ render_field_with_errors(forgot_password_form.email) }} + {{ render_field_errors(forgot_password_form.csrf_token) }} + {{ render_field(forgot_password_form.submit) }} +
+ {% include "security/_menu.html" %} +{% endblock content %} diff --git a/eveai_app/templates/security/login_user.html b/eveai_app/templates/security/login_user.html new file mode 100644 index 0000000..47daf1f --- /dev/null +++ b/eveai_app/templates/security/login_user.html @@ -0,0 +1,29 @@ +{% extends 'security/base.html' %} + +{% block title %}Login{% endblock %} +{% block content_title %}Sign In{% endblock %} +{% block content_description %}Enter your email and password to Sign In{% endblock %} +{% block content %} +
+ {{ login_user_form.hidden_tag() }} +

+ {{ login_user_form.email.label }}
+ {{ login_user_form.email(size=80) }} +

+

+ {{ login_user_form.password.label }}
+ {{ login_user_form.password(size=80) }} +

+{#

#} +{# {{ login_user_form.remember_me }}#} +{# {{ login_user_form.remember_me.label }}#} +{#

#} +

{{ login_user_form.submit() }}

+
+{% endblock %} +{% block content_footer %} + First time here? Forgot your password? + Request new password +{% endblock %} + +{#{{ url_for_security('reset_password', token=reset_password_token) }}#} \ No newline at end of file diff --git a/eveai_app/templates/security/reset_password.html b/eveai_app/templates/security/reset_password.html new file mode 100644 index 0000000..7423f9e --- /dev/null +++ b/eveai_app/templates/security/reset_password.html @@ -0,0 +1,19 @@ +{% extends "security/base.html" %} +{% from "security/_macros.html" import render_field_with_errors, render_field, render_field_errors, render_form_errors %} + +{% block title %} {{ _fsdomain('Reset password') }} {% endblock %} +{% block content_title %} {{ _fsdomain('Reset password') }} {% endblock %} +{% block content_description %}An email will be sent to you with instructions.{% endblock %} +{% block content %} + {% include "security/_messages.html" %} +{#
#} + + {{ reset_password_form.hidden_tag() }} + {{ render_form_errors(reset_password_form) }} + {{ render_field_with_errors(reset_password_form.password) }} + {{ render_field_with_errors(reset_password_form.password_confirm) }} + {{ render_field_errors(reset_password_form.csrf_token) }} + {{ render_field(reset_password_form.submit) }} +
+{# {% include "security/_menu.html" %}#} +{% endblock content %} diff --git a/eveai_app/templates/user/edit_user.html b/eveai_app/templates/user/edit_user.html new file mode 100644 index 0000000..3241bec --- /dev/null +++ b/eveai_app/templates/user/edit_user.html @@ -0,0 +1,25 @@ +{% extends "base.html" %} +{% block title %}Update User{% endblock %} + +{% block content_title %}Update User{% endblock %} +{% block content_description %}Update given user account{% endblock %} + +{% block content %} +
+ {{ form.hidden_tag() }} + {% for field in form %} +
+ {{ field.label }} + {{ field(class="form-control", disabled=true) if field.name in ['email', 'user_name'] else field(class="form-control") }} + {% if field.errors %} +
+ {% for error in field.errors %} +

{{ error }}

+ {% endfor %} +
+ {% endif %} +
+ {% endfor %} + +
+{% endblock %} diff --git a/eveai_app/templates/user/user.html b/eveai_app/templates/user/user.html index ab6cd8e..76dc50e 100644 --- a/eveai_app/templates/user/user.html +++ b/eveai_app/templates/user/user.html @@ -1,9 +1,13 @@ {% extends 'base.html' %} -{% block title %}User Details{% endblock %} +{% block title %}User Registration{% endblock %} + +{% block content_title %}Register User{% endblock %} +{% block content_description %}Make a new user account{% endblock %} {% block content %} -
+ + {{ form.hidden_tag() }}

{{ form.user_name.label }}
{{ form.user_name(size=80) }} @@ -16,6 +20,10 @@ {{ form.password.label }}
{{ form.password(size=80) }}

+

+ {{ form.confirm_password.label }}
+ {{ form.confirm_password(size=80) }} +

{{ form.first_name.label }}
{{ form.first_name(size=80) }} @@ -28,18 +36,6 @@ {{ form.is_active.label }}
{{ form.is_active() }}

-

- {{ form.is_tester.label }}
- {{ form.is_tester() }} -

-

- {{ form.is_admin.label }}
- {{ form.is_admin() }} -

-

- {{ form.is_super.label }}
- {{ form.is_super() }} -

{{ form.valid_to.label }}
{{ form.valid_to() }} @@ -51,3 +47,8 @@

{{ form.submit() }}

{% endblock %} + + +{% block content_footer %} + +{% endblock %} diff --git a/eveai_app/views/auth_forms.py b/eveai_app/views/auth_forms.py deleted file mode 100644 index 156e855..0000000 --- a/eveai_app/views/auth_forms.py +++ /dev/null @@ -1,10 +0,0 @@ -from flask_wtf import FlaskForm -from wtforms import PasswordField, SubmitField, EmailField, BooleanField -from wtforms.validators import DataRequired, Length, Email - - -class LoginForm(FlaskForm): - email = EmailField('Email', validators=[DataRequired(), Email()]) - password = PasswordField('Password', validators=[DataRequired(), Length(min=8)]) - remember_me = BooleanField('Remember me') - submit = SubmitField('Login') diff --git a/eveai_app/views/auth_views.py b/eveai_app/views/auth_views.py deleted file mode 100644 index d7308d1..0000000 --- a/eveai_app/views/auth_views.py +++ /dev/null @@ -1,46 +0,0 @@ -from datetime import datetime as dt, timezone as tz -from flask import request, redirect, url_for, flash, render_template, Blueprint, jsonify, session -from flask_security import login_user, logout_user - -from ..models.user import User, Tenant -from .auth_forms import LoginForm - -auth_bp = Blueprint('auth_bp', __name__, template_folder='templates') - - -@auth_bp.route('/login', methods=['GET', 'POST']) -def login(): - form = LoginForm() - if form.validate_on_submit(): - email = form.email.data - password = form.password.data - remember_me = True if form.remember_me.data else False - - user = User.query.filter_by(email=email).first() - tenant = Tenant.query.filter_by(id=user.tenant_id).first() - if user and user.verify_and_update_password(password): - if user.is_active: - login_user(user, remember=remember_me) - next_page = request.args.get('next') - - session['tenant_id'] = user.tenant_id - session['tenant_name'] = tenant.name - - return redirect(next_page) - else: - flash('Account disabled. Please contact your administrator.', category='error') - else: - flash('Invalid email or password.', category='error') - - return render_template('login.html', form=form) - - -@auth_bp.route('/logout', methods=['POST']) -def logout(): - logout_user() - - # Clear session data - session.pop('tenant_id', None) - session.pop('tenant_name', None) - - return redirect(url_for('/')) diff --git a/eveai_app/views/user_views.py b/eveai_app/views/user_views.py index 4d01350..ef4ae31 100644 --- a/eveai_app/views/user_views.py +++ b/eveai_app/views/user_views.py @@ -1,4 +1,5 @@ # from . import user_bp +import uuid from datetime import datetime as dt, timezone as tz from flask import request, redirect, url_for, flash, render_template, Blueprint, session from flask_security import hash_password @@ -67,6 +68,10 @@ def tenant(): def user(): form = UserForm() if form.validate_on_submit(): + if form.password.data != form.confirm_password.data: + flash('Passwords do not match.') + + # Handle the required attributes hashed_password = hash_password(form.password.data) new_user = User( user_name=form.user_name.data, @@ -79,6 +84,7 @@ def user(): tenant_id=form.tenant_id.data ) + new_user.fs_uniquifier = str(uuid.uuid4()) timestamp = dt.now(tz.utc) new_user.created_at = timestamp new_user.updated_at = timestamp @@ -100,3 +106,18 @@ def user(): flash(f'Failed to add user. Error: {str(e)}') return render_template('user/user.html', form=form) + + +@user_bp.route('/user/', methods=['GET', 'POST']) +def edit_user(user_id): + user = User.query.get_or_404(user_id) # This will return a 404 if no user is found + form = UserForm(obj=user) + + if request.method == 'POST' and form.validate_on_submit(): + # Populate the user with form data + form.populate_obj(user) + db.session.commit() + flash('User updated successfully.', 'success') + return redirect(url_for('user_bp.user_profile', user_id=user.id)) # Assuming there's a user profile view to redirect to + + return render_template('user/edit_user.html', form=form, user_id=user_id) diff --git a/templates/base.html b/templates/base.html deleted file mode 100644 index 4a03a63..0000000 --- a/templates/base.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - {% block title %}{% endblock %} - - - - - - - - - - - - - - - - {% include 'navbar.html' %} - {% include 'header.html' %} - {% with messages = get_flashed_messages() %} - {% if messages%} - {% for message in messages%} -

{{message}}

- {%endfor%} - {%endif%} - {%endwith%} -
-
-
-
- -
-
- - {% block content %}{% endblock %} - -
-
- -
-
-
-
-{# {% include 'footer.html' %}#} - - - - - - - - - \ No newline at end of file diff --git a/templates/header.html b/templates/header.html deleted file mode 100644 index b7e584f..0000000 --- a/templates/header.html +++ /dev/null @@ -1,13 +0,0 @@ -
-
- -
-
-
-

EveAI Virtual Assistant

-

Enhance Customer Interaction with AI

-
-
-
-
-
\ No newline at end of file diff --git a/templates/login.html b/templates/login.html deleted file mode 100644 index 0044689..0000000 --- a/templates/login.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends 'base.html' %} - -{% block title %}Login{% endblock %} - -{% block content %} -
-

- {{ form.email.label }}
- {{ form.email(size=80) }} -

-

- {{ form.password.label }}
- {{ form.password(size=80) }} -

-

{{ form.submit() }}

-
-{% endblock %} \ No newline at end of file diff --git a/templates/login_user.html b/templates/login_user.html deleted file mode 100644 index 0044689..0000000 --- a/templates/login_user.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends 'base.html' %} - -{% block title %}Login{% endblock %} - -{% block content %} -
-

- {{ form.email.label }}
- {{ form.email(size=80) }} -

-

- {{ form.password.label }}
- {{ form.password(size=80) }} -

-

{{ form.submit() }}

-
-{% endblock %} \ No newline at end of file diff --git a/templates/navbar.html b/templates/navbar.html deleted file mode 100644 index ac44fa4..0000000 --- a/templates/navbar.html +++ /dev/null @@ -1,68 +0,0 @@ - -
-
-
-
- -
-
-
-
- - - -