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(admin): move the owned-apps delete guard behind the service door
Juan Deniscc0597bf28f2
diff --git a/backend/app/api/admin.py b/backend/app/api/admin.pyindex 0de52ea6..129bfe1a 100644--- a/backend/app/api/admin.py+++ b/backend/app/api/admin.py@@ -216,12 +216,10 @@ def delete_user(user_id):if admin_count <= 1:return jsonify({'error': 'Cannot delete the last admin'}), 400- # Applications never ride a user delete: their user_id is NOT NULL, but the- # rows own containers and volumes that must go through app delete + Recycle- # Bin purge — never a silent cascade. Unfiltered on purpose: a tombstoned- # app still holds the FK, so it blocks too.- from app.models import Application- owned = Application.query.filter_by(user_id=user.id).count()+ # Applications never ride a user delete — see applications_owned_by for+ # why tombstoned rows block too.+ from app.services.application_restore import applications_owned_by+ owned = applications_owned_by(user.id)if owned:return jsonify({'error': f'User still owns {owned} application(s), ''including any in the Recycle Bin — delete or 'diff --git a/backend/app/services/application_restore.py b/backend/app/services/application_restore.pyindex 8166d146..3dde6310 100644--- a/backend/app/services/application_restore.py+++ b/backend/app/services/application_restore.py@@ -33,6 +33,17 @@ from app.services.cron_service import CronServicelogger = logging.getLogger(__name__)+def applications_owned_by(user_id):+ """Count of Application rows a user owns — live AND tombstoned.++ Applications never ride a user delete: their user_id is NOT NULL, but the+ rows own containers and volumes that must go through app delete + Recycle+ Bin purge — never a silent cascade. Unfiltered on purpose: a tombstoned+ app still holds the FK, so it blocks too.+ """+ return Application.query.filter_by(user_id=user_id).count()++def _live_name_clash(app):"""Another LIVE app already using this one's name, if any."""return (Application.query_active()