From de11188cc4c93bbdee7d8b5366feefdb57b0f309 Mon Sep 17 00:00:00 2001
From: "molecule-ai[bot]" <276602405+molecule-ai[bot]@users.noreply.github.com>
Date: Wed, 22 Apr 2026 18:44:52 +0000
Subject: [PATCH] fix(F1085): scope rm to /configs volume in deleteViaEphemeral
 (#1616)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(F1085): scope rm to /configs volume in deleteViaEphemeral

Regressed by commit 49ab614 ("CWE-78/CWE-22 — block shell injection
in deleteViaEphemeral") which changed the rm form from the scoped
concat "/configs/" + filePath to the unscoped 2-arg "/configs", filePath.

With 2 args, rm receives /configs as the first target — rm -rf /configs
attempts to delete the entire volume mount before processing filePath,
which is the F1085 (Misconfiguration - Filesystems) defect. The concat
form passes a single scoped path so rm only touches files inside /configs.

validateRelPath call retained as CWE-22 defence-in-depth.

* docs: note F1085 defect in deleteViaEphemeral 2-arg rm form

Amends the CWE-22+CWE-78 incident entry to record that commit 49ab614
regressed the F1085 (volume deletion scope) fix, and that f1085-fix
commit a432df5 restores the correct concat form.

---------

Co-authored-by: Molecule AI CP-QA <cp-qa@agents.moleculesai.app>
---
 docs/incidents/INCIDENT_LOG.md                        | 9 +++++++--
 workspace-server/internal/handlers/container_files.go | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/incidents/INCIDENT_LOG.md b/docs/incidents/INCIDENT_LOG.md
index 85ccfc3d..c302dd49 100644
--- a/docs/incidents/INCIDENT_LOG.md
+++ b/docs/incidents/INCIDENT_LOG.md
@@ -224,6 +224,8 @@ The `fix/cwe78-delete-via-ephemeral-shell-injection` branch was the right diagno
 
 Both CWEs are fully resolved on both branches. The regression branch is superseded and must not be merged as-is.
 
+**UPDATE 2026-04-22**: Commit `49ab614` ("CWE-78/CWE-22 — block shell injection") introduced an F1085 regression by changing the rm concat form `"/configs/" + filePath` to the unscoped 2-arg form `"/configs", filePath`. This was subsequently fixed in commit `a432df5` (branch `f1085-fix`). Both the concat form and `validateRelPath` defence-in-depth are now in place. The 2-arg form must not be re-introduced.
+
 ### Verification (staging `ce2491e`)
 
 `copyFilesToContainer` (container_files.go:73-99):
@@ -238,8 +240,11 @@ header := &tar.Header{Name: safeName, ...}  ✅
 
 `deleteViaEphemeral` (container_files.go:152-168):
 ```go
-validateRelPath(filePath)  ✅
-Cmd: []string{"rm", "-rf", "/configs", filePath}  ✅ exec form, no shell interpolation
+validateRelPath(filePath)  ✅ defence-in-depth against CWE-22
+// NOTE: 2-arg "/configs", filePath form has F1085 (volume scope) defect.
+// Correct form: "/configs/" + filePath (single concat arg, rm only touches
+// files inside /configs). The 2-arg form passes /configs as an rm target,
+// so rm -rf /configs attempts to delete the entire volume mount.
 ```
 
 ---
diff --git a/workspace-server/internal/handlers/container_files.go b/workspace-server/internal/handlers/container_files.go
index 349ab53b..70ec7c36 100644
--- a/workspace-server/internal/handlers/container_files.go
+++ b/workspace-server/internal/handlers/container_files.go
@@ -171,7 +171,7 @@ func (h *TemplatesHandler) deleteViaEphemeral(ctx context.Context, volumeName, f
 
 	resp, err := h.docker.ContainerCreate(ctx, &container.Config{
 		Image: "alpine:latest",
-		Cmd:   []string{"rm", "-rf", "/configs", filePath},
+		Cmd:   []string{"rm", "-rf", "/configs/" + filePath},
 	}, &container.HostConfig{
 		Binds: []string{volumeName + ":/configs"},
 	}, nil, nil, "")