From 0de9e6e5c2c3ea83863544fef83610fe20415b69 Mon Sep 17 00:00:00 2001
From: Sistason <c3infra@sistason.de>
Date: Sun, 14 Mar 2021 21:53:10 +0100
Subject: [PATCH] cosmetics and reorganized imports more efficiently
---
uffd/__init__.py | 13 ++++++++-----
uffd/session/views.py | 1 +
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/uffd/__init__.py b/uffd/__init__.py
index b0d298f7..9ff360af 100644
--- a/uffd/__init__.py
+++ b/uffd/__init__.py
@@ -42,24 +42,27 @@ def create_app(test_config=None): # pylint: disable=too-many-locals
pass
db.init_app(app)
- # pylint: disable=C0415
- from uffd import user, selfservice, role, mail, session, csrf, mfa, oauth2, services, signup, invite
- # pylint: enable=C0415
if app.config['LDAP_SERVICE_BIND_DN']:
+ # pylint: disable=C0415
+ from uffd import user, selfservice, role, mail, session, csrf, mfa, oauth2, services, signup, invite
+ # pylint: enable=C0415
for i in user.bp + selfservice.bp + role.bp + mail.bp + session.bp + csrf.bp + mfa.bp + oauth2.bp + services.bp + signup.bp + invite.bp:
app.register_blueprint(i)
else:
+ # pylint: disable=C0415
+ from uffd import user, selfservice, role, mail, session, csrf, mfa, oauth2, services
+ # pylint: enable=C0415
app.config['ENABLE_PASSWORDRESET'] = False
for i in user.bp + selfservice.bp + role.bp + mail.bp + session.bp + csrf.bp + mfa.bp + oauth2.bp + services.bp:
app.register_blueprint(i)
@app.route("/")
- def index(): #pylint: disable=unused-variable
+ def index(): #pylint: disable=unused-variable
return redirect(url_for('selfservice.index'))
@app.teardown_request
- def close_connection(exception): #pylint: disable=unused-variable,unused-argument
+ def close_connection(exception): #pylint: disable=unused-variable,unused-argument
if hasattr(request, "ldap_connection"):
request.ldap_connection.unbind()
diff --git a/uffd/session/views.py b/uffd/session/views.py
index d4dd103c..b8d71629 100644
--- a/uffd/session/views.py
+++ b/uffd/session/views.py
@@ -38,6 +38,7 @@ def logout():
return resp
def set_session(user, password='', skip_mfa=False):
+ session.clear()
session['user_dn'] = user.dn
# only save the password if we use a user connection
if password and not current_app.config['LDAP_SERVICE_BIND_DN']:
--
GitLab