Skip to content

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.

fix(restore-points): satisfy jwt-only and seed-factory ratchets

Juan Denise29872f0cd31
diff --git a/backend/app/api/restore_points.py b/backend/app/api/restore_points.py
index 7f8b01ef..0083d84f 100644
--- a/backend/app/api/restore_points.py
+++ b/backend/app/api/restore_points.py
@@ -6,10 +6,9 @@ surfaces are operational and require a developer role even when their local
"""
from flask import Blueprint, jsonify, request
-from flask_jwt_extended import jwt_required
from app.exceptions import PermissionDeniedError, ValidationError
-from app.middleware.rbac import developer_required, get_current_user
+from app.middleware.rbac import auth_required, developer_required, get_current_user
from app.services import restore_point_service
from app.services.resource_grant_service import ResourceGrantService
@@ -104,7 +103,7 @@ def _serialize(point, *, include_payload):
@restore_points_bp.route('', methods=['GET'])
-@jwt_required()
+@auth_required()
def list_restore_points():
"""List a scope's linear restore-point timeline, newest first."""
unknown = set(request.args) - _LIST_QUERY_KEYS
@@ -191,7 +190,7 @@ def create_restore_point():
@restore_points_bp.route('/<point_id>', methods=['GET'])
-@jwt_required()
+@auth_required()
def get_restore_point(point_id):
"""Fetch a restore point including its already-secret-safe payload."""
point = _point_for_caller(point_id)
@@ -201,7 +200,7 @@ def get_restore_point(point_id):
@restore_points_bp.route('/<point_id>/diff', methods=['GET'])
-@jwt_required()
+@auth_required()
def diff_restore_point(point_id):
"""Diff against the previous point or an explicit same-scope point."""
unknown = set(request.args) - {'against'}
diff --git a/backend/tests/test_restore_point_env.py b/backend/tests/test_restore_point_env.py
index 4bc05d94..6a03ded1 100644
--- a/backend/tests/test_restore_point_env.py
+++ b/backend/tests/test_restore_point_env.py
@@ -24,23 +24,20 @@ def registered_env_adapter():
def _make_app():
from app import db
- from app.models import Application, User
+ from factories import make_application, make_user
- user = User(
+ user = make_user(
+ db,
username='restore-env-owner',
role='admin',
)
- db.session.add(user)
- db.session.flush()
- application = Application(
+ application = make_application(
+ db,
name='restore-env-app',
- app_type='docker',
user_id=user.id,
status='running',
)
- db.session.add(application)
- db.session.commit()
return application, user
diff --git a/docs/MIGRATION_INVENTORY.md b/docs/MIGRATION_INVENTORY.md
index bc187925..251ee202 100644
--- a/docs/MIGRATION_INVENTORY.md
+++ b/docs/MIGRATION_INVENTORY.md
@@ -18,7 +18,7 @@ debt. Regenerate with `python scripts/generate-migration-inventory.py`.
| API crashes swallowed without recording | app.error_reporting | 0 | 0 | INVARIANT at 0 |
| Hand-shaped {'error': ...} bodies in app/api | typed errors + the global handler | 1150 | 1150 | migrate when touched; new endpoints raise |
| Raw subprocess calls outside the runners | app/utils/system.py runners | 24 | 24 | migrate when touched |
-| Controller-boundary violations (routes doing service work) | service layer extraction | 515 | 515 | migrate when touched (first-wave ratchet) |
+| Controller-boundary violations (routes doing service work) | service layer extraction | 514 | 514 | migrate when touched (first-wave ratchet) |
| raw api.* calls in pages/ | E1: useServerQuery/useServerMutation | 460 | 460 | migrate when touched |
| per-page toast.error extractions in pages/ | E1: query-layer error presentation | 264 | 264 | migrate when touched |
| hand-rolled form-group blocks | F2: FormField/useForm | 343 | 343 | migrate when touched |