fix: Target variables (#170)

ctrlplanedev · Oct 25, 2024 · a75640e · a75640e
1 parent d82ff20
commit a75640e
Show file tree

Hide file tree

Showing 11 changed files with 3,942 additions and 6 deletions.
diff --git a/apps/webservice/package.json b/apps/webservice/package.json
@@ -20,6 +20,7 @@
     "@ctrlplane/db": "workspace:*",
     "@ctrlplane/job-dispatch": "workspace:*",
     "@ctrlplane/logger": "workspace:*",
+    "@ctrlplane/secrets": "workspace:*",
     "@ctrlplane/ui": "workspace:*",
     "@ctrlplane/validators": "workspace:*",
     "@hookform/resolvers": "^3.3.4",

diff --git a/apps/webservice/src/app/api/v1/jobs/[jobId]/route.ts b/apps/webservice/src/app/api/v1/jobs/[jobId]/route.ts
@@ -17,6 +17,7 @@ import {
   updateJob,
 } from "@ctrlplane/db/schema";
 import { onJobCompletion } from "@ctrlplane/job-dispatch";
+import { variablesAES256 } from "@ctrlplane/secrets";
 import { JobStatus } from "@ctrlplane/validators/jobs";
 
 import { getUser } from "~/app/api/v1/auth";
@@ -56,7 +57,11 @@ export const GET = async (
     .where(eq(jobVariable.jobId, params.jobId));
 
   const variables = Object.fromEntries(
-    jobVariableRows.map((v) => [v.key, v.value]),
+    jobVariableRows.map((v) => {
+      const strval = String(v.value);
+      const value = v.sensitive ? variablesAES256().decrypt(strval) : strval;
+      return [v.key, value];
+    }),
   );
 
   const jobTargetMetadataRows = await db
@@ -68,10 +73,7 @@ export const GET = async (
     jobTargetMetadataRows.map((m) => [m.key, m.value]),
   );
 
-  const targetWithMetadata = {
-    ...je.target,
-    metadata,
-  };
+  const targetWithMetadata = { ...je.target, metadata };
 
   return NextResponse.json({
     ...je.job,

diff --git a/packages/db/drizzle/0023_melted_nightshade.sql b/packages/db/drizzle/0023_melted_nightshade.sql
@@ -0,0 +1 @@
+ALTER TABLE "job_variable" ADD COLUMN "sensitive" boolean DEFAULT false NOT NULL;