diff --git a/user_managment/app.py b/user_managment/app.py index 0b4b216..2c1a4d3 100644 --- a/user_managment/app.py +++ b/user_managment/app.py @@ -950,15 +950,28 @@ def create_app(): elif request.args.get('flush_user_db') == 'true' and request.args.get('portal_username'): content = '''

Flushed auth DB for: ''' + request.args.get('portal_username') + '''

\n''' authlog_flush_user(request.args.get('portal_username')) - elif request.args.get('portal_username') and not request.args.get('flush_user_db'): - a = AuthLog.query.filter_by(portal_username=request.args.get('portal_username')).order_by(AuthLog.login_dmr_id.desc()).all() + elif request.args.get('flush_dmr_id_db') == 'true' and request.args.get('dmr_id'): + content = '''

Flushed auth DB for: ''' + request.args.get('dmr_id') + '''

\n''' + authlog_flush_dmr_id(request.args.get('dmr_id')) + elif request.args.get('portal_username') and not request.args.get('flush_user_db') and not request.args.get('flush_dmr_id_db') or request.args.get('dmr_id') and not request.args.get('flush_user_db') and not request.args.get('flush_dmr_id_db'): + if request.args.get('portal_username'): +## s_filter = portal_username=request.args.get('portal_username') + a = AuthLog.query.filter_by(portal_username=request.args.get('portal_username')).order_by(AuthLog.login_dmr_id.desc()).all() + g_arg = request.args.get('portal_username') + f_link = '''

Flush auth log for: ''' + request.args.get('portal_username') + '''

''' + elif request.args.get('dmr_id'): +## s_filter = login_dmr_id=request.args.get('dmr_id') + a = AuthLog.query.filter_by(login_dmr_id=request.args.get('dmr_id')).order_by(AuthLog.login_dmr_id.desc()).all() + g_arg = request.args.get('dmr_id') + f_link = '''

Flush auth log for: ''' + request.args.get('dmr_id') + '''

''' +## print(s_filter) +## a = AuthLog.query.filter_by(s_filter).order_by(AuthLog.login_dmr_id.desc()).all() content = '''

 

-

Log for user: ''' + request.args.get('portal_username') + '''

- -

Flush auth log for: ''' + request.args.get('portal_username') + '''

+

Log for user: ''' + g_arg + '''

+ ''' + f_link + ''' @@ -1066,7 +1079,7 @@ def create_app(): if i.login_type == 'Attempt': content = content + ''' - + @@ -1078,7 +1091,7 @@ def create_app(): if i.login_type == 'Confirmed': content = content + ''' - + @@ -1090,7 +1103,7 @@ def create_app(): if i.login_type == 'Failed': content = content + ''' - + @@ -1255,13 +1268,19 @@ def create_app(): def authlog_flush(): AuthLog.query.delete() db.session.commit() + def authlog_flush_user(_user): -## AuthLog.query.delete() flush_e = AuthLog.query.filter_by(portal_username=_user).all() for i in flush_e: db.session.delete(i) db.session.commit() + def authlog_flush_dmr_id(_dmr_id): + flush_e = AuthLog.query.filter_by(login_dmr_id=_dmr_id).all() + for i in flush_e: + db.session.delete(i) + db.session.commit() + @app.route('/add_user', methods=['POST', 'GET']) @login_required @roles_required('Admin')
 ''' + str(i.login_dmr_id) + '''  ''' + str(i.login_dmr_id) + '''   ''' + i.portal_username + '''   ''' + i.peer_ip + '''   ''' + i.login_auth_method + ''' 
 ''' + str(i.login_dmr_id) + '''  ''' + str(i.login_dmr_id) + '''   ''' + i.portal_username + '''   ''' + i.peer_ip + '''   ''' + i.login_auth_method + ''' 
 ''' + str(i.login_dmr_id) + '''  ''' + str(i.login_dmr_id) + '''   ''' + i.portal_username + '''   ''' + i.peer_ip + '''   ''' + i.login_auth_method + '''