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(unify): §8 Phase B5 — generic backup-policy CRUD for every target
Juan Denis45e83e9a0949
diff --git a/backend/app/api/backups.py b/backend/app/api/backups.pyindex f081c4a3..5d3628ab 100644--- a/backend/app/api/backups.py+++ b/backend/app/api/backups.py@@ -4,6 +4,7 @@ from flask_jwt_extended import jwt_requiredfrom app.middleware.rbac import admin_requiredfrom app.models import Applicationfrom app.services.backup_service import BackupService+from app.services.backup_policy_service import BackupPolicyService, BackupPolicyErrorfrom app.services.storage_provider_service import StorageProviderServicefrom app import db, paths@@ -92,6 +93,111 @@ def list_runs():return jsonify({'runs': runs}), 200+# --------------------------------------------------------------------------- #+# Generic policy-driven backup CRUD by (target_type, target_id) (§8).+# One surface for every BackupPolicy target — apps, WordPress sites, databases,+# file path-lists, servers. The per-resource mounts+# (/apps/:id/backup-policy, /wordpress/sites/:id/backup-policy) remain as+# grant-aware aliases; this mount is admin-only and is the only way to drive the+# database/files/server targets that have no per-resource page.+# --------------------------------------------------------------------------- #++@backups_bp.route('/policies/<target_type>/<int:target_id>', methods=['GET'])+@jwt_required()+@admin_required+def get_target_policy(target_type, target_id):+ """Protection policy + status for any target (creates a default if absent)."""+ try:+ BackupPolicyService.validate_target_type(target_type)+ policy = BackupPolicyService.get_or_create_policy(target_type, target_id)+ except BackupPolicyError as e:+ return jsonify({'error': str(e)}), 400+ return jsonify(BackupPolicyService.serialize_policy_view(policy)), 200+++@backups_bp.route('/policies/<target_type>/<int:target_id>', methods=['PUT'])+@jwt_required()+@admin_required+def update_target_policy(target_type, target_id):+ """Update a policy. Body may include target_subtype/target_meta (needed to+ describe database/files targets) plus the usual schedule/retention fields."""+ data = request.get_json() or {}+ subtype = data.pop('target_subtype', None)+ meta = data.pop('target_meta', None)+ try:+ BackupPolicyService.validate_target_type(target_type)+ policy = BackupPolicyService.get_or_create_policy(target_type, target_id, subtype, meta)+ BackupPolicyService.update_policy(policy, data)+ except BackupPolicyError as e:+ return jsonify({'error': str(e)}), 400+ return jsonify(BackupPolicyService.serialize_policy_view(policy)), 200+++@backups_bp.route('/policies/<target_type>/<int:target_id>/run', methods=['POST'])+@jwt_required()+@admin_required+def run_target_policy(target_type, target_id):+ """Enqueue a one-off backup for any target."""+ try:+ BackupPolicyService.validate_target_type(target_type)+ policy = BackupPolicyService.get_or_create_policy(target_type, target_id)+ job = BackupPolicyService.run_policy_now(policy, manual=True)+ except BackupPolicyError as e:+ return jsonify({'error': str(e)}), 409+ return jsonify({'success': True, 'job_id': job.id}), 202+++@backups_bp.route('/policies/<target_type>/<int:target_id>/runs', methods=['GET'])+@jwt_required()+@admin_required+def list_target_runs(target_type, target_id):+ try:+ BackupPolicyService.validate_target_type(target_type)+ policy = BackupPolicyService.get_or_create_policy(target_type, target_id)+ except BackupPolicyError as e:+ return jsonify({'error': str(e)}), 400+ return jsonify({'runs': BackupPolicyService.list_runs(policy)}), 200+++@backups_bp.route('/policies/<target_type>/<int:target_id>/runs/<int:run_id>/restore', methods=['POST'])+@jwt_required()+@admin_required+def restore_target_run(target_type, target_id, run_id):+ try:+ BackupPolicyService.validate_target_type(target_type)+ policy = BackupPolicyService.get_or_create_policy(target_type, target_id)+ job = BackupPolicyService.request_restore(policy, run_id, request.get_json() or {})+ except BackupPolicyError as e:+ return jsonify({'error': str(e)}), 400+ return jsonify({'success': True, 'job_id': job.id}), 202+++@backups_bp.route('/policies/<target_type>/<int:target_id>/runs/<int:run_id>/verify', methods=['POST'])+@jwt_required()+@admin_required+def verify_target_run(target_type, target_id, run_id):+ try:+ BackupPolicyService.validate_target_type(target_type)+ policy = BackupPolicyService.get_or_create_policy(target_type, target_id)+ result = BackupPolicyService.verify_run(policy, run_id)+ except BackupPolicyError as e:+ return jsonify({'error': str(e)}), 400+ return jsonify(result), 200+++@backups_bp.route('/policies/<target_type>/<int:target_id>/runs/<int:run_id>', methods=['DELETE'])+@jwt_required()+@admin_required+def delete_target_run(target_type, target_id, run_id):+ try:+ BackupPolicyService.validate_target_type(target_type)+ policy = BackupPolicyService.get_or_create_policy(target_type, target_id)+ BackupPolicyService.delete_run(policy, run_id)+ except BackupPolicyError as e:+ return jsonify({'error': str(e)}), 400+ return jsonify({'success': True}), 200++@backups_bp.route('/config', methods=['GET'])@jwt_required()@admin_requireddiff --git a/backend/tests/test_backup_generic_api.py b/backend/tests/test_backup_generic_api.pynew file mode 100644index 00000000..6b2850a8--- /dev/null+++ b/backend/tests/test_backup_generic_api.py@@ -0,0 +1,51 @@+"""§8 Phase B5 — generic backup-policy CRUD by (target_type, target_id).++One admin surface drives policies for every target type, including the+database/files/server targets that have no per-resource page. The existing+/apps/:id/backup-policy and /wordpress/sites/:id/backup-policy mounts are+unchanged.+"""+++def test_put_then_get_database_policy(app, client, auth_headers):+ body = {+ 'enabled': True,+ 'schedule_cron': '0 3 * * *',+ 'target_subtype': 'mysql',+ 'target_meta': {'db_name': 'shop', 'host': 'localhost'},+ }+ put = client.put('/api/v1/backups/policies/database/5', json=body, headers=auth_headers)+ assert put.status_code == 200, put.get_json()+ view = put.get_json()+ assert view['policy']['target_type'] == 'database'+ assert view['policy']['target_subtype'] == 'mysql'+ assert view['policy']['target_meta']['db_name'] == 'shop'+ assert view['policy']['enabled'] is True++ get = client.get('/api/v1/backups/policies/database/5', headers=auth_headers)+ assert get.status_code == 200+ assert get.get_json()['policy']['schedule_cron'] == '0 3 * * *'+++def test_get_creates_default_files_policy(app, client, auth_headers):+ get = client.get('/api/v1/backups/policies/files/9', headers=auth_headers)+ assert get.status_code == 200+ assert get.get_json()['policy']['target_type'] == 'files'+ assert get.get_json()['policy']['enabled'] is False+++def test_invalid_target_type_rejected(app, client, auth_headers):+ res = client.get('/api/v1/backups/policies/bogus/1', headers=auth_headers)+ assert res.status_code == 400+++def test_list_runs_empty_for_new_policy(app, client, auth_headers):+ res = client.get('/api/v1/backups/policies/files/77/runs', headers=auth_headers)+ assert res.status_code == 200+ assert res.get_json()['runs'] == []+++def test_generic_surface_requires_admin(app, client):+ # No auth → rejected (matches the rest of /backups).+ res = client.get('/api/v1/backups/policies/database/1')+ assert res.status_code in (401, 422)