@decocms/sandbox-controller 0.16.1 → 0.16.3

package/dist/index.d.ts

@@ -3730,6 +3730,15 @@ interface FreestyleSandboxProviderOptions {
     image?: string;
     /** The org-fs sidecar image. Default: the chart's `orgFs.image`. */
     orgFsSidecarImage?: string;
+    /**
+     * What the daemon signs the bot's commits with, as the sandbox-env chart's
+     * `commitSigning` does for pods. Unset leaves commits unsigned. The key goes
+     * into the base snapshot, so code in any of these sandboxes can read it.
+     */
+    commitSigning?: {
+        email: string;
+        privateKey: string;
+    };
     /** Pause a VM after this long without network activity. Default 5 min. */
     idleTimeoutSeconds?: number;
     /**
@@ -3760,6 +3769,7 @@ declare class FreestyleSandboxProvider implements SandboxProvider {
     private readonly image;
     private readonly sidecarImage;
     private readonly allowUserNamespaces;
+    private readonly commitSigning;
     private readonly idleTimeoutSeconds;
     private readonly idlePauseMs;
     private readonly autoDeleteSeconds;

package/dist/index.js

@@ -6804,7 +6804,7 @@ var Freestyle = class {
 // ../sandbox/package.json
 var package_default = {
   name: "@decocms/sandbox",
-  version: "1.96.1",
+  version: "1.96.3",
   private: true,
   type: "module",
   description: "Sandbox runtime for isolated Studio tool execution",
@@ -6888,6 +6888,8 @@ var DEFAULT_SIDECAR_IMAGE = "ghcr.io/decocms/studio/orgfs-sidecar:0.2.0";
 var HOST_ORG_DIR = "/srv/sandbox/org";
 var HOST_CTL_DIR = "/srv/sandbox/orgfs-ctl";
 var CTL_DIR = "/run/orgfs";
+var HOST_SIGNING_KEY = "/srv/sandbox/git-signing-key";
+var SIGNING_KEY_FILE = "/run/git-signing/key";
 var HOST_SETUP = [
   `mkdir -p ${HOST_ORG_DIR} ${HOST_CTL_DIR}`,
   `grep -q ' ${HOST_ORG_DIR} ' /etc/fstab || printf '%s\\n' '${HOST_ORG_DIR} ${HOST_ORG_DIR} none bind,rshared 0 0' 'tmpfs ${HOST_CTL_DIR} tmpfs uid=1000,gid=1000,mode=0755,size=1m 0 0' >> /etc/fstab`,
@@ -6924,6 +6926,7 @@ var FreestyleSandboxProvider = class {
   image;
   sidecarImage;
   allowUserNamespaces;
+  commitSigning;
   idleTimeoutSeconds;
   idlePauseMs;
   autoDeleteSeconds;
@@ -6965,6 +6968,7 @@ var FreestyleSandboxProvider = class {
     this.image = opts.image ?? `ghcr.io/decocms/studio/studio-sandbox-go:${package_default.version}`;
     this.sidecarImage = opts.orgFsSidecarImage ?? DEFAULT_SIDECAR_IMAGE;
     this.allowUserNamespaces = opts.allowUserNamespaces ?? false;
+    this.commitSigning = opts.commitSigning;
     this.idleTimeoutSeconds = opts.idleTimeoutSeconds ?? 5 * 60;
     this.idlePauseMs = opts.idlePauseMs ?? 10 * 6e4;
     this.autoDeleteSeconds = opts.autoDeleteSeconds ?? 24 * 60 * 60;
@@ -7031,9 +7035,13 @@ var FreestyleSandboxProvider = class {
   baseSnapshot() {
     const { image, sidecarImage } = this;
     const namespaceMode = this.allowUserNamespaces ? "\nuser-namespaces" : "";
+    const signing = this.commitSigning ? `
+signing
+${this.commitSigning.email}
+${this.commitSigning.privateKey}` : "";
     const slug = `studio-sandbox-${createHash3("sha256").update(`${image}
 ${sidecarImage}
-running${namespaceMode}`).digest("hex").slice(0, 16)}`;
+running${namespaceMode}${signing}`).digest("hex").slice(0, 16)}`;
     if (this.knownSnapshots.has(slug)) return Promise.resolve(slug);
     return this.snapshotInflight.run(slug, async () => {
       if (await this.snapshotExists(slug)) {
@@ -7086,9 +7094,21 @@ running${namespaceMode}`).digest("hex").slice(0, 16)}`;
       APP_ROOT: WORKDIR,
       PROXY_PORT: String(DAEMON_PORT),
       ORGFS_SIDECAR_CONFIG_PATH: `${CTL_DIR}/config.json`,
-      ORGFS_SIDECAR_STATUS_PATH: `${CTL_DIR}/status.json`
+      ORGFS_SIDECAR_STATUS_PATH: `${CTL_DIR}/status.json`,
+      ...this.commitSigning && {
+        GIT_SIGNING_KEY_FILE: SIGNING_KEY_FILE,
+        GIT_SIGNING_KEY_EMAIL: this.commitSigning.email
+      }
     };
     const envFlags = Object.keys(env).map((k) => `-e ${shellQuote(k)}`).join(" ");
+    if (this.commitSigning) {
+      await this.run(
+        vm,
+        `printf '%s' "$GIT_SIGNING_KEY" | sudo sh -c 'umask 377 && cat > ${HOST_SIGNING_KEY} && chown 1000:1000 ${HOST_SIGNING_KEY}'`,
+        { env: { GIT_SIGNING_KEY: this.commitSigning.privateKey } }
+      );
+    }
+    const signingKeyMount = this.commitSigning ? ` -v ${HOST_SIGNING_KEY}:${SIGNING_KEY_FILE}:ro` : "";
     await this.run(
       vm,
       `sudo sh -c ${shellQuote(HOST_SETUP)} && docker run -d --name ${SIDECAR} --restart=always --privileged --device /dev/fuse -e APP_ROOT=${WORKDIR} -e ORGFS_FEED_IDLE_MS=60000 -v ${HOST_ORG_DIR}:${WORKDIR}/org:rshared -v ${HOST_CTL_DIR}:${CTL_DIR} ${shellQuote(this.sidecarImage)}`,
@@ -7097,7 +7117,7 @@ running${namespaceMode}`).digest("hex").slice(0, 16)}`;
     await this.run(
       vm,
       // Codex's read-only sandbox uses bubblewrap inside this per-user VM.
-      `docker run -d --name ${CONTAINER} --restart=always${this.allowUserNamespaces ? " --security-opt seccomp=unconfined --security-opt apparmor=unconfined" : ""} -p ${DAEMON_PORT}:${DAEMON_PORT} -v ${HOST_ORG_DIR}:${WORKDIR}/org:rslave -v ${HOST_CTL_DIR}:${CTL_DIR} ${envFlags} ${shellQuote(this.image)}`,
+      `docker run -d --name ${CONTAINER} --restart=always${this.allowUserNamespaces ? " --security-opt seccomp=unconfined --security-opt apparmor=unconfined" : ""} -p ${DAEMON_PORT}:${DAEMON_PORT} -v ${HOST_ORG_DIR}:${WORKDIR}/org:rslave -v ${HOST_CTL_DIR}:${CTL_DIR}${signingKeyMount} ${envFlags} ${shellQuote(this.image)}`,
       { env, timeoutMs: IMAGE_PULL_TIMEOUT_MS }
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/sandbox-controller",
-  "version": "0.16.1",
+  "version": "0.16.3",
   "description": "Runs Studio agent sandboxes on Kubernetes, and serves them to a remote Studio.",
   "repository": {
     "type": "git",