Skip to content

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

fix(installer): address review regressions

jkomynocbb5f5a70f23
diff --git a/install.sh b/install.sh
index 6cf3362da..30bed523a 100755
--- a/install.sh
+++ b/install.sh
@@ -278,7 +278,8 @@ print_post_install_help() {
[ "${COMPOSIO_INSTALL_HELP:-1}" != 0 ] || return 0
is_true "${COMPOSIO_QUIET:-}" && return 0
- shell_name=${SHELL##*/}
+ shell_name=${SHELL:-}
+ shell_name=${shell_name##*/}
shell_route=
shell_config=
case $shell_name in
@@ -325,6 +326,13 @@ cleanup() {
fi
}
+cleanup_on_signal() {
+ cleanup_signal=$1
+ trap - 0 1 2 3 15
+ cleanup || :
+ exit $((128 + cleanup_signal))
+}
+
main() {
install_agent=0
install_plugins=${COMPOSIO_INSTALL_PLUGINS:-0}
@@ -406,7 +414,11 @@ main() {
validate_url "$checksums_url" || error "Refusing unsafe checksum URL \"$checksums_url\""
tmpdir=$(mktemp -d) || error 'Failed to create a temporary directory'
- trap cleanup 0 1 2 3 15
+ trap cleanup 0
+ trap 'cleanup_on_signal 1' 1
+ trap 'cleanup_on_signal 2' 2
+ trap 'cleanup_on_signal 3' 3
+ trap 'cleanup_on_signal 15' 15
debug "temporary directory: $tmpdir"
info "Installing Composio CLI $version for $target"
diff --git a/install/bash.sh b/install/bash.sh
index 6430cb8f2..1c3fb2278 100755
--- a/install/bash.sh
+++ b/install/bash.sh
@@ -50,7 +50,7 @@ download_installer() {
}
is_unsafe_path() {
- case $1 in *';'* | *'`'* | *'$'* | *'|'* | *'&'* | *'"'* | *"'"* | *'('* | *')'* | *\\*) return 0 ;; esac
+ case $1 in *':'* | *';'* | *'`'* | *'$'* | *'|'* | *'&'* | *'"'* | *"'"* | *'('* | *')'* | *\\*) return 0 ;; esac
variant_cr=$(printf '\r')
case $1 in *"$variant_cr"* | *'
'*) return 0 ;; esac
@@ -98,13 +98,24 @@ inline_shell_setup() {
cleanup() { [ -z "${variant_tmpdir:-}" ] || [ ! -d "$variant_tmpdir" ] || rm -rf "$variant_tmpdir"; }
+cleanup_on_signal() {
+ cleanup_signal=$1
+ trap - 0 1 2 3 15
+ cleanup || :
+ exit $((128 + cleanup_signal))
+}
+
main() {
variant_shell=$(requested_shell)
# Internal test override. User-facing docs intentionally omit this variable.
variant_script_url=${COMPOSIO_INSTALL_SCRIPT_URL:-https://raw.githubusercontent.com/ComposioHQ/composio/refs/heads/next/install.sh}
variant_tmpdir=$(mktemp -d) || error 'Failed to create a temporary directory'
debug "temporary directory: $variant_tmpdir"
- trap cleanup 0 1 2 3 15
+ trap cleanup 0
+ trap 'cleanup_on_signal 1' 1
+ trap 'cleanup_on_signal 2' 2
+ trap 'cleanup_on_signal 3' 3
+ trap 'cleanup_on_signal 15' 15
download_installer "$variant_script_url" "$variant_tmpdir/install.sh" || error 'Failed to download the base installer'
[ -s "$variant_tmpdir/install.sh" ] || error 'Downloaded base installer is empty'
diff --git a/install/fish.sh b/install/fish.sh
index fbad0f853..df47c7abe 100755
--- a/install/fish.sh
+++ b/install/fish.sh
@@ -50,7 +50,7 @@ download_installer() {
}
is_unsafe_path() {
- case $1 in *';'* | *'`'* | *'$'* | *'|'* | *'&'* | *'"'* | *"'"* | *'('* | *')'* | *\\*) return 0 ;; esac
+ case $1 in *':'* | *';'* | *'`'* | *'$'* | *'|'* | *'&'* | *'"'* | *"'"* | *'('* | *')'* | *\\*) return 0 ;; esac
variant_cr=$(printf '\r')
case $1 in *"$variant_cr"* | *'
'*) return 0 ;; esac
@@ -98,13 +98,24 @@ inline_shell_setup() {
cleanup() { [ -z "${variant_tmpdir:-}" ] || [ ! -d "$variant_tmpdir" ] || rm -rf "$variant_tmpdir"; }
+cleanup_on_signal() {
+ cleanup_signal=$1
+ trap - 0 1 2 3 15
+ cleanup || :
+ exit $((128 + cleanup_signal))
+}
+
main() {
variant_shell=$(requested_shell)
# Internal test override. User-facing docs intentionally omit this variable.
variant_script_url=${COMPOSIO_INSTALL_SCRIPT_URL:-https://raw.githubusercontent.com/ComposioHQ/composio/refs/heads/next/install.sh}
variant_tmpdir=$(mktemp -d) || error 'Failed to create a temporary directory'
debug "temporary directory: $variant_tmpdir"
- trap cleanup 0 1 2 3 15
+ trap cleanup 0
+ trap 'cleanup_on_signal 1' 1
+ trap 'cleanup_on_signal 2' 2
+ trap 'cleanup_on_signal 3' 3
+ trap 'cleanup_on_signal 15' 15
download_installer "$variant_script_url" "$variant_tmpdir/install.sh" || error 'Failed to download the base installer'
[ -s "$variant_tmpdir/install.sh" ] || error 'Downloaded base installer is empty'
diff --git a/install/zsh.sh b/install/zsh.sh
index 0a0b98cb9..c7c244e1f 100755
--- a/install/zsh.sh
+++ b/install/zsh.sh
@@ -50,7 +50,7 @@ download_installer() {
}
is_unsafe_path() {
- case $1 in *';'* | *'`'* | *'$'* | *'|'* | *'&'* | *'"'* | *"'"* | *'('* | *')'* | *\\*) return 0 ;; esac
+ case $1 in *':'* | *';'* | *'`'* | *'$'* | *'|'* | *'&'* | *'"'* | *"'"* | *'('* | *')'* | *\\*) return 0 ;; esac
variant_cr=$(printf '\r')
case $1 in *"$variant_cr"* | *'
'*) return 0 ;; esac
@@ -98,13 +98,24 @@ inline_shell_setup() {
cleanup() { [ -z "${variant_tmpdir:-}" ] || [ ! -d "$variant_tmpdir" ] || rm -rf "$variant_tmpdir"; }
+cleanup_on_signal() {
+ cleanup_signal=$1
+ trap - 0 1 2 3 15
+ cleanup || :
+ exit $((128 + cleanup_signal))
+}
+
main() {
variant_shell=$(requested_shell)
# Internal test override. User-facing docs intentionally omit this variable.
variant_script_url=${COMPOSIO_INSTALL_SCRIPT_URL:-https://raw.githubusercontent.com/ComposioHQ/composio/refs/heads/next/install.sh}
variant_tmpdir=$(mktemp -d) || error 'Failed to create a temporary directory'
debug "temporary directory: $variant_tmpdir"
- trap cleanup 0 1 2 3 15
+ trap cleanup 0
+ trap 'cleanup_on_signal 1' 1
+ trap 'cleanup_on_signal 2' 2
+ trap 'cleanup_on_signal 3' 3
+ trap 'cleanup_on_signal 15' 15
download_installer "$variant_script_url" "$variant_tmpdir/install.sh" || error 'Failed to download the base installer'
[ -s "$variant_tmpdir/install.sh" ] || error 'Downloaded base installer is empty'
diff --git a/test/install-sh-release-resolution.test.sh b/test/install-sh-release-resolution.test.sh
index 38e79271b..b6ad00040 100755
--- a/test/install-sh-release-resolution.test.sh
+++ b/test/install-sh-release-resolution.test.sh
@@ -26,6 +26,16 @@ assert_not_contains() {
fi
}
+wait_for_file() {
+ local file=$1
+ local label=$2
+ for _ in {1..100}; do
+ [[ -f $file ]] && return 0
+ sleep 0.05
+ done
+ fail "$label"
+}
+
for script in "$repo_root/install.sh" "$repo_root"/install/*.sh; do
[[ $(tail -n 1 "$script") == 'main "$@"' ]] || fail "$script must end with main \"\$@\""
[[ $(grep -c '^main "\$@"$' "$script") -eq 1 ]] || fail "$script must contain one main entry point"
@@ -145,6 +155,11 @@ http://*)
;;
esac
+if [[ -n ${TEST_CURL_DELAY_URL:-} && $url == "$TEST_CURL_DELAY_URL" ]]; then
+ printf '%s\n' "$PPID" >"$TEST_CURL_PARENT_PID_FILE"
+ sleep "${TEST_CURL_DELAY_SECONDS:-1}"
+fi
+
if [[ $url == "$TEST_SCRIPT_URL" ]]; then
case ${TEST_BASE_MODE:-ok} in
fail) exit 22 ;;
@@ -267,7 +282,9 @@ EOF
reset_case() {
unset CASE_GITHUB_URL CASE_API_BASE CASE_INSTALL_VERSION CASE_PLUGINS CASE_QUIET CASE_DEBUG CASE_HELP
unset CASE_ALLOW_HTTP_HOST CASE_CHECKSUM_MODE CASE_API_ASSET_URL CASE_BASE_MODE CASE_REDIRECT_DOWNGRADE
- unset CASE_SHELL_CAPABILITY CASE_INSTALL_EXIT CASE_SETUP_EXIT CASE_VERSION_EXIT CASE_PATH_PREFIX
+ unset CASE_SHELL_CAPABILITY CASE_INSTALL_EXIT CASE_SETUP_EXIT CASE_VERSION_EXIT CASE_PATH_PREFIX CASE_UNSET_SHELL
+ unset CASE_CURL_DELAY_URL CASE_CURL_DELAY_SECONDS
+ rm -f "$case_root/curl-parent.pid"
: >"$curl_log"
: >"$composio_log"
}
@@ -278,6 +295,10 @@ EOF
local bin_dir=$3
shift 3
mkdir -p "$home" "$install_dir" "$bin_dir"
+ local -a installer_command=("$interpreter" "$repo_root/install.sh")
+ if [[ ${CASE_UNSET_SHELL:-0} == 1 ]]; then
+ installer_command=("$interpreter" -c 'unset SHELL; script=$1; shift; . "$script"' unset-shell "$repo_root/install.sh")
+ fi
env \
PATH="${CASE_PATH_PREFIX:-}$fake_bin:$PATH" \
HOME="$home" \
@@ -301,7 +322,10 @@ EOF
TEST_INSTALL_EXIT="${CASE_INSTALL_EXIT:-0}" \
TEST_SETUP_EXIT="${CASE_SETUP_EXIT:-0}" \
TEST_VERSION_EXIT="${CASE_VERSION_EXIT:-0}" \
- "$interpreter" "$repo_root/install.sh" "$@"
+ TEST_CURL_DELAY_URL="${CASE_CURL_DELAY_URL:-}" \
+ TEST_CURL_DELAY_SECONDS="${CASE_CURL_DELAY_SECONDS:-1}" \
+ TEST_CURL_PARENT_PID_FILE="$case_root/curl-parent.pid" \
+ "${installer_command[@]}" "$@"
}
run_variant() {
@@ -327,6 +351,9 @@ EOF
TEST_CHECKSUM_MODE=missing \
TEST_SHELL_CAPABILITY="${CASE_SHELL_CAPABILITY:-supported}" \
TEST_INSTALL_EXIT="${CASE_INSTALL_EXIT:-0}" \
+ TEST_CURL_DELAY_URL="${CASE_CURL_DELAY_URL:-}" \
+ TEST_CURL_DELAY_SECONDS="${CASE_CURL_DELAY_SECONDS:-1}" \
+ TEST_CURL_PARENT_PID_FILE="$case_root/curl-parent.pid" \
"$interpreter" "$repo_root/install/$shell_name.sh" "$@"
}
@@ -428,6 +455,41 @@ EOF
help_suppressed=$(run_installer "$case_root/help-home" "$case_root/help-install" "$case_root/help-bin" "$stable_tag" 2>&1)
assert_not_contains "$help_suppressed" 'next step' "$interpreter_name help suppression"
+ reset_case
+ CASE_UNSET_SHELL=1
+ run_installer "$case_root/unset-shell-home" "$case_root/unset-shell-install" "$case_root/unset-shell-bin" "$stable_tag" >/dev/null 2>&1 ||
+ fail "$interpreter_name unset SHELL must not fail after installation"
+
+ reset_case
+ CASE_CURL_DELAY_URL="$github_url/FakeOwner/fake-repo/releases/download/$stable_tag/$archive_name"
+ signal_output="$case_root/signal-installer.log"
+ run_installer "$case_root/signal-home" "$case_root/signal-install" "$case_root/signal-bin" "$stable_tag" >"$signal_output" 2>&1 &
+ signal_job=$!
+ wait_for_file "$case_root/curl-parent.pid" "$interpreter_name installer did not reach delayed download"
+ signal_pid=$(<"$case_root/curl-parent.pid")
+ kill -TERM "$signal_pid"
+ if wait "$signal_job"; then
+ fail "$interpreter_name installer must terminate after SIGTERM"
+ else
+ signal_status=$?
+ fi
+ [[ $signal_status -eq 143 ]] || fail "$interpreter_name installer SIGTERM status (got $signal_status)"
+
+ reset_case
+ CASE_CURL_DELAY_URL=$script_url
+ variant_signal_output="$case_root/signal-variant.log"
+ run_variant zsh "$case_root/signal-variant-home" "$case_root/signal-variant-install" "$case_root/signal-variant-bin" "$stable_tag" >"$variant_signal_output" 2>&1 &
+ variant_signal_job=$!
+ wait_for_file "$case_root/curl-parent.pid" "$interpreter_name shell variant did not reach delayed download"
+ variant_signal_pid=$(<"$case_root/curl-parent.pid")
+ kill -TERM "$variant_signal_pid"
+ if wait "$variant_signal_job"; then
+ fail "$interpreter_name shell variant must terminate after SIGTERM"
+ else
+ variant_signal_status=$?
+ fi
+ [[ $variant_signal_status -eq 143 ]] || fail "$interpreter_name shell variant SIGTERM status (got $variant_signal_status)"
+
reset_case
CASE_GITHUB_URL='http://127.0.0.1:8929'
CASE_API_BASE='http://127.0.0.1:8929/api'
@@ -498,13 +560,15 @@ EOF
grep -Fqx '# Composio CLI' "$bash_fallback_home/.bashrc" || fail "$interpreter_name bash fallback bashrc"
grep -Fqx '# Composio CLI' "$bash_fallback_home/.bash_profile" || fail "$interpreter_name bash fallback login override"
- reset_case
- CASE_SHELL_CAPABILITY=unsupported
- unsafe_home="$case_root/unsafe-variant-home"
- if run_variant zsh "$unsafe_home" "$case_root/unsafe-variant-install" "$case_root/unsafe;variant-bin" "$stable_tag" >/dev/null 2>&1; then
- fail "$interpreter_name unsafe variant bin dir must fail"
- fi
- [[ ! -e "$unsafe_home/.zshrc" ]] || fail "$interpreter_name unsafe variant must not write rc file"
+ for unsafe_character in ';' ':'; do
+ reset_case
+ CASE_SHELL_CAPABILITY=unsupported
+ unsafe_home="$case_root/unsafe-${unsafe_character//[^[:alnum:]]/delimiter}-variant-home"
+ if run_variant zsh "$unsafe_home" "$case_root/unsafe-variant-install" "$case_root/unsafe${unsafe_character}variant-bin" "$stable_tag" >/dev/null 2>&1; then
+ fail "$interpreter_name unsafe variant bin dir with $unsafe_character must fail"
+ fi
+ [[ ! -e "$unsafe_home/.zshrc" ]] || fail "$interpreter_name unsafe variant must not write rc file"
+ done
for base_mode in fail empty; do
reset_case