ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
refactor(backend): extract reusable format_bytes, admin_required, and validate_app_name
Juan Denis9f9d86808555
diff --git a/backend/app/api/apps.py b/backend/app/api/apps.pyindex dcbaec90..695f6399 100644--- a/backend/app/api/apps.py+++ b/backend/app/api/apps.py@@ -7,6 +7,7 @@ from flask import Blueprint, request, jsonifyfrom flask_jwt_extended import jwt_required, get_jwt_identityfrom app import dbfrom app.models import Application, User+from app.utils.slug import slugifyfrom app.services.build_service import BuildServicefrom app.services.docker_service import DockerServicefrom app.services.git_service import GitService@@ -79,7 +80,7 @@ def _agent_result_error(result, fallback):def _service_slug(value):- return re.sub(r'[^a-z0-9-]+', '-', (value or '').strip().lower()).strip('-')+ return slugify(value)def _derive_repo_app_type(detection):diff --git a/backend/app/api/backups.py b/backend/app/api/backups.pyindex 441b8a1f..0af3da95 100644--- a/backend/app/api/backups.py+++ b/backend/app/api/backups.py@@ -1,7 +1,8 @@import osfrom flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required, get_jwt_identity-from app.models import User, Application+from flask_jwt_extended import jwt_required+from app.middleware.rbac import admin_required+from app.models import Applicationfrom app.services.backup_service import BackupServicefrom app.services.storage_provider_service import StorageProviderServicefrom app import paths@@ -9,20 +10,6 @@ from app import pathsbackups_bp = Blueprint('backups', __name__)-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--@backups_bp.route('', methods=['GET'])@jwt_required()@admin_requireddiff --git a/backend/app/api/builds.py b/backend/app/api/builds.pyindex 278d23d5..6f0bdfa2 100644--- a/backend/app/api/builds.py+++ b/backend/app/api/builds.py@@ -10,6 +10,7 @@ Provides REST endpoints for:from flask import Blueprint, request, jsonifyfrom flask_jwt_extended import jwt_required, get_jwt_identity+from app.middleware.rbac import admin_requiredfrom app.models import User, Application, Deploymentfrom app.services.build_service import BuildServicefrom app.services.deployment_service import DeploymentService@@ -18,20 +19,6 @@ from app.services.resource_grant_service import ResourceGrantServicebuilds_bp = Blueprint('builds', __name__)-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--# ==================== BUILD CONFIGURATION ====================@builds_bp.route('/apps/<int:app_id>/build-config', methods=['GET'])diff --git a/backend/app/api/deploy.py b/backend/app/api/deploy.pyindex 7556cfd6..7d541adb 100644--- a/backend/app/api/deploy.py+++ b/backend/app/api/deploy.py@@ -1,5 +1,6 @@from flask import Blueprint, request, jsonifyfrom flask_jwt_extended import jwt_required, get_jwt_identity+from app.middleware.rbac import admin_requiredfrom app.models import User, Applicationfrom app.services.git_service import GitServicefrom app.services.resource_grant_service import ResourceGrantService@@ -7,20 +8,6 @@ from app.services.resource_grant_service import ResourceGrantServicedeploy_bp = Blueprint('deploy', __name__)-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--@deploy_bp.route('/apps/<int:app_id>/config', methods=['GET'])@jwt_required()def get_deploy_config(app_id):diff --git a/backend/app/api/domains.py b/backend/app/api/domains.pyindex 048c937f..9bee3646 100644--- a/backend/app/api/domains.py+++ b/backend/app/api/domains.py@@ -2,6 +2,7 @@ import refrom flask import Blueprint, request, jsonifyfrom flask_jwt_extended import jwt_required, get_jwt_identityfrom app import db+from app.middleware.rbac import admin_requiredfrom app.models import Domain, Application, Userfrom app.services.nginx_service import NginxServicefrom app.services.ssl_service import SSLService@@ -69,20 +70,6 @@ def validate_and_sanitize_domain(domain_name: str) -> tuple:return domain.lower(), None-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--@domains_bp.route('', methods=['GET'])@jwt_required()def get_domains():diff --git a/backend/app/api/logs.py b/backend/app/api/logs.pyindex 76ac61e3..cc93f505 100644--- a/backend/app/api/logs.py+++ b/backend/app/api/logs.py@@ -1,25 +1,11 @@from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required, get_jwt_identity-from app.models import User+from flask_jwt_extended import jwt_required+from app.middleware.rbac import admin_requiredfrom app.services.log_service import LogServicelogs_bp = Blueprint('logs', __name__)-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--@logs_bp.route('', methods=['GET'])@jwt_required()@admin_requireddiff --git a/backend/app/api/monitoring.py b/backend/app/api/monitoring.pyindex 36f5c5e6..bd349323 100644--- a/backend/app/api/monitoring.py+++ b/backend/app/api/monitoring.py@@ -1,25 +1,11 @@from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required, get_jwt_identity-from app.models import User+from flask_jwt_extended import jwt_required+from app.middleware.rbac import admin_requiredfrom app.services.monitoring_service import MonitoringServicemonitoring_bp = Blueprint('monitoring', __name__)-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--@monitoring_bp.route('/status', methods=['GET'])@jwt_required()def get_status():diff --git a/backend/app/api/nginx.py b/backend/app/api/nginx.pyindex baaf0532..3dcc2d45 100644--- a/backend/app/api/nginx.py+++ b/backend/app/api/nginx.py@@ -1,25 +1,11 @@from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required, get_jwt_identity-from app.models import User+from flask_jwt_extended import jwt_required+from app.middleware.rbac import admin_requiredfrom app.services.nginx_service import NginxServicenginx_bp = Blueprint('nginx', __name__)-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--@nginx_bp.route('/status', methods=['GET'])@jwt_required()@admin_requireddiff --git a/backend/app/api/notifications.py b/backend/app/api/notifications.pyindex 7428be32..1393ff06 100644--- a/backend/app/api/notifications.py+++ b/backend/app/api/notifications.py@@ -1,5 +1,6 @@from flask import Blueprint, request, jsonifyfrom flask_jwt_extended import jwt_required, get_jwt_identity+from app.middleware.rbac import admin_requiredfrom app.models import User, NotificationPreferencesfrom app import dbfrom app.services.notification_service import NotificationService@@ -7,20 +8,6 @@ from app.services.notification_service import NotificationServicenotifications_bp = Blueprint('notifications', __name__)-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--@notifications_bp.route('/status', methods=['GET'])@jwt_required()def get_status():diff --git a/backend/app/api/php.py b/backend/app/api/php.pyindex 4aad437a..dc11dd61 100644--- a/backend/app/api/php.py+++ b/backend/app/api/php.py@@ -1,25 +1,11 @@from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required, get_jwt_identity-from app.models import User+from flask_jwt_extended import jwt_required+from app.middleware.rbac import admin_requiredfrom app.services.php_service import PHPServicephp_bp = Blueprint('php', __name__)-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--@php_bp.route('/versions', methods=['GET'])@jwt_required()@admin_requireddiff --git a/backend/app/api/processes.py b/backend/app/api/processes.pyindex 149a0fc9..2e495aaf 100644--- a/backend/app/api/processes.py+++ b/backend/app/api/processes.py@@ -1,25 +1,11 @@from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required, get_jwt_identity-from app.models import User+from flask_jwt_extended import jwt_required+from app.middleware.rbac import admin_requiredfrom app.services.process_service import ProcessServiceprocesses_bp = Blueprint('processes', __name__)-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--@processes_bp.route('', methods=['GET'])@jwt_required()@admin_requireddiff --git a/backend/app/api/python.py b/backend/app/api/python.pyindex 571f44fa..7cc2015d 100644--- a/backend/app/api/python.py+++ b/backend/app/api/python.py@@ -1,5 +1,6 @@from flask import Blueprint, request, jsonifyfrom flask_jwt_extended import jwt_required, get_jwt_identity+from app.middleware.rbac import admin_requiredfrom app.models import User, Applicationfrom app.services.python_service import PythonServicefrom app import db@@ -7,20 +8,6 @@ from app import dbpython_bp = Blueprint('python', __name__)-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--def get_app_or_404(app_id, current_user_id):"""Get application and verify read access. Read endpoints rely on this gate;mutating endpoints additionally carry @admin_required, so honoring per-resourcediff --git a/backend/app/api/security.py b/backend/app/api/security.pyindex 547504c7..612f6aa9 100644--- a/backend/app/api/security.py+++ b/backend/app/api/security.py@@ -1,25 +1,11 @@from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required, get_jwt_identity-from app.models import User+from flask_jwt_extended import jwt_required+from app.middleware.rbac import admin_requiredfrom app.services.security_service import SecurityServicesecurity_bp = Blueprint('security', __name__)-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--# ==========================================# STATUS & CONFIG# ==========================================diff --git a/backend/app/api/ssl.py b/backend/app/api/ssl.pyindex dbe6d8ca..af2e0cff 100644--- a/backend/app/api/ssl.py+++ b/backend/app/api/ssl.py@@ -1,25 +1,11 @@from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required, get_jwt_identity-from app.models import User+from flask_jwt_extended import jwt_required+from app.middleware.rbac import admin_requiredfrom app.services.ssl_service import SSLServicessl_bp = Blueprint('ssl', __name__)-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--@ssl_bp.route('/certificates', methods=['GET'])@jwt_required()@admin_requireddiff --git a/backend/app/api/templates.py b/backend/app/api/templates.pyindex df8de2dc..78a121a4 100644--- a/backend/app/api/templates.py+++ b/backend/app/api/templates.py@@ -10,28 +10,16 @@ Provides REST endpoints for:from flask import Blueprint, request, jsonifyfrom flask_jwt_extended import jwt_required, get_jwt_identity+from app.middleware.rbac import admin_requiredfrom app.models import User, Applicationfrom app.services.deployment_job_service import DeploymentJobServicefrom app.services.template_service import TemplateServicefrom app.services.resource_grant_service import ResourceGrantService+from app.utils.slug import validate_app_nametemplates_bp = Blueprint('templates', __name__)-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper--# ==================== TEMPLATE BROWSING ====================@templates_bp.route('/', methods=['GET'])@@ -146,11 +134,9 @@ def install_template(template_id):return jsonify({'error': 'app_name is required'}), 400# Validate app name- import re- if not re.match(r'^[a-z0-9][a-z0-9-]*[a-z0-9]$', app_name) or len(app_name) < 3:- return jsonify({- 'error': 'App name must be lowercase alphanumeric with hyphens, at least 3 characters'- }), 400+ valid, error = validate_app_name(app_name, min_length=3)+ if not valid:+ return jsonify({'error': error}), 400user_variables = data.get('variables', {})server_id = data.get('server_id') or data.get('target_server_id')@@ -195,13 +181,12 @@ def validate_installation():errors = []# Validate app name- import reif not app_name:errors.append('App name is required')- elif len(app_name) < 2:- errors.append('App name must be at least 2 characters')- elif not re.match(r'^[a-z0-9]([a-z0-9-]*[a-z0-9])?$', app_name):- errors.append('App name must be lowercase alphanumeric with optional hyphens (not at start/end)')+ else:+ valid, error = validate_app_name(app_name, min_length=2)+ if not valid:+ errors.append(error)# Check if app name is takenif app_name:diff --git a/backend/app/api/wordpress.py b/backend/app/api/wordpress.pyindex c25e69d1..a2805480 100644--- a/backend/app/api/wordpress.py+++ b/backend/app/api/wordpress.py@@ -1,6 +1,7 @@import jsonfrom flask import Blueprint, request, jsonifyfrom flask_jwt_extended import jwt_required, get_jwt_identity+from app.middleware.rbac import admin_requiredfrom app.models import User, Application, WordPressSitefrom app.services.wordpress_service import WordPressServicefrom app import db@@ -341,19 +342,6 @@ def restart_standalone():# ==================== LEGACY WP-CLI ENDPOINTS ====================-def admin_required(fn):- """Decorator to require admin role."""- from functools import wraps-- @wraps(fn)- def wrapper(*args, **kwargs):- current_user_id = get_jwt_identity()- user = User.query.get(current_user_id)- if not user or user.role != 'admin':- return jsonify({'error': 'Admin access required'}), 403- return fn(*args, **kwargs)- return wrapper-@wordpress_bp.route('/install', methods=['POST'])@jwt_required()diff --git a/backend/app/services/backup_service.py b/backend/app/services/backup_service.pyindex 80209057..9056c22d 100644--- a/backend/app/services/backup_service.py+++ b/backend/app/services/backup_service.py@@ -15,6 +15,7 @@ import schedulefrom app import pathsfrom app.utils import backup_crypto+from app.utils.formatting import format_bytesfrom app.utils.system import is_command_available@@ -886,8 +887,4 @@ class BackupService:@staticmethoddef _format_size(size: int) -> str:"""Format size in human readable format."""- for unit in ['B', 'KB', 'MB', 'GB', 'TB']:- if size < 1024:- return f"{size:.1f} {unit}"- size /= 1024- return f"{size:.1f} PB"+ return format_bytes(size, suffix_sep=' ')diff --git a/backend/app/services/environment_health_service.py b/backend/app/services/environment_health_service.pyindex 20e37261..93a0f6fb 100644--- a/backend/app/services/environment_health_service.py+++ b/backend/app/services/environment_health_service.py@@ -14,6 +14,7 @@ from app import dbfrom app.models.wordpress_site import WordPressSitefrom app.services.environment_docker_service import EnvironmentDockerServicefrom app.services.environment_pipeline_service import EnvironmentPipelineService+from app.utils.formatting import format_bytesclass EnvironmentHealthService:@@ -382,10 +383,4 @@ class EnvironmentHealthService:@staticmethoddef _format_size(size_bytes: int) -> str:"""Format bytes to human-readable string."""- if not size_bytes:- return '0 B'- for unit in ['B', 'KB', 'MB', 'GB']:- if size_bytes < 1024:- return f'{size_bytes:.1f} {unit}'- size_bytes /= 1024- return f'{size_bytes:.1f} TB'+ return format_bytes(size_bytes, suffix_sep=' ')diff --git a/backend/app/services/file_service.py b/backend/app/services/file_service.pyindex 82fc0f7f..f9e8c05c 100644--- a/backend/app/services/file_service.py+++ b/backend/app/services/file_service.py@@ -24,6 +24,7 @@ else:grp = Nonefrom app import paths+from app.utils.formatting import format_bytesclass FileService:@@ -485,11 +486,7 @@ class FileService:@staticmethoddef _format_size(size: int) -> str:"""Format size in human-readable format."""- for unit in ['B', 'KB', 'MB', 'GB', 'TB']:- if size < 1024:- return f"{size:.1f} {unit}"- size /= 1024- return f"{size:.1f} PB"+ return format_bytes(size, suffix_sep=' ')# Virtual/pseudo filesystem types to hide from disk usage_VIRTUAL_FSTYPES = {diff --git a/backend/app/services/ftp_service.py b/backend/app/services/ftp_service.pyindex 90df6251..3cdac0b1 100644--- a/backend/app/services/ftp_service.py+++ b/backend/app/services/ftp_service.py@@ -4,6 +4,7 @@ import osimport subprocessimport re+from app.utils.formatting import format_bytesfrom app.utils.system import PackageManager, ServiceControl, run_privileged, privileged_cmdtry:import pwd@@ -713,8 +714,4 @@ userlist_deny=NO@staticmethoddef _format_size(size: int) -> str:"""Format size in human-readable format."""- for unit in ['B', 'KB', 'MB', 'GB', 'TB']:- if size < 1024:- return f"{size:.1f} {unit}"- size /= 1024- return f"{size:.1f} PB"+ return format_bytes(size, suffix_sep=' ')diff --git a/backend/app/services/log_service.py b/backend/app/services/log_service.pyindex e797082a..96498112 100644--- a/backend/app/services/log_service.py+++ b/backend/app/services/log_service.py@@ -7,6 +7,7 @@ import threadingimport queuefrom app import paths+from app.utils.formatting import format_bytesfrom app.utils.system import run_privileged, privileged_cmd, is_command_available, sourced_result@@ -435,11 +436,7 @@ class LogService:@staticmethoddef _format_size(size: int) -> str:"""Format size in bytes to human readable."""- for unit in ['B', 'KB', 'MB', 'GB']:- if size < 1024:- return f"{size:.1f}{unit}"- size /= 1024- return f"{size:.1f}TB"+ return format_bytes(size, suffix_sep='')class LogStreamer:diff --git a/backend/app/services/remote_docker_service.py b/backend/app/services/remote_docker_service.pyindex 7993db7f..fc9e4469 100644--- a/backend/app/services/remote_docker_service.py+++ b/backend/app/services/remote_docker_service.py@@ -6,11 +6,11 @@ This service routes Docker commands to the appropriate agentand returns the results."""-from typing import Optional, List, Dict, Any-from flask_jwt_extended import get_jwt_identity+from typing import List, Dict, Anyfrom app.services.agent_registry import agent_registryfrom app.models.server import Server+from app.utils.formatting import format_bytesclass RemoteDockerService:@@ -360,12 +360,7 @@ class RemoteDockerService:@staticmethoddef _human_bytes(n: int) -> str:- n = float(n or 0)- for unit in ('B', 'KB', 'MB', 'GB', 'TB'):- if n < 1024:- return f"{n:.1f}{unit}"- n /= 1024- return f"{n:.1f}PB"+ return format_bytes(n, suffix_sep='')@classmethoddef _normalize_agent_metrics(cls, flat: Dict[str, Any]) -> Dict[str, Any]:diff --git a/backend/app/services/storage_provider_service.py b/backend/app/services/storage_provider_service.pyindex 9d7931e8..fa26e6b6 100644--- a/backend/app/services/storage_provider_service.py+++ b/backend/app/services/storage_provider_service.py@@ -8,6 +8,7 @@ from urllib.parse import urlparsefrom app import pathsfrom app.utils.crypto import encrypt_secret, decrypt_secret_safe, is_encrypted+from app.utils.formatting import format_bytesclass StorageProviderService:@@ -433,11 +434,7 @@ class StorageProviderService:@staticmethoddef _format_size(size: int) -> str:"""Format size in human readable format."""- for unit in ['B', 'KB', 'MB', 'GB', 'TB']:- if size < 1024:- return f"{size:.1f} {unit}"- size /= 1024- return f"{size:.1f} PB"+ return format_bytes(size, suffix_sep=' ')# ── File-browser access (powers the Files app's "S3 bucket" target) ──# Paths arrive slash-rooted from the UI (e.g. "/photos/cat.jpg"); we strip thediff --git a/backend/app/services/system_service.py b/backend/app/services/system_service.pyindex 194ba083..25367237 100644--- a/backend/app/services/system_service.py+++ b/backend/app/services/system_service.py@@ -4,6 +4,7 @@ import subprocessimport osfrom datetime import datetime+from app.utils.formatting import format_bytesfrom app.utils.system import run_privileged@@ -13,11 +14,7 @@ class SystemService:@staticmethoddef get_size(bytes_val):"""Convert bytes to human readable format."""- for unit in ['B', 'KB', 'MB', 'GB', 'TB']:- if bytes_val < 1024:- return f"{bytes_val:.1f}{unit}"- bytes_val /= 1024- return f"{bytes_val:.1f}PB"+ return format_bytes(bytes_val, suffix_sep='')@classmethoddef get_cpu_metrics(cls):diff --git a/backend/app/services/wp_analytics_service.py b/backend/app/services/wp_analytics_service.pyindex 3e89ebdf..1f555341 100644--- a/backend/app/services/wp_analytics_service.py+++ b/backend/app/services/wp_analytics_service.py@@ -23,6 +23,8 @@ import subprocessfrom collections import Counterfrom datetime import datetime, timedelta, timezone+from app.utils.formatting import format_bytes+# Apache "combined" CustomLog (the official wordpress:*-apache default to stdout):# %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-Agent}i"@@ -257,8 +259,4 @@ class WpAnalyticsService:@staticmethoddef _human_bytes(n):- size = float(n)- for unit in ('B', 'KB', 'MB', 'GB', 'TB'):- if size < 1024 or unit == 'TB':- return f'{size:.0f} {unit}' if unit == 'B' else f'{size:.1f} {unit}'- size /= 1024+ return format_bytes(n, suffix_sep=' ')diff --git a/backend/app/utils/formatting.py b/backend/app/utils/formatting.pynew file mode 100644index 00000000..a7e1000e--- /dev/null+++ b/backend/app/utils/formatting.py@@ -0,0 +1,33 @@+"""Text and numeric formatting utilities."""+++def format_bytes(n, precision=1, suffix_sep=' '):+ """Format a byte count as a human-readable string using 1024-based units.++ Args:+ n: Byte count. ``None`` or ``0`` renders as ``'0 B'`` (or ``'0B'`` when+ ``suffix_sep`` is empty).+ precision: Number of decimal places to show.+ suffix_sep: Separator between the numeric value and the unit.++ Returns:+ A human-readable string such as ``'1.5 KB'`` or ``'2.3GiB'``.++ Examples:+ >>> format_bytes(512)+ '512.0 B'+ >>> format_bytes(1536)+ '1.5 KB'+ >>> format_bytes(1073741824, suffix_sep='')+ '1.0GB'+ """+ if n is None:+ return ''+ n = float(n)+ if n == 0:+ return f'0{suffix_sep}B'+ for suffix in ('B', 'KB', 'MB', 'GB', 'TB'):+ if n < 1024:+ return f'{n:.{precision}f}{suffix_sep}{suffix}'+ n /= 1024+ return f'{n:.{precision}f}{suffix_sep}PB'diff --git a/backend/app/utils/slug.py b/backend/app/utils/slug.pyindex 4033edb6..95601354 100644--- a/backend/app/utils/slug.py+++ b/backend/app/utils/slug.py@@ -70,3 +70,47 @@ def validate_slug(value):if not SLUG_PATTERN.match(slug):raise ValueError('Slug can only contain lowercase letters, numbers, and hyphens')return slug+++# Common "app/service" name pattern: lowercase alphanumeric with internal hyphens,+# must start/end with alphanumeric (a single alphanumeric char is allowed).+_APP_NAME_RE = re.compile(r'^[a-z0-9]([a-z0-9-]*[a-z0-9])?$')+++def validate_app_name(name, min_length=3, max_length=63,+ allow_consecutive_hyphens=False, reserved=None):+ """Validate an application or service name.++ Args:+ name: The name to validate.+ min_length: Minimum allowed length.+ max_length: Maximum allowed length.+ allow_consecutive_hyphens: If False, reject names containing ``--``.+ reserved: Optional iterable of reserved names (case-insensitive).++ Returns:+ Tuple of ``(is_valid, error_message)``. ``error_message`` is ``None``+ when the name is valid.++ Examples:+ >>> validate_app_name('my-app')+ (True, None)+ >>> validate_app_name('My App')+ (False, 'Name must contain only lowercase letters, numbers, and hyphens...')+ """+ if not name:+ return False, 'Name is required'+ if len(name) < min_length:+ return False, f'Name must be at least {min_length} characters'+ if len(name) > max_length:+ return False, f'Name cannot exceed {max_length} characters'+ if not _APP_NAME_RE.match(name):+ return False, (+ 'Name must contain only lowercase letters, numbers, and hyphens '+ '(cannot start or end with hyphen)'+ )+ if not allow_consecutive_hyphens and '--' in name:+ return False, 'Name cannot contain consecutive hyphens'+ if reserved and name.lower() in {r.lower() for r in reserved}:+ return False, f'Name "{name}" is reserved'+ return True, None