github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v7.3.2.0: Add user parameter to save_config route 

Imported user module to the routes module and added a user parameter decorator to the save_config route. This parameter fetches the user ID, which is then used to fetch the username. This username is passed to the upload_and_restart functions as a login argument.
pull/390/head
Aidaho 2024-07-08 11:35:13 +03:00
parent 8dedc459e1
commit 9119787aa1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/routes/config/routes.py
View File

@ -5,6 +5,7 @@ from flask_login import login_required
from app.routes.config import bp from app.routes.config import bp
import app.modules.db.sql as sql import app.modules.db.sql as sql
import app.modules.db.user as user_sql
import app.modules.db.config as config_sql import app.modules.db.config as config_sql
import app.modules.db.server as server_sql import app.modules.db.server as server_sql
import app.modules.db.service as service_sql import app.modules.db.service as service_sql
@ -133,12 +134,15 @@ def config(service, serv, edit, config_file_name, new):
@bp.route('/<service>/<server_ip>/save', methods=['POST']) @bp.route('/<service>/<server_ip>/save', methods=['POST'])
@check_services @check_services
@get_user_params()
def save_config(service, server_ip): def save_config(service, server_ip):
roxywi_common.check_is_server_in_group(server_ip) roxywi_common.check_is_server_in_group(server_ip)
config_file = request.form.get('config') config_file = request.form.get('config')
oldcfg = request.form.get('oldconfig') oldcfg = request.form.get('oldconfig')
save = request.form.get('save') save = request.form.get('save')
config_file_name = request.form.get('config_file_name') config_file_name = request.form.get('config_file_name')
user_id = g.user_params['user_id']
user = user_sql.get_user_id(user_id)
try: try:
cfg = config_mod.return_cfg(service, server_ip, config_file_name) cfg = config_mod.return_cfg(service, server_ip, config_file_name)
@ -156,7 +160,7 @@ def save_config(service, server_ip):
stderr = config_mod.upload_and_restart(server_ip, cfg, save, service, oldcfg=oldcfg) stderr = config_mod.upload_and_restart(server_ip, cfg, save, service, oldcfg=oldcfg)
else: else:
stderr = config_mod.master_slave_upload_and_restart(server_ip, cfg, save, service, oldcfg=oldcfg, stderr = config_mod.master_slave_upload_and_restart(server_ip, cfg, save, service, oldcfg=oldcfg,
config_file_name=config_file_name) config_file_name=config_file_name, login=user.username)
except Exception as e: except Exception as e:
return f'error: {e}', 200 return f'error: {e}', 200