cwinfo/powerdns-admin
5
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2024-11-09 15:10:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Activity pages history base_query unification and perfomance improvement for standard user

Browse Source
This commit is contained in:
Rauno Tuul 2023-03-28 16:41:08 +03:00
parent 53cfa4fdaa
commit bb34daa333
1 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
powerdnsadmin/routes/admin.py
View File

@ -1159,22 +1159,22 @@ def history_table(): # ajax call data
lim = int(Setting().get('max_history_records')) # max num of records lim = int(Setting().get('max_history_records')) # max num of records
if request.method == 'GET': if request.method == 'GET':
if current_user.role.name in ['Administrator', 'Operator']: base_query = History.query \
base_query = History.query .with_hint(History, "FORCE INDEX (ix_history_created_on)", 'mysql')
else: if current_user.role.name not in ['Administrator', 'Operator']:
# if the user isn't an administrator or operator, # if the user isn't an administrator or operator,
# allow_user_view_history must be enabled to get here, # allow_user_view_history must be enabled to get here,
# so include history for the zones for the user # so include history for the zones for the user
base_query = db.session.query(History) \ allowed_domain_id_subquery = db.session.query(Domain.id) \
.join(Domain, History.domain_id == Domain.id) \
.outerjoin(DomainUser, Domain.id == DomainUser.domain_id) \ .outerjoin(DomainUser, Domain.id == DomainUser.domain_id) \
.outerjoin(Account, Domain.account_id == Account.id) \ .outerjoin(Account, Domain.account_id == Account.id) \
.outerjoin(AccountUser, Account.id == AccountUser.account_id) \ .outerjoin(AccountUser, Account.id == AccountUser.account_id) \
.filter( .filter(db.or_(
db.or_(
DomainUser.user_id == current_user.id, DomainUser.user_id == current_user.id,
AccountUser.user_id == current_user.id AccountUser.user_id == current_user.id
)) )) \
.subquery()
base_query = base_query.filter(History.domain_id.in_(allowed_domain_id_subquery))
domain_name = request.args.get('domain_name_filter') if request.args.get('domain_name_filter') != None \ domain_name = request.args.get('domain_name_filter') if request.args.get('domain_name_filter') != None \
and len( and len(
@ -1290,11 +1290,9 @@ def history_table(): # ajax call data
) )
).order_by(History.created_on.desc()) \ ).order_by(History.created_on.desc()) \
.limit(lim).all() .limit(lim).all()
elif user_name != None and current_user.role.name in ['Administrator', elif user_name != None and current_user.role.name in ['Administrator', 'Operator']: # only admins can see the user login-logouts
'Operator']: # only admins can see the user login-logouts
histories = History.query \ histories = base_query.filter(
.filter(
db.and_( db.and_(
db.or_( db.or_(
History.msg.like( History.msg.like(
@ -1317,10 +1315,8 @@ def history_table(): # ajax call data
temp.append(h) temp.append(h)
break break
histories = temp histories = temp
elif (changed_by != None or max_date != None) and current_user.role.name in ['Administrator', elif (changed_by != None or max_date != None) and current_user.role.name in ['Administrator', 'Operator']: # select changed by and date filters only
'Operator']: # select changed by and date filters only histories = base_query.filter(
histories = History.query \
.filter(
db.and_( db.and_(
History.created_on <= max_date if max_date != None else True, History.created_on <= max_date if max_date != None else True,
History.created_on >= min_date if min_date != None else True, History.created_on >= min_date if min_date != None else True,
@ -1328,10 +1324,8 @@ def history_table(): # ajax call data
) )
) \ ) \
.order_by(History.created_on.desc()).limit(lim).all() .order_by(History.created_on.desc()).limit(lim).all()
elif ( elif (changed_by != None or max_date != None): # special filtering for user because one user does not have access to log-ins logs
changed_by != None or max_date != None): # special filtering for user because one user does not have access to log-ins logs histories = base_query.filter(
histories = base_query \
.filter(
db.and_( db.and_(
History.created_on <= max_date if max_date != None else True, History.created_on <= max_date if max_date != None else True,
History.created_on >= min_date if min_date != None else True, History.created_on >= min_date if min_date != None else True,
@ -1347,20 +1341,7 @@ def history_table(): # ajax call data
) )
).order_by(History.created_on.desc()).limit(lim).all() ).order_by(History.created_on.desc()).limit(lim).all()
else: # default view else: # default view
if current_user.role.name in ['Administrator', 'Operator']: histories = base_query.order_by(History.created_on.desc()).limit(lim).all()
histories = History.query.order_by(History.created_on.desc()).limit(lim).all()
else:
histories = db.session.query(History) \
.join(Domain, History.domain_id == Domain.id) \
.outerjoin(DomainUser, Domain.id == DomainUser.domain_id) \
.outerjoin(Account, Domain.account_id == Account.id) \
.outerjoin(AccountUser, Account.id == AccountUser.account_id) \
.order_by(History.created_on.desc()) \
.filter(
db.or_(
DomainUser.user_id == current_user.id,
AccountUser.user_id == current_user.id
)).limit(lim).all()
detailedHistories = convert_histories(histories) detailedHistories = convert_histories(histories)