ci: publish versioned bash fork artifacts

.github/scripts/build-bash-release-artifact.sh

@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ "$#" -ne 1 ]]; then
+  echo "usage: $0 <archive-path>" >&2
+  exit 1
+fi
+
+archive_path="$1"
+workspace="${GITHUB_WORKSPACE:?missing GITHUB_WORKSPACE}"
+bash_commit="${BASH_COMMIT:?missing BASH_COMMIT}"
+bash_patch="${BASH_PATCH:?missing BASH_PATCH}"
+temp_root="${RUNNER_TEMP:-/tmp}"
+work_root="$(mktemp -d "${temp_root%/}/codex-bash-release.XXXXXX")"
+trap 'rm -rf "$work_root"' EXIT
+
+source_root="${work_root}/bash"
+package_root="${work_root}/codex-bash"
+wrapper_path="${work_root}/exec-wrapper"
+stdout_path="${work_root}/stdout.txt"
+wrapper_log_path="${work_root}/wrapper.log"
+socket_probe_path="${work_root}/socket-probe.txt"
+
+git clone https://git.savannah.gnu.org/git/bash "$source_root"
+cd "$source_root"
+git checkout "$bash_commit"
+git apply "${workspace}/${bash_patch}"
+./configure --without-bash-malloc
+
+cores="$(command -v nproc >/dev/null 2>&1 && nproc || getconf _NPROCESSORS_ONLN)"
+make -j"${cores}"
+
+# Stand in for codex-execve-wrapper: record each intercepted executable and
+# prove that the inherited escalation-socket descriptor is still open.
+cat > "$wrapper_path" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+: "${CODEX_WRAPPER_LOG:?missing CODEX_WRAPPER_LOG}"
+: "${EXEC_WRAPPER:?missing EXEC_WRAPPER}"
+: "${CODEX_ESCALATE_SOCKET:?missing CODEX_ESCALATE_SOCKET}"
+printf 'socket-open\n' >&"${CODEX_ESCALATE_SOCKET}"
+printf '%s\n' "$@" >> "$CODEX_WRAPPER_LOG"
+file="$1"
+shift
+if [[ "$#" -eq 0 ]]; then
+  exec "$file"
+fi
+arg0="$1"
+shift
+exec -a "$arg0" "$file" "$@"
+EOF
+chmod +x "$wrapper_path"
+
+# The nested bash and /bin/echo should each pass through EXEC_WRAPPER while
+# retaining the same inherited descriptor.
+CODEX_WRAPPER_LOG="$wrapper_log_path" \
+CODEX_ESCALATE_SOCKET=9 \
+EXEC_WRAPPER="$wrapper_path" \
+"${source_root}/bash" \
+  -c "\"${source_root}/bash\" -c '/bin/echo smoke-bash'" \
+  > "$stdout_path" \
+  9> "$socket_probe_path"
+
+grep -Fx "smoke-bash" "$stdout_path"
+grep -Fx "${source_root}/bash" "$wrapper_log_path"
+grep -Fx "/bin/echo" "$wrapper_log_path"
+[[ "$(grep -Fxc "socket-open" "$socket_probe_path")" -eq 2 ]]
+
+mkdir -p "$package_root/bin" "$(dirname "${workspace}/${archive_path}")"
+cp "${source_root}/bash" "$package_root/bin/bash"
+chmod +x "$package_root/bin/bash"
+
+(cd "$work_root" && tar -czf "${workspace}/${archive_path}" codex-bash)

.github/scripts/build-zsh-release-artifact.sh

@@ -20,6 +20,7 @@ package_root="${work_root}/codex-zsh"
 wrapper_path="${work_root}/exec-wrapper"
 stdout_path="${work_root}/stdout.txt"
 wrapper_log_path="${work_root}/wrapper.log"
+socket_probe_path="${work_root}/socket-probe.txt"
 
 git clone https://git.code.sf.net/p/zsh/code "$source_root"
 cd "$source_root"
@@ -31,11 +32,16 @@ git apply "${workspace}/${zsh_patch}"
 cores="$(command -v nproc >/dev/null 2>&1 && nproc || getconf _NPROCESSORS_ONLN)"
 make -j"${cores}"
 
+# Stand in for codex-execve-wrapper: record each intercepted executable and
+# prove that the inherited escalation-socket descriptor is still open.
 cat > "$wrapper_path" <<'EOF'
 #!/usr/bin/env bash
 set -euo pipefail
 : "${CODEX_WRAPPER_LOG:?missing CODEX_WRAPPER_LOG}"
