laniakea-api-server 0.2.8__tar.gz → 0.3.1__tar.gz

{laniakea_api_server-0.2.8 → laniakea_api_server-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: laniakea-api-server
-Version: 0.2.8
+Version: 0.3.1
 Summary: Laniakea Queue API — OIDC-authenticated gateway for cloud deployment orchestration
 Project-URL: Homepage, https://github.com/laniakea/laniakea-api
 Project-URL: Issues, https://github.com/laniakea/laniakea-api/issues

{laniakea_api_server-0.2.8 → laniakea_api_server-0.3.1}/laniakea_api/models.py

@@ -65,6 +65,7 @@ class DeploymentRequest(BaseModel):
     selected_provider: str    # OpenStack | AWS
     service_type:      Optional[str] = "galaxy"
     cloud_providers:   dict
+    credentials_name: Optional[str] = ""  # NOTE: remove here if no cred selection 
 
 
 class JobResponse(BaseModel):

{laniakea_api_server-0.2.8 → laniakea_api_server-0.3.1}/laniakea_api/queue.py

@@ -119,8 +119,20 @@ def _sc_path(user_sub: str, name: str = "") -> str:
     base = f"{user_sub}/service_creds"
     return f"{base}/{name}" if name else base
 
+def _infer_service_type(data: dict) -> str:
+    """
+    Derive the credential type from the field names themselves —
+    nothing but secrets is stored in Vault.
+    """
+    if any(k.startswith("aws_") for k in data):
+        return "aws"
+    if any(k.startswith("openstack_") for k in data):
+        return "openstack"
+    return "unknown"
+
+
 def vault_list_service_creds(user_sub: str) -> list:
-    client = vault_client()
+    client = vault_client
     try:
         resp = client.secrets.kv.v2.list_secrets(path=_sc_path(user_sub), mount_point=VAULT_MOUNT)
         names = [k.rstrip("/") for k in resp["data"]["keys"]]
@@ -129,11 +141,11 @@ def vault_list_service_creds(user_sub: str) -> list:
     out = []
     for n in names:
         data = vault_read_service_creds(user_sub, n)
-        out.append({"name": n, "service_type": data.get("service_type", "openstack")})
+        out.append({"name": n, "service_type": _infer_service_type(data)})
     return out
 
 def vault_read_service_creds(user_sub: str, name: str) -> dict:
-    client = vault_client()
+    client = vault_client
     try:
         resp = client.secrets.kv.v2.read_secret_version(path=_sc_path(user_sub, name), mount_point=VAULT_MOUNT)
         return resp["data"]["data"] or {}
@@ -141,11 +153,30 @@ def vault_read_service_creds(user_sub: str, name: str) -> dict:
         return {}
 
 def vault_write_service_creds(user_sub: str, name: str, data: dict) -> None:
-    client = vault_client()
+    client = vault_client
     client.secrets.kv.v2.create_or_update_secret(
         path=_sc_path(user_sub, name), secret=data, mount_point=VAULT_MOUNT)
 
 def vault_delete_service_creds(user_sub: str, name: str) -> None:
-    client = vault_client()
+    client = vault_client
     client.secrets.kv.v2.delete_metadata_and_all_versions(
         path=_sc_path(user_sub, name), mount_point=VAULT_MOUNT)
+
+
+def vault_read_global(user_sub: str) -> dict:
+    client = vault_client
+    try:
+        resp = client.secrets.kv.v2.read_secret_version(
+            path=f"{user_sub}/credentials", mount_point=VAULT_MOUNT)
+        return resp["data"]["data"] or {}
+    except Exception:
+        return {}
+
+def vault_strip_global_keys(user_sub: str, keys: list) -> None:
+    """Remove specific fields from the global path, keep the rest."""
+    data = vault_read_global(user_sub)
+    for k in keys:
+        data.pop(k, None)
+    client = vault_client
+    client.secrets.kv.v2.create_or_update_secret(
+        path=f"{user_sub}/credentials", secret=data, mount_point=VAULT_MOUNT)

{laniakea_api_server-0.2.8 → laniakea_api_server-0.3.1}/laniakea_api/routers/agent.py

@@ -78,6 +78,11 @@ async def agent_update_status(
     if not updated:
         raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="DB update failed.")
 
+    # Deployment lifecycle ends here: drop the record and its tf state.
+    if new_status == "DELETE_COMPLETE":
+        db.tfstate_delete(uuid)
+        db.delete_deployment(uuid)
+
     return {
         "deployment_uuid": uuid,
         "previous_status": current,

{laniakea_api_server-0.2.8 → laniakea_api_server-0.3.1}/laniakea_api/routers/credentials.py

@@ -13,6 +13,8 @@ from laniakea_api.models import (OIDCLoginRequest, SessionTokenResponse,UserCred
 from laniakea_api.queue import vault_write_credentials, VAULT_MOUNT
 from laniakea_api.queue import (vault_list_service_creds, vault_read_service_creds,
                                 vault_write_service_creds, vault_delete_service_creds)
+from laniakea_api.queue import vault_read_global, vault_strip_global_keys
+
 
 router = APIRouter()
 
@@ -108,9 +110,12 @@ async def read_service_creds(name: str, caller: dict = Depends(verify_session_to
 
 @router.put("/profile/service_creds/{name}")
 async def write_service_creds(name: str, body: dict, caller: dict = Depends(verify_session_token)):
-    if not name or "/" in name:
-        raise HTTPException(status_code=400, detail="Invalid credential name.")
-    body = {k: v for k, v in body.items() if v not in (None, "") and k != "name"}
+    import re
+    if not re.fullmatch(r"[A-Za-z0-9_-]+", name or ""):
+        raise HTTPException(status_code=400,
+            detail="Invalid name: only letters, digits, '_' and '-' (e.g. openstack_garr).")
+    body = {k: v for k, v in body.items()
+            if v not in (None, "") and k not in ("name", "service_type")}
     vault_write_service_creds(caller["sub"], name, body)   # KV2: ogni write = nuova versione
     return {"name": name, "saved": True}
 
@@ -118,3 +123,30 @@ async def write_service_creds(name: str, body: dict, caller: dict = Depends(veri
 async def delete_service_creds(name: str, caller: dict = Depends(verify_session_token)):
     vault_delete_service_creds(caller["sub"], name)
     return {"name": name, "deleted": True}
+
+
+@router.get("/profile/ssh_key")
+async def get_ssh_key(caller: dict = Depends(verify_session_token)):
+    data = vault_read_global(caller["sub"])
+    return {"ssh_key": data.get("ssh_key", "")}
+
+@router.get("/profile/ssh_key/private")
+async def get_ssh_private_key(caller: dict = Depends(verify_session_token)):
+    data = vault_read_global(caller["sub"])
+    if not data.get("ssh_private_key"):
+        raise HTTPException(status_code=404, detail="No private key stored.")
+    return {"ssh_private_key": data["ssh_private_key"]}
+
+@router.put("/profile/ssh_key")
+async def put_ssh_key(body: dict, caller: dict = Depends(verify_session_token)):
+    fields = {k: v for k, v in body.items()
+              if k in ("ssh_key", "ssh_private_key") and v}
+    if not fields:
+        raise HTTPException(status_code=400, detail="Nothing to store.")
+    vault_write_credentials(caller["sub"], fields)   # merge-write sul path globale
+    return {"saved": sorted(fields.keys())}
+
+@router.delete("/profile/ssh_key")
+async def delete_ssh_key(caller: dict = Depends(verify_session_token)):
+    vault_strip_global_keys(caller["sub"], ["ssh_key", "ssh_private_key"])
+    return {"deleted": True}

{laniakea_api_server-0.2.8 → laniakea_api_server-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "laniakea-api-server"
-version = "0.2.8"
+version = "0.3.1"
 description = "Laniakea Queue API — OIDC-authenticated gateway for cloud deployment orchestration"
 readme = "README.md"
 license = { text = "MIT" }