diff --git a/app/middleware.py b/app/middleware.py index 5d9f9ca5..268ad7be 100644 --- a/app/middleware.py +++ b/app/middleware.py @@ -1,6 +1,6 @@ from functools import wraps -from flask import redirect, url_for, abort, g +from flask import abort, g import app.modules.roxywi.auth as roxywi_auth import app.modules.roxywi.common as roxywi_common @@ -25,7 +25,8 @@ def get_user_params(virt=0, disable=0): try: user_params = roxywi_common.get_users_params(virt=virt, disable=disable, service=kwargs.get('service')) g.user_params = user_params - except Exception: + except Exception as e: + print(e) return abort(401) return fn(*args, **kwargs) return decorated_views diff --git a/app/modules/roxywi/auth.py b/app/modules/roxywi/auth.py index c176d1b0..ed720da6 100644 --- a/app/modules/roxywi/auth.py +++ b/app/modules/roxywi/auth.py @@ -118,10 +118,7 @@ def do_login(user_params: dict, next_url: str): except Exception: user_group_name = '' - try: - roxywi_common.logging('RMON server', f' user: {user_params["name"]}, group: {user_group_name} login', roxywi=1) - except Exception as e: - print(f'error: {e}') + roxywi_common.logging('Roxy-WI server', f' user: {user_params["name"]}, group: {user_group_name} login', roxywi=1) return response diff --git a/app/modules/tools/alerting.py b/app/modules/tools/alerting.py index 4c32f45d..e6c9536d 100644 --- a/app/modules/tools/alerting.py +++ b/app/modules/tools/alerting.py @@ -320,14 +320,14 @@ def mm_send_mess(mess, level, server_ip=None, service_id=None, alert_type=None, "short": "true", "title": "Server", "value": f"{server_ip}", - }, - ] + }, + ] } attach = str(json.dumps(attach)) values = f'{{"channel": "{channel}", "username": "Roxy-WI", "attachments": [{attach}]}}' proxy_dict = common.return_proxy_dict() try: - requests.post(token, headers=headers, data=str(values), proxies=proxy_dict) + requests.post(token, headers=headers, data=str(values), proxies=proxy_dict, timeout=15) except Exception as e: roxywi_common.logging('Roxy-WI server', str(e), roxywi=1) raise Exception(e) diff --git a/app/routes/ha/routes.py b/app/routes/ha/routes.py index 136ff9b8..8bd1444a 100644 --- a/app/routes/ha/routes.py +++ b/app/routes/ha/routes.py @@ -1,4 +1,4 @@ -from flask import render_template, g, request, jsonify +from flask import render_template, g, jsonify from flask_jwt_extended import jwt_required from playhouse.shortcuts import model_to_dict diff --git a/app/routes/user/routes.py b/app/routes/user/routes.py index ced4892e..ec7e23da 100644 --- a/app/routes/user/routes.py +++ b/app/routes/user/routes.py @@ -70,7 +70,6 @@ def update_user_password(user_id): return ErrorResponse(error=str(e)).model_dump(mode='json'), 501 - @bp.route('/services/', methods=['GET', 'POST']) def show_user_services(user_id): if request.method == 'GET': diff --git a/app/scripts/ansible/roles/haproxy_section/defaults/main.yml b/app/scripts/ansible/roles/haproxy_section/vars/main.yml similarity index 100% rename from app/scripts/ansible/roles/haproxy_section/defaults/main.yml rename to app/scripts/ansible/roles/haproxy_section/vars/main.yml diff --git a/app/views/ha/views.py b/app/views/ha/views.py index 8e4164f6..df2ed5c3 100644 --- a/app/views/ha/views.py +++ b/app/views/ha/views.py @@ -454,7 +454,6 @@ class HAVIPView(MethodView): except Exception as e: return roxywi_common.handler_exceptions_for_json_data(e, 'Cannot create VIP') - @validate(body=HAClusterVIP) def put(self, service: str, cluster_id: int, vip_id: int, body: HAClusterVIP): """ diff --git a/app/views/service/haproxy_section_views.py b/app/views/service/haproxy_section_views.py index 23765247..25911b41 100644 --- a/app/views/service/haproxy_section_views.py +++ b/app/views/service/haproxy_section_views.py @@ -1258,7 +1258,6 @@ class GlobalSectionView(HaproxySectionView): """ return super().get(service, 'global', 'global', server_id) - @validate(body=HaproxyGlobalRequest, query=GenerateConfigRequest) def put(self, service: Literal['haproxy'], server_id: Union[int, str], body: HaproxyGlobalRequest): """ @@ -1443,7 +1442,6 @@ class DefaultsSectionView(HaproxySectionView): """ return super().get(service, 'defaults', 'defaults', server_id) - @validate(body=HaproxyDefaultsRequest, query=GenerateConfigRequest) def put(self, service: Literal['haproxy'], server_id: Union[int, str], body: HaproxyDefaultsRequest): """ diff --git a/app/views/service/views.py b/app/views/service/views.py index 1197eef7..433d3b14 100644 --- a/app/views/service/views.py +++ b/app/views/service/views.py @@ -456,7 +456,6 @@ class ServiceConfigView(MethodView): if body.action != 'test': config_mod.diff_config(body.config_local_path, cfg) - return DataStrResponse(data=stderr).model_dump(mode='json'), 201 diff --git a/app/views/tools/port_scanner_views.py b/app/views/tools/port_scanner_views.py index ecb766e0..c1b83de4 100644 --- a/app/views/tools/port_scanner_views.py +++ b/app/views/tools/port_scanner_views.py @@ -64,7 +64,6 @@ class PortScannerView(MethodView): return jsonify(model_to_dict(ps_settings, recurse=False, exclude=[PortScannerSettings.user_group_id])) - @validate(body=PortScannerRequest) def post(self, server_id: Union[int, str], body: PortScannerRequest): """