Fixes in session
This commit is contained in:
parent
5978f845dc
commit
0fee404abf
2 changed files with 4 additions and 11 deletions
|
|
@ -69,7 +69,7 @@ def get_session():
|
||||||
|
|
||||||
"""Function for get the session from request object from bottle"""
|
"""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):
|
def session_plugin(callback):
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ from paramecio.libraries.db.coreforms import PasswordForm
|
||||||
from paramecio.libraries.sendmail import SendMail
|
from paramecio.libraries.sendmail import SendMail
|
||||||
from paramecio.libraries.db.formsutils import check_csrf
|
from paramecio.libraries.db.formsutils import check_csrf
|
||||||
from paramecio.modules.admin2.libraries.config import modules_admin
|
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=Bottle()
|
||||||
admin_app.install(SessionPlugin())
|
admin_app.install(SessionPlugin())
|
||||||
|
|
@ -374,7 +375,7 @@ def auth_check(session={}):
|
||||||
|
|
||||||
return {'error': error, 'you_cannot_login': you_cannot_login}
|
return {'error': error, 'you_cannot_login': you_cannot_login}
|
||||||
|
|
||||||
|
"""
|
||||||
def check_login_tries(request, db):
|
def check_login_tries(request, db):
|
||||||
|
|
||||||
logintries=LoginTries2(db)
|
logintries=LoginTries2(db)
|
||||||
|
|
@ -382,15 +383,6 @@ def check_login_tries(request, db):
|
||||||
logintries.safe_query()
|
logintries.safe_query()
|
||||||
|
|
||||||
ip=request.environ.get('HTTP_X_FORWARDED_FOR') or request.environ.get('REMOTE_ADDR')
|
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
|
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])
|
logintries.query('insert into logintries2 (`ip`, `num_tries`, `last_login`) VALUES (%s, %s, %s)', [ip, 1, date_now])
|
||||||
|
|
||||||
return you_cannot_login
|
return you_cannot_login
|
||||||
|
"""
|
||||||
|
|
||||||
#app.mount(admin_folder, admin_app)
|
#app.mount(admin_folder, admin_app)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue