v8.2.0: Refactor error handlers and clean up unused imports

Replaced inline `get_user_params()` calls with decorators for error handlers, improving readability and consistency. Cleaned up unused imports in multiple files and improved logging messages for better clarity. Simplified `create_db.py` by removing unused ORM fields.
master
Aidaho 2025-05-19 10:11:07 +03:00
parent 8c300a9f7d
commit 44580ac62a
4 changed files with 7 additions and 13 deletions

View File

@ -1,9 +1,6 @@
import distro import distro
from app.modules.db.db_model import ( from app.modules.db.db_model import connect, Setting, Role, User, UserGroups, Groups, Services, RoxyTool, GeoipCodes
connect, Setting, Role, User, UserGroups, Groups, Services, RoxyTool, Version, GeoipCodes, migrate, mysql_enable, TextField
)
from peewee import IntegerField, SQL
conn = connect() conn = connect()

View File

@ -1,6 +1,6 @@
from datetime import datetime from datetime import datetime
from peewee import ForeignKeyField,CharField, DateTimeField, AutoField from peewee import ForeignKeyField, CharField, DateTimeField, AutoField, TextField, IntegerField, Model, SQL, FloatField
from playhouse.migrate import * from playhouse.migrate import *
from playhouse.shortcuts import ReconnectMixin from playhouse.shortcuts import ReconnectMixin
from playhouse.sqlite_ext import SqliteExtDatabase from playhouse.sqlite_ext import SqliteExtDatabase

View File

@ -210,7 +210,7 @@ def keep_action_history(service: str, action: str, server_ip: str, user_id: int,
history_sql.insert_action_history(service, action, server_id, user_id, user_ip, server_ip, hostname) history_sql.insert_action_history(service, action, server_id, user_id, user_ip, server_ip, hostname)
except Exception as e: except Exception as e:
logger.error( logger.error(
f'Cannot save a history', 'Cannot save a history',
server_ip='Roxy-WI server', server_ip='Roxy-WI server',
exception=e, exception=e,
service=service, service=service,
@ -228,7 +228,7 @@ def get_dick_permit(**kwargs):
else: else:
return servers return servers
else: else:
print('Atata!') logging('Roxy-WI server', 'warning: has tried to actions in not his group')
return [] return []

View File

@ -183,13 +183,12 @@ def register_error_handlers(app):
return redirect(url_for('login_page', next=request.full_path)) return redirect(url_for('login_page', next=request.full_path))
@app.errorhandler(403) @app.errorhandler(403)
@get_user_params()
def forbidden(e): def forbidden(e):
"""Handle 403 Forbidden errors.""" """Handle 403 Forbidden errors."""
if 'api' in request.url: if 'api' in request.url:
return jsonify(ErrorResponse(error=str(e)).model_dump(mode='json')), 403 return jsonify(ErrorResponse(error=str(e)).model_dump(mode='json')), 403
# Get user parameters for rendering the template
get_user_params()
kwargs = { kwargs = {
'user_params': g.user_params, 'user_params': g.user_params,
'title': e, 'title': e,
@ -198,13 +197,12 @@ def register_error_handlers(app):
return render_template('error.html', **kwargs), 403 return render_template('error.html', **kwargs), 403
@app.errorhandler(404) @app.errorhandler(404)
@get_user_params()
def not_found(e): def not_found(e):
"""Handle 404 Not Found errors.""" """Handle 404 Not Found errors."""
if 'api' in request.url: if 'api' in request.url:
return jsonify(ErrorResponse(error=str(e)).model_dump(mode='json')), 404 return jsonify(ErrorResponse(error=str(e)).model_dump(mode='json')), 404
# Get user parameters for rendering the template
get_user_params()
kwargs = { kwargs = {
'user_params': g.user_params, 'user_params': g.user_params,
'title': e, 'title': e,
@ -228,13 +226,12 @@ def register_error_handlers(app):
return jsonify(ErrorResponse(error="Too many requests").model_dump(mode='json')), 429 return jsonify(ErrorResponse(error="Too many requests").model_dump(mode='json')), 429
@app.errorhandler(500) @app.errorhandler(500)
@get_user_params()
def internal_server_error(e): def internal_server_error(e):
"""Handle 500 Internal Server Error errors.""" """Handle 500 Internal Server Error errors."""
if 'api' in request.url: if 'api' in request.url:
return jsonify(ErrorResponse(error=str(e)).model_dump(mode='json')), 500 return jsonify(ErrorResponse(error=str(e)).model_dump(mode='json')), 500
# Get user parameters for rendering the template
get_user_params()
kwargs = { kwargs = {
'user_params': g.user_params, 'user_params': g.user_params,
'title': e, 'title': e,