-printf '%s\n' "$@" > "$CODEX_WRAPPER_LOG"
+: "${EXEC_WRAPPER:?missing EXEC_WRAPPER}"
+: "${CODEX_ESCALATE_SOCKET:?missing CODEX_ESCALATE_SOCKET}"
+printf 'socket-open\n' >&"${CODEX_ESCALATE_SOCKET}"
+printf '%s\n' "$@" >> "$CODEX_WRAPPER_LOG"
 file="$1"
 shift
 if [[ "$#" -eq 0 ]]; then
@@ -47,12 +53,20 @@ exec -a "$arg0" "$file" "$@"
 EOF
 chmod +x "$wrapper_path"
 
+# The nested zsh and /bin/echo should each pass through EXEC_WRAPPER while
+# retaining the same inherited descriptor.
 CODEX_WRAPPER_LOG="$wrapper_log_path" \
+CODEX_ESCALATE_SOCKET=9 \
 EXEC_WRAPPER="$wrapper_path" \
-"${source_root}/Src/zsh" -fc '/bin/echo smoke-zsh' > "$stdout_path"
+"${source_root}/Src/zsh" \
+  -fc "\"${source_root}/Src/zsh\" -fc '/bin/echo smoke-zsh'" \
+  > "$stdout_path" \
+  9> "$socket_probe_path"
 
 grep -Fx "smoke-zsh" "$stdout_path"
+grep -Fx "${source_root}/Src/zsh" "$wrapper_log_path"
 grep -Fx "/bin/echo" "$wrapper_log_path"
+[[ "$(grep -Fxc "socket-open" "$socket_probe_path")" -eq 2 ]]
 
 mkdir -p "$package_root/bin" "$(dirname "${workspace}/${archive_path}")"
 cp "${source_root}/Src/zsh" "$package_root/bin/zsh"

.github/scripts/test-shell-exec-wrapper-chain.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ "$#" -ne 2 ]]; then
+  echo "usage: $0 <bash-path> <zsh-path>" >&2
+  exit 1
+fi
+
+bash_path="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+zsh_path="$(cd "$(dirname "$2")" && pwd)/$(basename "$2")"
+temp_root="${RUNNER_TEMP:-/tmp}"
+work_root="$(mktemp -d "${temp_root%/}/codex-shell-chain.XXXXXX")"
+trap 'rm -rf "$work_root"' EXIT
+
+wrapper_path="${work_root}/exec-wrapper"
+
+# Stand in for codex-execve-wrapper: record each intercepted executable and
+# prove that the inherited escalation-socket descriptor is still open.
+cat > "$wrapper_path" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+: "${CODEX_WRAPPER_LOG:?missing CODEX_WRAPPER_LOG}"
+: "${EXEC_WRAPPER:?missing EXEC_WRAPPER}"
+: "${CODEX_ESCALATE_SOCKET:?missing CODEX_ESCALATE_SOCKET}"
+printf 'socket-open\n' >&"${CODEX_ESCALATE_SOCKET}"
+printf '%s\n' "$@" >> "$CODEX_WRAPPER_LOG"
+file="$1"
+shift
+if [[ "$#" -eq 0 ]]; then
+  exec "$file"
+fi
+arg0="$1"
+shift
+exec -a "$arg0" "$file" "$@"
+EOF
+chmod +x "$wrapper_path"
+
+run_chain() {
+  local outer_shell="$1"
+  local outer_flag="$2"
+  local inner_shell="$3"
+  local inner_flag="$4"
+  local marker="$5"
+  local wrapper_log="${work_root}/${marker}-wrapper.log"
+  local socket_probe="${work_root}/${marker}-socket.log"
+  local stdout="${work_root}/${marker}-stdout.txt"
+  local command
+  command="\"${inner_shell}\" ${inner_flag} '/bin/echo ${marker}'"
+
+  # The inner shell and /bin/echo should each pass through EXEC_WRAPPER while
+  # retaining the same inherited descriptor.
+  CODEX_WRAPPER_LOG="$wrapper_log" \
+  CODEX_ESCALATE_SOCKET=9 \
+  EXEC_WRAPPER="$wrapper_path" \
+  "$outer_shell" "$outer_flag" "$command" > "$stdout" 9> "$socket_probe"
+
+  grep -Fx "$marker" "$stdout"
+  grep -Fx "$inner_shell" "$wrapper_log"
+  grep -Fx "/bin/echo" "$wrapper_log"
+  [[ "$(grep -Fxc "socket-open" "$socket_probe")" -eq 2 ]]
+}
+
+# Either patched shell may launch the other, so exercise both directions.
+run_chain "$bash_path" -c "$zsh_path" -fc bash-zsh-chain
+run_chain "$zsh_path" -fc "$bash_path" -c zsh-bash-chain