Update after testrun

This commit is contained in:
Ozzie Isaacs
2024-07-15 18:38:56 +02:00
parent 99e50bafc4
commit c09e1ed203
5 changed files with 18112 additions and 2662 deletions

View File

@@ -40,6 +40,7 @@ def verify_password(username, password):
if user.name.lower() == "guest":
if config.config_anonbrowse == 1:
return user
limiter.check()
if config.config_login_type == constants.LOGIN_LDAP and services.ldap:
login_result, error = services.ldap.bind_user(user.name, password)
if login_result:
@@ -89,8 +90,6 @@ def login_required_if_no_ano(func):
if user:
g.flask_httpauth_user = user
return func(*args, **kwargs)
# proxy_auth.set_user(user)
# return proxy_auth.login_required(func)(*args, **kwargs)
g.flask_httpauth_user = None
if config.config_anonbrowse == 1:
return func(*args, **kwargs)
@@ -127,8 +126,6 @@ def load_user_from_reverse_proxy_header(req):
@lm.user_loader
def load_user(user_id, random, session_key):
# log.info(f"user {user_id}, random {random}")
# log.info(request)
user = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
if random and session_key:
entry = ub.session.query(ub.User_Sessions).filter(ub.User_Sessions.random == random,