feat(nodes): TLS-сертификаты ноды и массовая миграция инстансов
- Сертификаты: методы клиента + endpoints GET/POST/DELETE
/nodes/{node}/certificates, хуки и вкладка «Сертификаты» в
NodeAdminManager (просмотр, загрузка PEM cert+key, удаление кастомного,
бейдж срока действия)
- Bulk migrate: тип bulk_migrate в очереди задач с WS-прогрессом,
target_node/online в BulkOperationItem, диалог выбора целевой ноды и
кнопка в тулбаре инстансов (в пределах одного сервера/кластера)
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -346,6 +346,69 @@ async def set_apt_repository(
|
||||
raise HTTPException(status_code=500, detail=str(e))
|
||||
|
||||
|
||||
# ==================== TLS certificates ====================
|
||||
|
||||
@router.get("/api/servers/{server_id}/nodes/{node}/certificates")
|
||||
async def node_certificates(
|
||||
server_id: int,
|
||||
node: str,
|
||||
db: Session = Depends(get_db),
|
||||
current_user: User = Depends(PermissionChecker("node:view")),
|
||||
):
|
||||
client = _resolve_client(db, server_id)
|
||||
try:
|
||||
return JSONResponse(content={"certificates": await _run_in_executor(
|
||||
lambda: client.get_node_certificates(node))})
|
||||
except Exception as e:
|
||||
logger.error(f"Error getting certificates on {node}: {e}")
|
||||
raise HTTPException(status_code=500, detail=str(e))
|
||||
|
||||
|
||||
@router.post("/api/servers/{server_id}/nodes/{node}/certificates")
|
||||
async def upload_node_certificate(
|
||||
server_id: int,
|
||||
node: str,
|
||||
request: Request,
|
||||
db: Session = Depends(get_db),
|
||||
current_user: User = Depends(PermissionChecker("node:manage")),
|
||||
):
|
||||
"""Загрузить пользовательский сертификат pveproxy (PEM cert + key)."""
|
||||
client = _resolve_client(db, server_id)
|
||||
data = await request.json()
|
||||
certificates = data.get("certificates")
|
||||
if not certificates:
|
||||
raise HTTPException(status_code=400, detail="certificates (PEM) is required")
|
||||
try:
|
||||
return _ok_or_400(await _run_in_executor(lambda: client.upload_node_certificate(
|
||||
node, certificates, data.get("key"),
|
||||
bool(data.get("force", True)), bool(data.get("restart", True)))))
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
logger.error(f"Error uploading certificate on {node}: {e}")
|
||||
raise HTTPException(status_code=500, detail=str(e))
|
||||
|
||||
|
||||
@router.delete("/api/servers/{server_id}/nodes/{node}/certificates")
|
||||
async def delete_node_certificate(
|
||||
server_id: int,
|
||||
node: str,
|
||||
restart: bool = True,
|
||||
db: Session = Depends(get_db),
|
||||
current_user: User = Depends(PermissionChecker("node:manage")),
|
||||
):
|
||||
"""Удалить пользовательский сертификат (вернуть самоподписанный)."""
|
||||
client = _resolve_client(db, server_id)
|
||||
try:
|
||||
return _ok_or_400(await _run_in_executor(
|
||||
lambda: client.delete_node_certificate(node, restart)))
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
logger.error(f"Error deleting certificate on {node}: {e}")
|
||||
raise HTTPException(status_code=500, detail=str(e))
|
||||
|
||||
|
||||
@router.put("/api/servers/{server_id}/nodes/{node}/apt/repositories")
|
||||
async def add_standard_repository(
|
||||
server_id: int,
|
||||
|
||||
@@ -83,10 +83,12 @@ class BulkOperationItem(BaseModel):
|
||||
vm_type: str # 'qemu' or 'lxc'
|
||||
name: str
|
||||
node: str
|
||||
target_node: Optional[str] = None # для action=migrate
|
||||
online: Optional[bool] = None # live-миграция запущенной VM
|
||||
|
||||
|
||||
class BulkOperationRequest(BaseModel):
|
||||
action: str # start, stop, restart, shutdown, delete
|
||||
action: str # start, stop, restart, shutdown, delete, migrate
|
||||
items: TypingList[BulkOperationItem]
|
||||
|
||||
|
||||
@@ -3598,19 +3600,26 @@ def create_bulk_operation(
|
||||
'restart': 'bulk_restart',
|
||||
'shutdown': 'bulk_shutdown',
|
||||
'delete': 'bulk_delete',
|
||||
'migrate': 'bulk_migrate',
|
||||
}
|
||||
|
||||
|
||||
task_type = action_to_task_type.get(request.action)
|
||||
if not task_type:
|
||||
raise HTTPException(status_code=400, detail=f"Invalid action: {request.action}")
|
||||
|
||||
|
||||
if not request.items:
|
||||
raise HTTPException(status_code=400, detail="No items selected")
|
||||
|
||||
|
||||
# For delete action, require higher permission
|
||||
if request.action == 'delete':
|
||||
if not check_permission(current_user, "vm:delete"):
|
||||
raise HTTPException(status_code=403, detail="Delete permission required")
|
||||
|
||||
# For migrate, каждый элемент обязан нести целевую ноду
|
||||
if request.action == 'migrate':
|
||||
missing = [i.vmid for i in request.items if not i.target_node]
|
||||
if missing:
|
||||
raise HTTPException(status_code=400, detail="target_node is required for migrate")
|
||||
|
||||
# Convert to list of dicts
|
||||
items = [item.model_dump() for item in request.items]
|
||||
|
||||
Reference in New Issue
Block a user