fix: explicitly allow preservation for TERMINFO in shell-integration (#9891)
Due to security issues, `sudo` implementations may not preserve environment variables unless appended with `--preserve-env=list`. Problem context: https://github.com/ghostty-org/ghostty/discussions/9861pull/9898/head
commit
1805a9cb87
|
|
@ -103,7 +103,7 @@ if [[ "$GHOSTTY_SHELL_FEATURES" == *"sudo"* && -n "$TERMINFO" ]]; then
|
||||||
if [[ "$sudo_has_sudoedit_flags" == "yes" ]]; then
|
if [[ "$sudo_has_sudoedit_flags" == "yes" ]]; then
|
||||||
builtin command sudo "$@";
|
builtin command sudo "$@";
|
||||||
else
|
else
|
||||||
builtin command sudo TERMINFO="$TERMINFO" "$@";
|
builtin command sudo --preserve-env=TERMINFO "$@";
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@
|
||||||
if (not (has-value $arg =)) { break }
|
if (not (has-value $arg =)) { break }
|
||||||
}
|
}
|
||||||
|
|
||||||
if (not $sudoedit) { set args = [ TERMINFO=$E:TERMINFO $@args ] }
|
if (not $sudoedit) { set args = [ --preserve-env=TERMINFO $@args ] }
|
||||||
(external sudo) $@args
|
(external sudo) $@args
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ function __ghostty_setup --on-event fish_prompt -d "Setup ghostty integration"
|
||||||
if test "$sudo_has_sudoedit_flags" = "yes"
|
if test "$sudo_has_sudoedit_flags" = "yes"
|
||||||
command sudo $argv
|
command sudo $argv
|
||||||
else
|
else
|
||||||
command sudo TERMINFO="$TERMINFO" $argv
|
command sudo --preserve-env=TERMINFO $argv
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -255,7 +255,7 @@ _ghostty_deferred_init() {
|
||||||
if [[ "$sudo_has_sudoedit_flags" == "yes" ]]; then
|
if [[ "$sudo_has_sudoedit_flags" == "yes" ]]; then
|
||||||
builtin command sudo "$@";
|
builtin command sudo "$@";
|
||||||
else
|
else
|
||||||
builtin command sudo TERMINFO="$TERMINFO" "$@";
|
builtin command sudo --preserve-env=TERMINFO "$@";
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue