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(auth): one mid-route admin gate instead of three contracts
Juan Denis6cd2ee6b95fb
diff --git a/backend/app/api/dns_cutover.py b/backend/app/api/dns_cutover.pyindex 3d8186a5..48e9fdae 100644--- a/backend/app/api/dns_cutover.py+++ b/backend/app/api/dns_cutover.py@@ -9,9 +9,10 @@ authenticated user; the mutating verbs (snapshot, cutover, revert) areadmin-only (plan 31 #1/#2/#3)."""from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required, get_jwt_identity+from flask_jwt_extended import jwt_requiredfrom app.services.dns_cutover_service import DnsCutoverService, DnsCutoverError+from app.middleware.rbac import require_admin_userdns_cutover_bp = Blueprint('dns_cutover', __name__)@@ -25,18 +26,6 @@ def _cutover_error(exc):return jsonify(body), exc.status_code-def _current_user():- from app.models.user import User- return User.query.get(get_jwt_identity())---def _require_admin():- user = _current_user()- if not user or not user.is_admin:- return jsonify({'error': 'Admin access required'}), 403- return None--@dns_cutover_bp.route('/ttl-guidance', methods=['POST'])@jwt_required()def ttl_guidance():@@ -47,9 +36,7 @@ def ttl_guidance():@dns_cutover_bp.route('/snapshot', methods=['POST'])@jwt_required()def create_snapshot():- guard = _require_admin()- if guard:- return guard+ require_admin_user()data = request.get_json(silent=True) or {}try:snapshot = DnsCutoverService.create_snapshot(@@ -82,9 +69,7 @@ def get_snapshot(snapshot_id):@dns_cutover_bp.route('/cutover', methods=['POST'])@jwt_required()def cutover():- guard = _require_admin()- if guard:- return guard+ require_admin_user()data = request.get_json(silent=True) or {}snapshot_id = data.get('snapshot_id')if not snapshot_id:@@ -121,9 +106,7 @@ def verify():@dns_cutover_bp.route('/snapshots/<int:snapshot_id>/revert', methods=['POST'])@jwt_required()def revert(snapshot_id):- guard = _require_admin()- if guard:- return guard+ require_admin_user()snapshot = DnsCutoverService.get_snapshot(snapshot_id)if not snapshot:return jsonify({'error': 'Snapshot not found'}), 404diff --git a/backend/app/api/jobs.py b/backend/app/api/jobs.pyindex f6e603cf..feb8b175 100644--- a/backend/app/api/jobs.py+++ b/backend/app/api/jobs.py@@ -1,29 +1,21 @@"""Read/ops API for the unified job system — the single pane to observe allbackground work. Admin-gated, mirroring app/api/queue_bus.py conventions."""from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required, get_jwt_identity+from flask_jwt_extended import jwt_requiredfrom app.jobs import registryfrom app.jobs.service import JobService, ScheduledJobService+from app.middleware.rbac import require_admin_userjobs_bp = Blueprint('jobs', __name__)-def _require_admin():- from app.models.user import User- user = User.query.get(get_jwt_identity())- if not user or not user.is_admin:- return None- return user--# --- Static routes first; Werkzeug ranks these above the dynamic /<job_id>. ---@jobs_bp.route('', methods=['GET'])@jobs_bp.route('/', methods=['GET'])@jwt_required()def list_jobs():- if not _require_admin():- return jsonify({'error': 'Admin access required'}), 403+ require_admin_user()try:limit = min(int(request.args.get('limit', 50)), 200)offset = max(int(request.args.get('offset', 0)), 0)@@ -49,32 +41,28 @@ def list_jobs():@jobs_bp.route('/stats', methods=['GET'])@jwt_required()def job_stats():- if not _require_admin():- return jsonify({'error': 'Admin access required'}), 403+ require_admin_user()return jsonify(JobService.stats())@jobs_bp.route('/kinds', methods=['GET'])@jwt_required()def job_kinds():- if not _require_admin():- return jsonify({'error': 'Admin access required'}), 403+ require_admin_user()return jsonify({'kinds': registry.registered_kinds()})@jobs_bp.route('/scheduled', methods=['GET'])@jwt_required()def list_scheduled():- if not _require_admin():- return jsonify({'error': 'Admin access required'}), 403+ require_admin_user()return jsonify({'scheduled': [s.to_dict() for s in ScheduledJobService.list()]})@jobs_bp.route('/scheduled/<int:scheduled_id>/run', methods=['POST'])@jwt_required()def run_scheduled(scheduled_id):- if not _require_admin():- return jsonify({'error': 'Admin access required'}), 403+ require_admin_user()job = ScheduledJobService.run_now(scheduled_id)if not job:return jsonify({'error': 'Scheduled job not found'}), 404@@ -84,8 +72,7 @@ def run_scheduled(scheduled_id):@jobs_bp.route('/scheduled/<int:scheduled_id>/enabled', methods=['POST'])@jwt_required()def toggle_scheduled(scheduled_id):- if not _require_admin():- return jsonify({'error': 'Admin access required'}), 403+ require_admin_user()body = request.get_json(silent=True) or {}scheduled = ScheduledJobService.set_enabled(scheduled_id, bool(body.get('enabled', True)))if not scheduled:@@ -96,8 +83,7 @@ def toggle_scheduled(scheduled_id):@jobs_bp.route('/<job_id>', methods=['GET'])@jwt_required()def get_job(job_id):- if not _require_admin():- return jsonify({'error': 'Admin access required'}), 403+ require_admin_user()job = JobService.get(job_id)if not job:return jsonify({'error': 'Job not found'}), 404@@ -107,8 +93,7 @@ def get_job(job_id):@jobs_bp.route('/<job_id>/cancel', methods=['POST'])@jwt_required()def cancel_job(job_id):- if not _require_admin():- return jsonify({'error': 'Admin access required'}), 403+ require_admin_user()job = JobService.cancel(job_id)if not job:return jsonify({'error': 'Job not found'}), 404@@ -118,8 +103,7 @@ def cancel_job(job_id):@jobs_bp.route('/<job_id>/retry', methods=['POST'])@jwt_required()def retry_job(job_id):- if not _require_admin():- return jsonify({'error': 'Admin access required'}), 403+ require_admin_user()job = JobService.retry(job_id)if not job:return jsonify({'error': 'Job not found'}), 404diff --git a/backend/app/api/manifests.py b/backend/app/api/manifests.pyindex f6336b63..8f16f47d 100644--- a/backend/app/api/manifests.py+++ b/backend/app/api/manifests.py@@ -6,17 +6,17 @@ audit-logged."""from flask import Blueprint, jsonify, request, Response-from flask_jwt_extended import jwt_required, get_jwt_identity+from flask_jwt_extended import jwt_requiredfrom app import dbfrom app.models.application import Applicationfrom app.models.application_manifest import ApplicationManifest, STATUS_PENDINGfrom app.models.project import Project-from app.models.user import Userfrom app.services.manifest_scaffold_service import ManifestScaffoldServicefrom app.services.manifest_spec_service import ManifestSpecService, ManifestErrorfrom app.services.manifest_apply_service import ManifestApplyServicefrom app.services.manifest_persistence_service import ManifestPersistenceService+from app.middleware.rbac import require_admin_usermanifests_bp = Blueprint('manifests', __name__)@@ -42,20 +42,11 @@ def _load_normalized(data):return None, None, (jsonify({'error': 'Provide `content`/`manifest`, or store one first'}), 400)-def _require_admin():- user = User.query.get(get_jwt_identity())- if not user or user.role != 'admin':- return None, (jsonify({'error': 'Admin access required'}), 403)- return user, None--@manifests_bp.route('/scaffold', methods=['GET'])@jwt_required()def scaffold_manifest():"""GET /api/v1/manifests/scaffold?app_id=&format=json|yaml"""- user, err = _require_admin()- if err:- return err+ user = require_admin_user()app_id = request.args.get('app_id', type=int)if not app_id:@@ -79,9 +70,7 @@ def scaffold_manifest():@jwt_required()def validate_manifest():"""POST /api/v1/manifests/validate { content | manifest } -> normalized summary."""- user, err = _require_admin()- if err:- return err+ user = require_admin_user()data = request.get_json(silent=True) or {}try:@@ -105,9 +94,7 @@ def validate_manifest():@jwt_required()def get_manifest():"""GET /api/v1/manifests?project_id= -> the stored manifest for a project."""- user, err = _require_admin()- if err:- return err+ user = require_admin_user()project_id = request.args.get('project_id', type=int)if not project_id:return jsonify({'error': 'project_id is required'}), 400@@ -121,9 +108,7 @@ def get_manifest():@jwt_required()def plan_manifest():"""POST /api/v1/manifests/plan {project_id, content|manifest?} -> dry-run plan."""- user, err = _require_admin()- if err:- return err+ user = require_admin_user()data = request.get_json(silent=True) or {}project = Project.query.get(data.get('project_id')) if data.get('project_id') else Noneif not project:@@ -141,9 +126,7 @@ def plan_manifest():@jwt_required()def apply_manifest():"""POST /api/v1/manifests/apply {project_id, content|manifest?} -> apply."""- user, err = _require_admin()- if err:- return err+ user = require_admin_user()data = request.get_json(silent=True) or {}project = Project.query.get(data.get('project_id')) if data.get('project_id') else Noneif not project:@@ -187,9 +170,7 @@ def reset_bootstrap():Destructive-ish (the bootstrap may regenerate config), so it requirestyping the app name in `confirm`."""- user, err = _require_admin()- if err:- return err+ user = require_admin_user()data = request.get_json(silent=True) or {}app = (Application.query_active().filter_by(id=data.get('app_id')).first()if data.get('app_id') else None)diff --git a/backend/app/api/themes.py b/backend/app/api/themes.pyindex 5e4f6337..a8927e9e 100644--- a/backend/app/api/themes.py+++ b/backend/app/api/themes.py@@ -12,29 +12,18 @@ import jsonimport loggingfrom flask import Blueprint, jsonify, request-from flask_jwt_extended import jwt_required, get_jwt_identity+from flask_jwt_extended import jwt_required-from app.models.user import Userfrom app.services import theme_servicefrom app.services.audit_service import AuditServicefrom app.models.audit_log import AuditLog+from app.middleware.rbac import require_admin_userlogger = logging.getLogger(__name__)themes_bp = Blueprint('themes', __name__)-def _current_user():- return User.query.get(get_jwt_identity())---def _require_admin():- user = _current_user()- if not user or not user.is_admin:- return None, (jsonify({'error': 'Admin access required'}), 403)- return user, None--@themes_bp.route('/installed', methods=['GET'])@jwt_required()def list_installed():@@ -64,9 +53,7 @@ def import_theme():``{"theme": {...}}``, or a multipart upload under ``file``. The tokenwhitelist + value validators run server-side before anything is stored."""- user, err = _require_admin()- if err:- return err+ user = require_admin_user()raw = Noneupload = request.files.get('file')@@ -103,9 +90,7 @@ def import_theme():@jwt_required()def delete_theme(slug):"""Uninstall an installed theme (admin). Bundled seeds cannot be removed."""- user, err = _require_admin()- if err:- return err+ user = require_admin_user()ok, derr = theme_service.delete_theme(slug)if not ok:code = 404 if derr == 'Theme not found' else 400@@ -131,9 +116,7 @@ def get_default():def set_default():"""Set the panel-wide default theme (admin) — what login/setup and newusers get before picking their own."""- user, err = _require_admin()- if err:- return err+ user = require_admin_user()body = request.get_json(silent=True) or {}slug = body.get('slug')if not isinstance(slug, str) or not slug:@@ -168,9 +151,7 @@ def list_registry():def install_registry(slug):"""Install a theme from the registry by slug (admin). Fetches the theme.json,validates it server-side, and stores it — no zips, no checksums."""- user, err = _require_admin()- if err:- return err+ user = require_admin_user()from app.services import theme_registry_servicetheme, ierr = theme_registry_service.install(slug)if ierr:diff --git a/backend/app/api/waf.py b/backend/app/api/waf.pyindex 4fc505c9..e2dc9cd6 100644--- a/backend/app/api/waf.py+++ b/backend/app/api/waf.py@@ -12,24 +12,11 @@ from flask_jwt_extended import jwt_requiredfrom app.models.application import Applicationfrom app.services.waf_service import WafServicefrom app.services.resource_grant_service import ResourceGrantService+from app.middleware.rbac import get_current_user, require_admin_userwaf_bp = Blueprint('waf', __name__)-def get_current_user():- from flask_jwt_extended import get_jwt_identity- from app.models.user import User- return User.query.get(get_jwt_identity())---def _require_admin():- """Return None if the caller is an admin, else a (response, status) tuple."""- user = get_current_user()- if not user or not user.is_admin:- return jsonify({'error': 'Admin access required'}), 403- return None--def _get_application_or_404(app_id):"""Resolve the app and enforce read access (plan 29 #9): owner / admin / grant /workspace member. A caller who can't access it gets the same 404 as a missing@@ -55,9 +42,7 @@ def get_policy(app_id):@waf_bp.route('/applications/<int:app_id>/policy', methods=['PUT'])@jwt_required()def update_policy(app_id):- admin_err = _require_admin()- if admin_err:- return admin_err+ require_admin_user()_, err = _get_application_or_404(app_id)if err:return err@@ -89,9 +74,7 @@ def update_policy(app_id):@waf_bp.route('/applications/<int:app_id>/apply', methods=['POST'])@jwt_required()def apply_policy(app_id):- admin_err = _require_admin()- if admin_err:- return admin_err+ require_admin_user()_, err = _get_application_or_404(app_id)if err:return err@@ -124,9 +107,7 @@ def status():@waf_bp.route('/install', methods=['POST'])@jwt_required()def install():- admin_err = _require_admin()- if admin_err:- return admin_err+ require_admin_user()result = WafService.install_modsecurity()status_code = 200 if result.get('success') else 400return jsonify(result), status_codediff --git a/backend/app/middleware/rbac.py b/backend/app/middleware/rbac.pyindex 8bd24e41..098d359e 100644--- a/backend/app/middleware/rbac.py+++ b/backend/app/middleware/rbac.py@@ -89,6 +89,33 @@ def admin_required(fn):return wrapper+def require_admin_user():+ """Return the calling admin user, or raise a typed error.++ The mid-route counterpart to ``@admin_required``, for handlers that need+ the user object or that gate only part of their work. It raises instead of+ returning a sentinel because the five private ``_require_admin()`` helpers+ this replaces had grown *three mutually incompatible* return contracts —+ ``None``-means-ok, ``None``-means-denied, and ``(user, err)`` — so reading+ a call site told you nothing about which one you were looking at, and+ copying a guard between files inverted it silently.++ Both the unknown-user and the not-an-admin case raise 403 'Admin access+ required': a caller who is not an admin should not learn from the status+ code whether the account behind the token still exists.+ """+ from app.exceptions import PermissionDeniedError++ user = get_current_user()+ if not user:+ raise PermissionDeniedError('Admin access required')+ if not user.is_active:+ raise PermissionDeniedError('Account is deactivated')+ if not user.is_admin:+ raise PermissionDeniedError('Admin access required')+ return user++def developer_required(fn):"""Decorator that requires developer role or higher (admin or developer).