From 0fee404abf4d11e0f7b31f025b7de2682d81b422 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Mon, 21 Apr 2025 01:47:51 +0200 Subject: [PATCH] Fixes in session --- paramecio/libraries/sessionplugin.py | 2 +- paramecio/modules/admin2/app.py | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/paramecio/libraries/sessionplugin.py b/paramecio/libraries/sessionplugin.py index 11612d9..42e48cb 100644 --- a/paramecio/libraries/sessionplugin.py +++ b/paramecio/libraries/sessionplugin.py @@ -69,7 +69,7 @@ def get_session(): """Function for get the session from request object from bottle""" - return request.environ.get('session', {}) + return Session(request.environ.get('session', {})) def session_plugin(callback): diff --git a/paramecio/modules/admin2/app.py b/paramecio/modules/admin2/app.py index 8eb62d3..9a5a6b3 100644 --- a/paramecio/modules/admin2/app.py +++ b/paramecio/modules/admin2/app.py @@ -20,6 +20,7 @@ from paramecio.libraries.db.coreforms import PasswordForm from paramecio.libraries.sendmail import SendMail from paramecio.libraries.db.formsutils import check_csrf from paramecio.modules.admin2.libraries.config import modules_admin +from paramecio.modules.admin2.libraries.check_login_tries import check_login_tries admin_app=Bottle() admin_app.install(SessionPlugin()) @@ -374,7 +375,7 @@ def auth_check(session={}): return {'error': error, 'you_cannot_login': you_cannot_login} - +""" def check_login_tries(request, db): logintries=LoginTries2(db) @@ -382,15 +383,6 @@ def check_login_tries(request, db): logintries.safe_query() ip=request.environ.get('HTTP_X_FORWARDED_FOR') or request.environ.get('REMOTE_ADDR') - - """ - if 'x-real-ip' in request.headers: - ip=request.headers['x-real-ip'] - elif 'x-forwarded-for' in request.headers: - ip=request.headers['x-forwarded-for'] - else: - ip=request.client.host - """ you_cannot_login=0 @@ -418,6 +410,7 @@ def check_login_tries(request, db): logintries.query('insert into logintries2 (`ip`, `num_tries`, `last_login`) VALUES (%s, %s, %s)', [ip, 1, date_now]) return you_cannot_login +""" #app.mount(admin_folder, admin_app)