fix: address review feedback on host.docker.internal propagation

Mossaka · claude · Mossaka · commit 9226069c2feb · 2026-04-06T21:33:08.000Z
Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/containers/agent/docker-stub.sh b/containers/agent/docker-stub.sh
@@ -37,12 +37,50 @@ fi
 
 AGENT_CONTAINER="${AWF_AGENT_CONTAINER:-awf-agent}"
 
-# Get the subcommand (first non-flag argument)
+# Known Docker subcommands that we need to intercept or handle.
+# Used by get_subcommand() to avoid misidentifying Docker global option
+# values as subcommands (e.g., `docker --context foo run` where `foo` is
+# a value for --context, not a subcommand).
+KNOWN_SUBCOMMANDS="run create exec build pull push images ps logs stop start rm rmi network compose volume inspect cp tag login logout info version"
+
+# Get the Docker subcommand, skipping global options and their values.
+# Docker global options that take a value (e.g., --context <name>, --host <url>)
+# would cause a naive "first non-flag token" parser to misidentify the value
+# as the subcommand. Instead, we check each non-flag token against known
+# Docker subcommands.
 get_subcommand() {
+  local skip_next=false
   for arg in "$@"; do
+    if [ "$skip_next" = true ]; then
+      skip_next=false
+      continue
+    fi
     case "$arg" in
-      -*) continue ;;
-      *) echo "$arg"; return ;;
+      # Docker global options that take a separate value argument
+      --config|--context|-c|--host|-H|--log-level|-l)
+        skip_next=true
+        continue
+        ;;
+      # Docker global options with value in same token (--context=foo)
+      --config=*|--context=*|--host=*|--log-level=*)
+        continue
+        ;;
+      # Other flags (boolean flags like --debug, --tls, etc.)
+      -*)
+        continue
+        ;;
+      *)
+        # Check if this token is a known Docker subcommand
+        for cmd in $KNOWN_SUBCOMMANDS; do
+          if [ "$arg" = "$cmd" ]; then
+            echo "$arg"
+            return
+          fi
+        done
+        # Unknown token before a known subcommand — skip it
+        # (could be an unrecognized global option value)
+        continue
+        ;;
     esac
   done
 }
@@ -103,6 +141,7 @@ case "$SUBCOMMAND" in
     # Propagate host.docker.internal DNS to child containers when host access is enabled.
     # The agent container gets this via Docker's extra_hosts in docker-compose.yml,
     # but child containers spawned via 'docker run' don't inherit it automatically.
+    # Note: docker-manager.ts sets AWF_ENABLE_HOST_ACCESS='1' (not 'true').
     if [ "${AWF_ENABLE_HOST_ACCESS:-}" = "1" ]; then
       INJECT_FLAGS+=("--add-host" "host.docker.internal:host-gateway")
     fi
diff --git a/containers/agent/entrypoint.sh b/containers/agent/entrypoint.sh
@@ -3,6 +3,11 @@ set -e
 
 # SECURITY: Lock down AWF control variables to prevent tampering by user code.
 # These are set by the Docker Compose environment and must not be modified.
+# Note: `readonly` is a best-effort defense — it only prevents modification within
+# this shell's execution path. Subshells and child processes get their own copies
+# of exported variables and can modify them freely. The real enforcement is the
+# docker-stub.sh wrapper, which intercepts `docker run/create` and injects the
+# correct flags based on the original value set here.
 readonly AWF_ENABLE_HOST_ACCESS="${AWF_ENABLE_HOST_ACCESS:-}"
 export AWF_ENABLE_HOST_ACCESS
 
diff --git a/src/docker-manager.ts b/src/docker-manager.ts
@@ -755,7 +755,7 @@ export function generateDockerCompose(
     // Ensure host access is enabled (setup-iptables.sh requires AWF_ENABLE_HOST_ACCESS)
     // The CLI auto-enables this, but this is a safety net for programmatic usage
     if (!environment.AWF_ENABLE_HOST_ACCESS) {
-      environment.AWF_ENABLE_HOST_ACCESS = 'true';
+      environment.AWF_ENABLE_HOST_ACCESS = '1';
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ export function generateDockerCompose(`
`755`	`755`	`// Ensure host access is enabled (setup-iptables.sh requires AWF_ENABLE_HOST_ACCESS)`
`756`	`756`	`// The CLI auto-enables this, but this is a safety net for programmatic usage`
`757`	`757`	`if (!environment.AWF_ENABLE_HOST_ACCESS) {`
`758`		`- environment.AWF_ENABLE_HOST_ACCESS = 'true';`
	`758`	`+ environment.AWF_ENABLE_HOST_ACCESS = '1';`
`759`	`759`	`}`
`760`	`760`	`}`
`761`	`761`