Skip to content

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.

fix(crypto): keep recipe handoff secrets behind the vault one door

Juan Denis36409d6ddf4e
diff --git a/backend/app/services/recipe_execution_service.py b/backend/app/services/recipe_execution_service.py
index ae584c43..829d53ee 100644
--- a/backend/app/services/recipe_execution_service.py
+++ b/backend/app/services/recipe_execution_service.py
@@ -22,7 +22,7 @@ from app.models.project import Project
from app.models.secret_vault import Secret, SecretVault
from app.services.manifest_apply_service import ManifestApplyService
from app.services.run_log_service import stream_for
-from app.utils.crypto import encrypt_secret
+from app.services.secret_vault_service import SecretService
from app.utils.sensitive_data_filter import mask_payload
@@ -349,14 +349,11 @@ class RecipeExecutionService:
db.session.add(vault)
db.session.flush()
name = cls._handoff_secret_name(job.id, step_id)
- secret = Secret.query.filter_by(vault_id=vault.id, name=name).first()
- if not secret:
- secret = Secret(vault_id=vault.id, name=name)
- db.session.add(secret)
- secret.encrypted_value = encrypt_secret(value)
- secret.expires_at = expires_at
- secret.description = 'Encrypted Recipe handoff input; deleted after run completion'
- db.session.commit()
+ secret = SecretService.upsert_internal_secret(
+ vault.id, name, value,
+ description='Encrypted Recipe handoff input; deleted after run completion',
+ expires_at=expires_at,
+ )
return secret
@classmethod
diff --git a/backend/app/services/secret_vault_service.py b/backend/app/services/secret_vault_service.py
index d179a93d..2bac0837 100644
--- a/backend/app/services/secret_vault_service.py
+++ b/backend/app/services/secret_vault_service.py
@@ -165,6 +165,28 @@ class SecretService:
db.session.delete(secret)
db.session.commit()
+ @classmethod
+ def upsert_internal_secret(cls, vault_id: int, name: str, value: str, *,
+ description: str = None, expires_at=None) -> Secret:
+ """Create-or-update a service-owned secret, returning the model row.
+
+ For internal writers (Recipe run handoffs today) that namespace their
+ own machine-generated names inside a dedicated vault slug — the human
+ display-name grammar does not apply, but the encryption still lives
+ here so this service stays the one door to it.
+ """
+ encrypted = encrypt_secret(value)
+ secret = cls.get_secret_by_name(vault_id, name)
+ if secret is None:
+ secret = Secret(vault_id=vault_id, name=name)
+ db.session.add(secret)
+ secret.encrypted_value = encrypted
+ if description is not None:
+ secret.description = description
+ secret.expires_at = expires_at
+ db.session.commit()
+ return secret
+
@classmethod
def reveal_secret(cls, secret_id: int) -> Dict:
secret = cls.get_secret(secret_id)