mirror of
https://github.com/jhd3197/ServerKit.git
synced 2026-11-03 02:26:43 +09:00
Plan 76 milestone A, drift/bug row 2 — scheduled as a fix, not a refactor,
because it is a behaviour difference shipping today.
rbac.get_current_user() is the only lookup that knows about both auth
mechanisms: it returns g.api_key_user for an X-API-Key request and falls back
to the JWT. 73 call sites answered "who is calling" with
`User.query.get(get_jwt_identity())` instead, behind 19 near-identical private
helpers (12 named get_current_user(), shadowing the real door).
The audit that scheduled this row predicted those return None for API-key
callers. Measured, it is worse: auth_required() deliberately skips
verify_jwt_in_request() once the key middleware has authenticated, so there is
no JWT context and get_jwt_identity() *raises*. Nine handlers reached through
an API-key-capable policy decorator therefore returned 500 to every API-key
caller:
bandwidth.get_app_bandwidth @viewer_required
servers.set_server_workspace @developer_required
servers.create_server @developer_required
sso.get_sso_config / update_provider_config / update_general_settings
source_connections.update_{github,gitlab,bitbucket}_admin_config
source_connections.complete_github_app_manifest
databases.execute_{mysql,pg,sqlite,docker}_query (see below)
Three service helpers had the same lookup inside a blanket `except Exception`,
which converted the raise into a silent user_id=None — the write landed and
the audit trail lost the actor (shared_resource_service, cf_ops_change_service,
secrets_webhooks).
The four databases.execute_*_query sites were a second admin check *inside* an
already-@admin_required route: dead code that always passed for JWT callers and
crashed for API-key ones. They now call require_admin_user() rather than
re-deriving the answer.
Also folds in a sixth _require_admin() found in the cloudflare-ops extension
source (29 gates, the same inverted contract as jobs.py), and fixes
serverkit-gui's blueprint at its sibling-repo source rather than in this repo's
live copy.
Ratchet (second-wave rule 1 — a migration without one regrows):
tests/identity_door_census.py counts both bypass shapes by AST, direct and the
two-line `uid = get_jwt_identity(); User.query.get(uid)` variant. The ceiling is
87, all of them on @jwt_required()-only routes where reading the JWT is correct
today; the ratchet's third assertion holds the API-key-capable population at
exactly zero, so migrating one of those routes to a policy decorator without
fixing its lookup now fails. Verified non-vacuous: an injected bypass fails both
assertions and passes again on revert.
The first wave's controller-boundary baseline is regenerated — this removes 74
persistence crossings (593 -> 519), a debt reduction with no new entries.
Gate: tests/test_api_key_identity.py (7, each red before the fix),
test_identity_door_ratchet.py (10), test_api_controller_boundaries.py (4), plus
the 65 test files covering every touched module: 1024 passed, 10 skipped.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
123 lines
4.7 KiB
Python
123 lines
4.7 KiB
Python
"""Environment endpoints (under a Project).
|
|
|
|
Environments are children of a project; access is derived from the parent
|
|
project's workspace, mirroring projects.py.
|
|
"""
|
|
from flask import Blueprint, request, jsonify
|
|
from flask_jwt_extended import jwt_required
|
|
|
|
from app.services.project_service import ProjectService
|
|
from app.services.workspace_service import WorkspaceService
|
|
from app.middleware.rbac import get_current_user
|
|
|
|
environments_bp = Blueprint('environments', __name__)
|
|
|
|
|
|
def _accessible_workspace_ids(user):
|
|
ws_id = WorkspaceService.resolve_workspace_id(
|
|
user, request.headers.get('X-Workspace-Id') or request.args.get('workspace_id'))
|
|
if ws_id is not None:
|
|
return [ws_id]
|
|
if user.is_admin:
|
|
from app.models.workspace import Workspace
|
|
return [w.id for w in Workspace.query.all()]
|
|
return [w.id for w in WorkspaceService.list_workspaces(user_id=user.id)]
|
|
|
|
|
|
def _project_for_write(user, project_id):
|
|
"""Return (project, error_response). error_response is a (json, status) tuple
|
|
when the project can't be written by this user, else None."""
|
|
project = ProjectService.get_project(project_id)
|
|
if not project:
|
|
return None, (jsonify({'error': 'Project not found'}), 404)
|
|
if not user.is_admin and project.workspace_id not in set(_accessible_workspace_ids(user)):
|
|
return None, (jsonify({'error': 'Access denied'}), 403)
|
|
if not WorkspaceService.can_write_in_workspace(user, project.workspace_id):
|
|
return None, (jsonify({'error': 'You have read-only access to this workspace'}), 403)
|
|
return project, None
|
|
|
|
|
|
@environments_bp.route('', methods=['POST'])
|
|
@environments_bp.route('/', methods=['POST'])
|
|
@jwt_required()
|
|
def create_environment():
|
|
"""Create an environment under a project. Body: {project_id, name, is_default?}."""
|
|
user = get_current_user()
|
|
data = request.get_json() or {}
|
|
project_id = data.get('project_id')
|
|
if not project_id:
|
|
return jsonify({'error': 'project_id is required'}), 400
|
|
name = (data.get('name') or '').strip()
|
|
if not name:
|
|
return jsonify({'error': 'Environment name is required'}), 400
|
|
|
|
project, err = _project_for_write(user, project_id)
|
|
if err:
|
|
return err
|
|
|
|
try:
|
|
env = ProjectService.create_environment(
|
|
project_id, name=name, is_default=bool(data.get('is_default')))
|
|
except ValueError as exc:
|
|
return jsonify({'error': str(exc)}), 400
|
|
from app import db
|
|
db.session.commit()
|
|
return jsonify({'message': 'Environment created', 'environment': env.to_dict(include_counts=True)}), 201
|
|
|
|
|
|
@environments_bp.route('/<int:environment_id>', methods=['PUT'])
|
|
@jwt_required()
|
|
def update_environment(environment_id):
|
|
user = get_current_user()
|
|
env = ProjectService.get_environment(environment_id)
|
|
if not env:
|
|
return jsonify({'error': 'Environment not found'}), 404
|
|
_, err = _project_for_write(user, env.project_id)
|
|
if err:
|
|
return err
|
|
|
|
data = request.get_json() or {}
|
|
updated = ProjectService.update_environment(
|
|
environment_id, name=data.get('name'), is_default=data.get('is_default'))
|
|
return jsonify({'message': 'Environment updated', 'environment': updated.to_dict(include_counts=True)}), 200
|
|
|
|
|
|
@environments_bp.route('/<int:environment_id>', methods=['DELETE'])
|
|
@jwt_required()
|
|
def delete_environment(environment_id):
|
|
"""Delete an environment. Refuses (409) if it's the project's only one;
|
|
detaches assigned apps (environment_id -> NULL) otherwise."""
|
|
user = get_current_user()
|
|
env = ProjectService.get_environment(environment_id)
|
|
if not env:
|
|
return jsonify({'error': 'Environment not found'}), 404
|
|
_, err = _project_for_write(user, env.project_id)
|
|
if err:
|
|
return err
|
|
|
|
result = ProjectService.delete_environment(environment_id)
|
|
if result == 'last':
|
|
return jsonify({'error': 'Cannot delete the only environment of a project.'}), 409
|
|
return jsonify({'message': 'Environment deleted'}), 200
|
|
|
|
|
|
@environments_bp.route('/reorder', methods=['POST'])
|
|
@jwt_required()
|
|
def reorder_environments():
|
|
"""Reorder a project's environments. Body: {project_id, ordered_ids:[...]}"""
|
|
user = get_current_user()
|
|
data = request.get_json() or {}
|
|
project_id = data.get('project_id')
|
|
ordered_ids = data.get('ordered_ids')
|
|
if not project_id:
|
|
return jsonify({'error': 'project_id is required'}), 400
|
|
if not isinstance(ordered_ids, list):
|
|
return jsonify({'error': 'ordered_ids must be a list'}), 400
|
|
|
|
_, err = _project_for_write(user, project_id)
|
|
if err:
|
|
return err
|
|
|
|
envs = ProjectService.reorder_environments(project_id, ordered_ids)
|
|
return jsonify({'environments': [e.to_dict(include_counts=True) for e in envs]}), 200
|