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
Replace jwt_required with RBAC, use socket auth
Juan Deniscaa799ba1b09
diff --git a/backend/app/api/cron.py b/backend/app/api/cron.pyindex 8fdbe873..2e827b36 100644--- a/backend/app/api/cron.py+++ b/backend/app/api/cron.py@@ -5,15 +5,15 @@ Endpoints for managing scheduled tasks and cron jobs."""from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required+from app.middleware.rbac import admin_required, viewer_requiredfrom app.services.cron_service import CronServicecron_bp = Blueprint('cron', __name__)@cron_bp.route('/status', methods=['GET'])-@jwt_required()+@viewer_requireddef get_status():"""Get cron service status."""status = CronService.get_status()@@ -21,7 +21,7 @@ def get_status():@cron_bp.route('/jobs', methods=['GET'])-@jwt_required()+@viewer_requireddef list_jobs():"""List all cron jobs."""result = CronService.list_jobs()@@ -29,7 +29,7 @@ def list_jobs():@cron_bp.route('/jobs', methods=['POST'])-@jwt_required()+@admin_requireddef create_job():"""Create a new cron job."""data = request.get_json()@@ -58,7 +58,7 @@ def create_job():@cron_bp.route('/jobs/<job_id>', methods=['DELETE'])-@jwt_required()+@admin_requireddef delete_job(job_id):"""Delete a cron job."""result = CronService.remove_job(job_id)@@ -69,7 +69,7 @@ def delete_job(job_id):@cron_bp.route('/jobs/<job_id>/toggle', methods=['POST'])-@jwt_required()+@admin_requireddef toggle_job(job_id):"""Enable or disable a cron job."""data = request.get_json()@@ -83,7 +83,7 @@ def toggle_job(job_id):@cron_bp.route('/jobs/<job_id>/run', methods=['POST'])-@jwt_required()+@admin_requireddef run_job(job_id):"""Run a job immediately."""result = CronService.run_job_now(job_id)@@ -94,7 +94,7 @@ def run_job(job_id):@cron_bp.route('/presets', methods=['GET'])-@jwt_required()+@viewer_requireddef get_presets():"""Get available schedule presets."""result = CronService.get_presets()diff --git a/backend/app/api/firewall.py b/backend/app/api/firewall.pyindex a68ff2d6..2f9a82fa 100644--- a/backend/app/api/firewall.py+++ b/backend/app/api/firewall.py@@ -1,14 +1,15 @@"""Firewall API endpoints for managing firewalld and ufw."""from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required++from ..middleware.rbac import admin_required, viewer_requiredfrom ..services.firewall_service import FirewallServicefirewall_bp = Blueprint('firewall', __name__)@firewall_bp.route('/status', methods=['GET'])-@jwt_required()+@viewer_requireddef get_status():"""Get firewall status."""result = FirewallService.get_status()@@ -16,7 +17,7 @@ def get_status():@firewall_bp.route('/enable', methods=['POST'])-@jwt_required()+@admin_requireddef enable_firewall():"""Enable the firewall."""data = request.get_json() or {}@@ -30,7 +31,7 @@ def enable_firewall():@firewall_bp.route('/disable', methods=['POST'])-@jwt_required()+@admin_requireddef disable_firewall():"""Disable the firewall."""data = request.get_json() or {}@@ -44,7 +45,7 @@ def disable_firewall():@firewall_bp.route('/rules', methods=['GET'])-@jwt_required()+@viewer_requireddef get_rules():"""Get all firewall rules."""firewall = request.args.get('firewall')@@ -56,7 +57,7 @@ def get_rules():@firewall_bp.route('/rules', methods=['POST'])-@jwt_required()+@admin_requireddef add_rule():"""Add a firewall rule."""data = request.get_json()@@ -79,7 +80,7 @@ def add_rule():@firewall_bp.route('/rules', methods=['DELETE'])-@jwt_required()+@admin_requireddef remove_rule():"""Remove a firewall rule."""data = request.get_json()@@ -101,7 +102,7 @@ def remove_rule():@firewall_bp.route('/block-ip', methods=['POST'])-@jwt_required()+@admin_requireddef block_ip():"""Quick block an IP address."""data = request.get_json()@@ -123,7 +124,7 @@ def block_ip():@firewall_bp.route('/unblock-ip', methods=['POST'])-@jwt_required()+@admin_requireddef unblock_ip():"""Unblock an IP address."""data = request.get_json()@@ -145,7 +146,7 @@ def unblock_ip():@firewall_bp.route('/blocked-ips', methods=['GET'])-@jwt_required()+@viewer_requireddef get_blocked_ips():"""Get list of blocked IP addresses."""result = FirewallService.get_blocked_ips()@@ -156,7 +157,7 @@ def get_blocked_ips():@firewall_bp.route('/allow-port', methods=['POST'])-@jwt_required()+@admin_requireddef allow_port():"""Allow a port through the firewall."""data = request.get_json()@@ -179,7 +180,7 @@ def allow_port():@firewall_bp.route('/deny-port', methods=['POST'])-@jwt_required()+@admin_requireddef deny_port():"""Remove a port from the firewall."""data = request.get_json()@@ -202,7 +203,7 @@ def deny_port():@firewall_bp.route('/zones', methods=['GET'])-@jwt_required()+@viewer_requireddef get_zones():"""Get firewalld zones."""result = FirewallService.get_zones()@@ -213,7 +214,7 @@ def get_zones():@firewall_bp.route('/zones/default', methods=['POST'])-@jwt_required()+@admin_requireddef set_default_zone():"""Set default firewalld zone."""data = request.get_json()@@ -233,7 +234,7 @@ def set_default_zone():@firewall_bp.route('/install', methods=['POST'])-@jwt_required()+@admin_requireddef install_firewall():"""Install a firewall (ufw or firewalld)."""data = request.get_json() or {}diff --git a/backend/app/api/ftp.py b/backend/app/api/ftp.pyindex 87d084e3..48e5bd09 100644--- a/backend/app/api/ftp.py+++ b/backend/app/api/ftp.py@@ -1,14 +1,15 @@"""FTP Server API endpoints for managing FTP services and users."""from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required++from ..middleware.rbac import admin_required, viewer_requiredfrom ..services.ftp_service import FTPServiceftp_bp = Blueprint('ftp', __name__)@ftp_bp.route('/status', methods=['GET'])-@jwt_required()+@viewer_requireddef get_status():"""Get FTP server status."""result = FTPService.get_status()@@ -16,7 +17,7 @@ def get_status():@ftp_bp.route('/service/<action>', methods=['POST'])-@jwt_required()+@admin_requireddef control_service(action):"""Start, stop, restart, or reload FTP service."""if action not in ['start', 'stop', 'restart', 'reload']:@@ -36,7 +37,7 @@ def control_service(action):@ftp_bp.route('/config', methods=['GET'])-@jwt_required()+@viewer_requireddef get_config():"""Get FTP server configuration."""service = request.args.get('service') # Optional@@ -48,7 +49,7 @@ def get_config():@ftp_bp.route('/config', methods=['POST'])-@jwt_required()+@admin_requireddef update_config():"""Update FTP server configuration."""data = request.get_json()@@ -70,7 +71,7 @@ def update_config():@ftp_bp.route('/users', methods=['GET'])-@jwt_required()+@viewer_requireddef list_users():"""List FTP users."""result = FTPService.list_users()@@ -81,7 +82,7 @@ def list_users():@ftp_bp.route('/users', methods=['POST'])-@jwt_required()+@admin_requireddef create_user():"""Create a new FTP user."""data = request.get_json()@@ -111,7 +112,7 @@ def create_user():@ftp_bp.route('/users/<username>', methods=['DELETE'])-@jwt_required()+@admin_requireddef delete_user(username):"""Delete an FTP user."""delete_home = request.args.get('delete_home', 'false').lower() == 'true'@@ -124,7 +125,7 @@ def delete_user(username):@ftp_bp.route('/users/<username>/password', methods=['POST'])-@jwt_required()+@admin_requireddef change_password(username):"""Change FTP user password."""data = request.get_json() or {}@@ -138,7 +139,7 @@ def change_password(username):@ftp_bp.route('/users/<username>/toggle', methods=['POST'])-@jwt_required()+@admin_requireddef toggle_user(username):"""Enable or disable an FTP user."""data = request.get_json() or {}@@ -152,7 +153,7 @@ def toggle_user(username):@ftp_bp.route('/connections', methods=['GET'])-@jwt_required()+@viewer_requireddef get_connections():"""Get active FTP connections."""result = FTPService.get_connections()@@ -163,7 +164,7 @@ def get_connections():@ftp_bp.route('/connections/<int:pid>', methods=['DELETE'])-@jwt_required()+@admin_requireddef disconnect_user(pid):"""Disconnect an active FTP session."""result = FTPService.disconnect_session(pid)@@ -174,7 +175,7 @@ def disconnect_user(pid):@ftp_bp.route('/logs', methods=['GET'])-@jwt_required()+@viewer_requireddef get_logs():"""Get FTP server logs."""lines = request.args.get('lines', 100, type=int)@@ -187,7 +188,7 @@ def get_logs():@ftp_bp.route('/install', methods=['POST'])-@jwt_required()+@admin_requireddef install_ftp():"""Install FTP server (vsftpd or proftpd)."""data = request.get_json() or {}@@ -207,7 +208,7 @@ def install_ftp():@ftp_bp.route('/test', methods=['POST'])-@jwt_required()+@admin_requireddef test_connection():"""Test FTP connection."""data = request.get_json() or {}diff --git a/backend/app/api/git.py b/backend/app/api/git.pyindex d9f10866..87dbbaaf 100644--- a/backend/app/api/git.py+++ b/backend/app/api/git.py@@ -1,7 +1,8 @@"""Git Server API endpoints for managing integrated Gitea instance and webhooks."""from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required++from ..middleware.rbac import admin_required, viewer_requiredfrom ..services.git_service import GitServicefrom ..services.webhook_service import WebhookServicefrom ..services.gitea_api_service import GiteaAPIService@@ -11,7 +12,7 @@ git_bp = Blueprint('git', __name__)@git_bp.route('/status', methods=['GET'])-@jwt_required()+@viewer_requireddef get_status():"""Get Gitea installation status."""result = GitService.get_gitea_status()@@ -19,7 +20,7 @@ def get_status():@git_bp.route('/requirements', methods=['GET'])-@jwt_required()+@viewer_requireddef get_requirements():"""Get resource requirements for Gitea installation."""result = GitService.get_gitea_resource_requirements()@@ -27,7 +28,7 @@ def get_requirements():@git_bp.route('/install', methods=['POST'])-@jwt_required()+@admin_requireddef install():"""Install Gitea with PostgreSQL."""data = request.get_json() or {}@@ -44,7 +45,7 @@ def install():@git_bp.route('/uninstall', methods=['POST'])-@jwt_required()+@admin_requireddef uninstall():"""Uninstall Gitea and optionally remove data."""data = request.get_json() or {}@@ -59,7 +60,7 @@ def uninstall():@git_bp.route('/start', methods=['POST'])-@jwt_required()+@admin_requireddef start():"""Start Gitea server."""result = GitService.start_gitea()@@ -70,7 +71,7 @@ def start():@git_bp.route('/stop', methods=['POST'])-@jwt_required()+@admin_requireddef stop():"""Stop Gitea server."""result = GitService.stop_gitea()@@ -81,7 +82,7 @@ def stop():@git_bp.route('/restart', methods=['POST'])-@jwt_required()+@admin_requireddef restart():"""Restart Gitea server."""result = GitService.restart_gitea()@@ -94,7 +95,7 @@ def restart():# ==================== WEBHOOK ENDPOINTS ====================@git_bp.route('/webhooks', methods=['GET'])-@jwt_required()+@viewer_requireddef list_webhooks():"""List all configured webhooks."""result = WebhookService.list_webhooks()@@ -102,7 +103,7 @@ def list_webhooks():@git_bp.route('/webhooks', methods=['POST'])-@jwt_required()+@admin_requireddef create_webhook():"""Create a new webhook."""data = request.get_json() or {}@@ -128,7 +129,7 @@ def create_webhook():@git_bp.route('/webhooks/<int:webhook_id>', methods=['GET'])-@jwt_required()+@viewer_requireddef get_webhook(webhook_id):"""Get a specific webhook."""result = WebhookService.get_webhook(webhook_id)@@ -139,7 +140,7 @@ def get_webhook(webhook_id):@git_bp.route('/webhooks/<int:webhook_id>', methods=['PUT'])-@jwt_required()+@admin_requireddef update_webhook(webhook_id):"""Update a webhook."""data = request.get_json() or {}@@ -152,7 +153,7 @@ def update_webhook(webhook_id):@git_bp.route('/webhooks/<int:webhook_id>', methods=['DELETE'])-@jwt_required()+@admin_requireddef delete_webhook(webhook_id):"""Delete a webhook."""result = WebhookService.delete_webhook(webhook_id)@@ -163,7 +164,7 @@ def delete_webhook(webhook_id):@git_bp.route('/webhooks/<int:webhook_id>/toggle', methods=['POST'])-@jwt_required()+@admin_requireddef toggle_webhook(webhook_id):"""Toggle webhook active status."""result = WebhookService.toggle_webhook(webhook_id)@@ -174,7 +175,7 @@ def toggle_webhook(webhook_id):@git_bp.route('/webhooks/<int:webhook_id>/logs', methods=['GET'])-@jwt_required()+@viewer_requireddef get_webhook_logs(webhook_id):"""Get logs for a specific webhook."""limit = request.args.get('limit', 50, type=int)@@ -183,7 +184,7 @@ def get_webhook_logs(webhook_id):@git_bp.route('/webhooks/<int:webhook_id>/test', methods=['POST'])-@jwt_required()+@admin_requireddef test_webhook(webhook_id):"""Test a webhook by triggering a manual sync."""result = WebhookService.test_webhook(webhook_id)@@ -235,7 +236,7 @@ def receive_webhook(token):# ==================== REPOSITORY ENDPOINTS ====================@git_bp.route('/repos', methods=['GET'])-@jwt_required()+@viewer_requireddef list_repositories():"""List all repositories in Gitea."""token = request.args.get('token')@@ -249,7 +250,7 @@ def list_repositories():@git_bp.route('/repos/<owner>/<repo>', methods=['GET'])-@jwt_required()+@viewer_requireddef get_repository(owner, repo):"""Get repository details."""token = request.args.get('token')@@ -262,7 +263,7 @@ def get_repository(owner, repo):@git_bp.route('/repos/<owner>/<repo>/stats', methods=['GET'])-@jwt_required()+@viewer_requireddef get_repo_stats(owner, repo):"""Get repository statistics."""token = request.args.get('token')@@ -275,7 +276,7 @@ def get_repo_stats(owner, repo):@git_bp.route('/repos/<owner>/<repo>/branches', methods=['GET'])-@jwt_required()+@viewer_requireddef list_branches(owner, repo):"""List repository branches."""token = request.args.get('token')@@ -288,7 +289,7 @@ def list_branches(owner, repo):@git_bp.route('/repos/<owner>/<repo>/branches/<branch>', methods=['GET'])-@jwt_required()+@viewer_requireddef get_branch(owner, repo, branch):"""Get branch details."""token = request.args.get('token')@@ -301,7 +302,7 @@ def get_branch(owner, repo, branch):@git_bp.route('/repos/<owner>/<repo>/commits', methods=['GET'])-@jwt_required()+@viewer_requireddef list_commits(owner, repo):"""List repository commits."""token = request.args.get('token')@@ -323,7 +324,7 @@ def list_commits(owner, repo):@git_bp.route('/repos/<owner>/<repo>/commits/<sha>', methods=['GET'])-@jwt_required()+@viewer_requireddef get_commit(owner, repo, sha):"""Get commit details."""token = request.args.get('token')@@ -336,7 +337,7 @@ def get_commit(owner, repo, sha):@git_bp.route('/repos/<owner>/<repo>/contents', methods=['GET'])-@jwt_required()+@viewer_requireddef list_files(owner, repo):"""List files in repository directory."""token = request.args.get('token')@@ -351,7 +352,7 @@ def list_files(owner, repo):@git_bp.route('/repos/<owner>/<repo>/contents/<path:filepath>', methods=['GET'])-@jwt_required()+@viewer_requireddef get_file_content(owner, repo, filepath):"""Get file content."""token = request.args.get('token')@@ -365,7 +366,7 @@ def get_file_content(owner, repo, filepath):@git_bp.route('/repos/<owner>/<repo>/readme', methods=['GET'])-@jwt_required()+@viewer_requireddef get_readme(owner, repo):"""Get repository README."""token = request.args.get('token')@@ -379,7 +380,7 @@ def get_readme(owner, repo):@git_bp.route('/version', methods=['GET'])-@jwt_required()+@viewer_requireddef get_gitea_version():"""Get Gitea server version."""result = GiteaAPIService.get_server_version()@@ -392,7 +393,7 @@ def get_gitea_version():# ==================== DEPLOYMENT ENDPOINTS ====================@git_bp.route('/deployments/app/<int:app_id>', methods=['GET'])-@jwt_required()+@viewer_requireddef get_app_deployments(app_id):"""Get deployment history for an application."""limit = request.args.get('limit', 20, type=int)@@ -401,7 +402,7 @@ def get_app_deployments(app_id):@git_bp.route('/deployments/<int:deployment_id>', methods=['GET'])-@jwt_required()+@viewer_requireddef get_deployment(deployment_id):"""Get a specific deployment with logs."""include_logs = request.args.get('logs', 'false').lower() == 'true'@@ -413,7 +414,7 @@ def get_deployment(deployment_id):@git_bp.route('/deployments/app/<int:app_id>/deploy', methods=['POST'])-@jwt_required()+@admin_requireddef manual_deploy(app_id):"""Trigger a manual deployment for an application."""data = request.get_json() or {}@@ -427,7 +428,7 @@ def manual_deploy(app_id):@git_bp.route('/deployments/app/<int:app_id>/rollback', methods=['POST'])-@jwt_required()+@admin_requireddef rollback_deployment(app_id):"""Rollback to a previous deployment version."""data = request.get_json() or {}@@ -441,7 +442,7 @@ def rollback_deployment(app_id):@git_bp.route('/deployments/webhook/<int:webhook_id>', methods=['GET'])-@jwt_required()+@viewer_requireddef get_webhook_deployments(webhook_id):"""Get deployments triggered by a specific webhook."""from app.models import GitDeploymentdiff --git a/backend/app/api/metrics.py b/backend/app/api/metrics.pyindex 9a703c24..f25b74fa 100644--- a/backend/app/api/metrics.py+++ b/backend/app/api/metrics.py@@ -1,15 +1,15 @@"""API endpoints for historical metrics data."""from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required+from app.middleware.rbac import admin_required, viewer_requiredfrom app.services.metrics_history_service import MetricsHistoryServicemetrics_bp = Blueprint('metrics', __name__)@metrics_bp.route('/history', methods=['GET'])-@jwt_required()+@viewer_requireddef get_metrics_history():"""Get historical metrics data.@@ -33,7 +33,7 @@ def get_metrics_history():@metrics_bp.route('/stats', methods=['GET'])-@jwt_required()+@viewer_requireddef get_metrics_stats():"""Get statistics about stored metrics data.@@ -48,7 +48,7 @@ def get_metrics_stats():@metrics_bp.route('/collection/start', methods=['POST'])-@jwt_required()+@admin_requireddef start_collection():"""Start metrics collection (admin only).@@ -65,7 +65,7 @@ def start_collection():@metrics_bp.route('/collection/stop', methods=['POST'])-@jwt_required()+@admin_requireddef stop_collection():"""Stop metrics collection (admin only).@@ -77,7 +77,7 @@ def stop_collection():@metrics_bp.route('/aggregate', methods=['POST'])-@jwt_required()+@admin_requireddef trigger_aggregation():"""Manually trigger data aggregation (admin only).diff --git a/backend/app/api/private_urls.py b/backend/app/api/private_urls.pyindex ffabaa07..790da1e6 100644--- a/backend/app/api/private_urls.py+++ b/backend/app/api/private_urls.py@@ -244,8 +244,9 @@ def regenerate_private_url(app_id):# =============================================================================@private_urls_bp.route('/p/<slug>', methods=['GET'])+@jwt_required()def resolve_private_url(slug):- """Resolve a private URL slug to app info (public endpoint).+ """Resolve a private URL slug to app info.This endpoint is for API consumers that need to look up which appa private URL points to. The actual proxying is handled by Nginx.diff --git a/backend/app/api/system.py b/backend/app/api/system.pyindex 3557fb7f..668949b8 100644--- a/backend/app/api/system.py+++ b/backend/app/api/system.py@@ -19,8 +19,9 @@ system_bp = Blueprint('system', __name__)@system_bp.route('/version', methods=['GET'])+@jwt_required()def get_version():- """Get ServerKit version - no auth required."""+ """Get ServerKit version."""version = '1.0.0' # Default version# Try to read from VERSION file@@ -46,8 +47,9 @@ def get_version():@system_bp.route('/check-update', methods=['GET'])+@jwt_required()def check_update():- """Check for updates from GitHub releases - no auth required."""+ """Check for updates from GitHub releases."""global _update_cache# Return cached result if still validdiff --git a/backend/app/sockets.py b/backend/app/sockets.pyindex f7062e63..ae703ca2 100644--- a/backend/app/sockets.py+++ b/backend/app/sockets.py@@ -39,10 +39,13 @@ def init_socketio(app):@socketio.on('connect')-def handle_connect():+def handle_connect(auth):"""Handle client connection."""- # Verify JWT token from query string- token = request.args.get('token')+ # Verify JWT token from auth payload (not query string, to avoid token leakage in logs)+ token = None+ if auth and isinstance(auth, dict):+ token = auth.get('token')+if token:try:decode_token(token)diff --git a/frontend/src/pages/WordPressProject.jsx b/frontend/src/pages/WordPressProject.jsxindex c6ac50fd..197bad21 100644--- a/frontend/src/pages/WordPressProject.jsx+++ b/frontend/src/pages/WordPressProject.jsx@@ -70,7 +70,7 @@ const WordPressProject = () => {if (!token) return;const socket = io(SOCKET_URL, {- query: { token },+ auth: { token },transports: ['websocket', 'polling']});diff --git a/frontend/src/services/socket.js b/frontend/src/services/socket.jsindex b009679c..1f21c318 100644--- a/frontend/src/services/socket.js+++ b/frontend/src/services/socket.js@@ -20,7 +20,7 @@ class SocketService {}this.socket = io(SOCKET_URL, {- query: { token },+ auth: { token },transports: ['websocket', 'polling'],reconnection: true,reconnectionAttempts: 5,