2023-09-08 18:19:01 +02:00
|
|
|
use std::{
|
|
|
|
io::IsTerminal,
|
|
|
|
sync::atomic::{AtomicI32, Ordering},
|
|
|
|
};
|
|
|
|
|
|
|
|
use nix::{
|
|
|
|
errno::Errno,
|
|
|
|
libc,
|
Do not block signals for child processes (#11402)
# Description / User-Facing Changes
Signals are no longer blocked for child processes launched from both
interactive and non-interactive mode. The only exception is that
`SIGTSTP`, `SIGTTIN`, and `SIGTTOU` remain blocked for child processes
launched only from **interactive** mode. This is to help prevent nushell
from getting into an unrecoverable state, since we don't support
background jobs. Anyways, this fully fixes #9026.
# Other Notes
- Needs Rust version `>= 1.66` for a fix in
`std::process::Command::spawn`, but it looks our current Rust version is
way above this.
- Uses `sigaction` instead of `signal`, since the behavior of `signal`
can apparently differ across systems. Also, the `sigaction` man page
says:
> The sigaction() function supersedes the signal() function, and should
be used in preference.
Additionally, using both `sigaction` and `signal` is not recommended.
Since we were already using `sigaction` in some places (and possibly
some of our dependencies as well), this PR replaces all usages of
`signal`.
# Tests
Might want to wait for #11178 for testing.
2024-01-15 23:08:21 +01:00
|
|
|
sys::signal::{killpg, raise, sigaction, SaFlags, SigAction, SigHandler, SigSet, Signal},
|
2023-09-08 18:19:01 +02:00
|
|
|
unistd::{self, Pid},
|
|
|
|
};
|
2023-01-20 22:20:38 +01:00
|
|
|
|
2023-09-08 18:19:01 +02:00
|
|
|
static INITIAL_PGID: AtomicI32 = AtomicI32::new(-1);
|
|
|
|
|
Do not block signals for child processes (#11402)
# Description / User-Facing Changes
Signals are no longer blocked for child processes launched from both
interactive and non-interactive mode. The only exception is that
`SIGTSTP`, `SIGTTIN`, and `SIGTTOU` remain blocked for child processes
launched only from **interactive** mode. This is to help prevent nushell
from getting into an unrecoverable state, since we don't support
background jobs. Anyways, this fully fixes #9026.
# Other Notes
- Needs Rust version `>= 1.66` for a fix in
`std::process::Command::spawn`, but it looks our current Rust version is
way above this.
- Uses `sigaction` instead of `signal`, since the behavior of `signal`
can apparently differ across systems. Also, the `sigaction` man page
says:
> The sigaction() function supersedes the signal() function, and should
be used in preference.
Additionally, using both `sigaction` and `signal` is not recommended.
Since we were already using `sigaction` in some places (and possibly
some of our dependencies as well), this PR replaces all usages of
`signal`.
# Tests
Might want to wait for #11178 for testing.
2024-01-15 23:08:21 +01:00
|
|
|
pub(crate) fn acquire(interactive: bool) {
|
2023-08-04 22:43:35 +02:00
|
|
|
if interactive && std::io::stdin().is_terminal() {
|
|
|
|
// see also: https://www.gnu.org/software/libc/manual/html_node/Initializing-the-Shell.html
|
|
|
|
|
Do not block signals for child processes (#11402)
# Description / User-Facing Changes
Signals are no longer blocked for child processes launched from both
interactive and non-interactive mode. The only exception is that
`SIGTSTP`, `SIGTTIN`, and `SIGTTOU` remain blocked for child processes
launched only from **interactive** mode. This is to help prevent nushell
from getting into an unrecoverable state, since we don't support
background jobs. Anyways, this fully fixes #9026.
# Other Notes
- Needs Rust version `>= 1.66` for a fix in
`std::process::Command::spawn`, but it looks our current Rust version is
way above this.
- Uses `sigaction` instead of `signal`, since the behavior of `signal`
can apparently differ across systems. Also, the `sigaction` man page
says:
> The sigaction() function supersedes the signal() function, and should
be used in preference.
Additionally, using both `sigaction` and `signal` is not recommended.
Since we were already using `sigaction` in some places (and possibly
some of our dependencies as well), this PR replaces all usages of
`signal`.
# Tests
Might want to wait for #11178 for testing.
2024-01-15 23:08:21 +01:00
|
|
|
if unsafe { libc::atexit(restore_terminal) } != 0 {
|
|
|
|
eprintln!("ERROR: failed to set exit function");
|
|
|
|
std::process::exit(1);
|
|
|
|
};
|
|
|
|
|
2023-09-08 18:19:01 +02:00
|
|
|
let initial_pgid = take_control();
|
|
|
|
|
|
|
|
INITIAL_PGID.store(initial_pgid.into(), Ordering::Relaxed);
|
2023-07-17 23:32:29 +02:00
|
|
|
|
2023-08-04 22:43:35 +02:00
|
|
|
unsafe {
|
2023-12-21 17:00:38 +01:00
|
|
|
// SIGINT has special handling
|
Do not block signals for child processes (#11402)
# Description / User-Facing Changes
Signals are no longer blocked for child processes launched from both
interactive and non-interactive mode. The only exception is that
`SIGTSTP`, `SIGTTIN`, and `SIGTTOU` remain blocked for child processes
launched only from **interactive** mode. This is to help prevent nushell
from getting into an unrecoverable state, since we don't support
background jobs. Anyways, this fully fixes #9026.
# Other Notes
- Needs Rust version `>= 1.66` for a fix in
`std::process::Command::spawn`, but it looks our current Rust version is
way above this.
- Uses `sigaction` instead of `signal`, since the behavior of `signal`
can apparently differ across systems. Also, the `sigaction` man page
says:
> The sigaction() function supersedes the signal() function, and should
be used in preference.
Additionally, using both `sigaction` and `signal` is not recommended.
Since we were already using `sigaction` in some places (and possibly
some of our dependencies as well), this PR replaces all usages of
`signal`.
# Tests
Might want to wait for #11178 for testing.
2024-01-15 23:08:21 +01:00
|
|
|
let ignore = SigAction::new(SigHandler::SigIgn, SaFlags::empty(), SigSet::empty());
|
|
|
|
sigaction(Signal::SIGQUIT, &ignore).expect("signal ignore");
|
|
|
|
sigaction(Signal::SIGTSTP, &ignore).expect("signal ignore");
|
|
|
|
sigaction(Signal::SIGTTIN, &ignore).expect("signal ignore");
|
|
|
|
sigaction(Signal::SIGTTOU, &ignore).expect("signal ignore");
|
|
|
|
sigaction(
|
|
|
|
Signal::SIGTERM,
|
|
|
|
&SigAction::new(
|
|
|
|
SigHandler::Handler(sigterm_handler),
|
|
|
|
SaFlags::empty(),
|
|
|
|
SigSet::empty(),
|
|
|
|
),
|
|
|
|
)
|
|
|
|
.expect("signal action");
|
2023-08-04 22:43:35 +02:00
|
|
|
}
|
2023-01-20 22:20:38 +01:00
|
|
|
|
2023-08-04 22:43:35 +02:00
|
|
|
// Put ourselves in our own process group, if not already
|
|
|
|
let shell_pgid = unistd::getpid();
|
|
|
|
match unistd::setpgid(shell_pgid, shell_pgid) {
|
|
|
|
// setpgid returns EPERM if we are the session leader (e.g., as a login shell).
|
|
|
|
// The other cases that return EPERM cannot happen, since we gave our own pid.
|
|
|
|
// See: setpgid(2)
|
|
|
|
// Therefore, it is safe to ignore EPERM.
|
|
|
|
Ok(()) | Err(Errno::EPERM) => (),
|
|
|
|
Err(_) => {
|
|
|
|
eprintln!("ERROR: failed to put nushell in its own process group");
|
|
|
|
std::process::exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Set our possibly new pgid to be in control of terminal
|
2024-03-27 16:43:37 +01:00
|
|
|
let _ = unistd::tcsetpgrp(unsafe { nu_system::stdin_fd() }, shell_pgid);
|
2023-01-20 22:20:38 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Inspired by fish's acquire_tty_or_exit
|
2023-09-08 18:19:01 +02:00
|
|
|
// Returns our original pgid
|
|
|
|
fn take_control() -> Pid {
|
2023-01-20 22:20:38 +01:00
|
|
|
let shell_pgid = unistd::getpgrp();
|
|
|
|
|
2024-03-27 16:43:37 +01:00
|
|
|
match unistd::tcgetpgrp(unsafe { nu_system::stdin_fd() }) {
|
2023-01-20 22:20:38 +01:00
|
|
|
Ok(owner_pgid) if owner_pgid == shell_pgid => {
|
|
|
|
// Common case, nothing to do
|
2023-09-08 18:19:01 +02:00
|
|
|
return owner_pgid;
|
2023-01-20 22:20:38 +01:00
|
|
|
}
|
|
|
|
Ok(owner_pgid) if owner_pgid == unistd::getpid() => {
|
|
|
|
// This can apparently happen with sudo: https://github.com/fish-shell/fish-shell/issues/7388
|
|
|
|
let _ = unistd::setpgid(owner_pgid, owner_pgid);
|
2023-09-08 18:19:01 +02:00
|
|
|
return owner_pgid;
|
2023-01-20 22:20:38 +01:00
|
|
|
}
|
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
|
|
|
|
// Reset all signal handlers to default
|
Do not block signals for child processes (#11402)
# Description / User-Facing Changes
Signals are no longer blocked for child processes launched from both
interactive and non-interactive mode. The only exception is that
`SIGTSTP`, `SIGTTIN`, and `SIGTTOU` remain blocked for child processes
launched only from **interactive** mode. This is to help prevent nushell
from getting into an unrecoverable state, since we don't support
background jobs. Anyways, this fully fixes #9026.
# Other Notes
- Needs Rust version `>= 1.66` for a fix in
`std::process::Command::spawn`, but it looks our current Rust version is
way above this.
- Uses `sigaction` instead of `signal`, since the behavior of `signal`
can apparently differ across systems. Also, the `sigaction` man page
says:
> The sigaction() function supersedes the signal() function, and should
be used in preference.
Additionally, using both `sigaction` and `signal` is not recommended.
Since we were already using `sigaction` in some places (and possibly
some of our dependencies as well), this PR replaces all usages of
`signal`.
# Tests
Might want to wait for #11178 for testing.
2024-01-15 23:08:21 +01:00
|
|
|
let default = SigAction::new(SigHandler::SigDfl, SaFlags::empty(), SigSet::empty());
|
2023-01-20 22:20:38 +01:00
|
|
|
for sig in Signal::iterator() {
|
Do not block signals for child processes (#11402)
# Description / User-Facing Changes
Signals are no longer blocked for child processes launched from both
interactive and non-interactive mode. The only exception is that
`SIGTSTP`, `SIGTTIN`, and `SIGTTOU` remain blocked for child processes
launched only from **interactive** mode. This is to help prevent nushell
from getting into an unrecoverable state, since we don't support
background jobs. Anyways, this fully fixes #9026.
# Other Notes
- Needs Rust version `>= 1.66` for a fix in
`std::process::Command::spawn`, but it looks our current Rust version is
way above this.
- Uses `sigaction` instead of `signal`, since the behavior of `signal`
can apparently differ across systems. Also, the `sigaction` man page
says:
> The sigaction() function supersedes the signal() function, and should
be used in preference.
Additionally, using both `sigaction` and `signal` is not recommended.
Since we were already using `sigaction` in some places (and possibly
some of our dependencies as well), this PR replaces all usages of
`signal`.
# Tests
Might want to wait for #11178 for testing.
2024-01-15 23:08:21 +01:00
|
|
|
if let Ok(old_act) = unsafe { sigaction(sig, &default) } {
|
|
|
|
// fish preserves ignored SIGHUP, presumably for nohup support, so let's do the same
|
|
|
|
if sig == Signal::SIGHUP && old_act.handler() == SigHandler::SigIgn {
|
|
|
|
let _ = unsafe { sigaction(sig, &old_act) };
|
2023-01-20 22:20:38 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for _ in 0..4096 {
|
2024-03-27 16:43:37 +01:00
|
|
|
match unistd::tcgetpgrp(unsafe { nu_system::stdin_fd() }) {
|
2023-01-20 22:20:38 +01:00
|
|
|
Ok(owner_pgid) if owner_pgid == shell_pgid => {
|
2023-08-04 22:43:35 +02:00
|
|
|
// success
|
2023-09-08 18:19:01 +02:00
|
|
|
return owner_pgid;
|
2023-01-20 22:20:38 +01:00
|
|
|
}
|
|
|
|
Ok(owner_pgid) if owner_pgid == Pid::from_raw(0) => {
|
|
|
|
// Zero basically means something like "not owned" and we can just take it
|
2024-03-27 16:43:37 +01:00
|
|
|
let _ = unistd::tcsetpgrp(unsafe { nu_system::stdin_fd() }, shell_pgid);
|
2023-01-20 22:20:38 +01:00
|
|
|
}
|
|
|
|
Err(Errno::ENOTTY) => {
|
|
|
|
eprintln!("ERROR: no TTY for interactive shell");
|
|
|
|
std::process::exit(1);
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
// fish also has other heuristics than "too many attempts" for the orphan check, but they're optional
|
Do not block signals for child processes (#11402)
# Description / User-Facing Changes
Signals are no longer blocked for child processes launched from both
interactive and non-interactive mode. The only exception is that
`SIGTSTP`, `SIGTTIN`, and `SIGTTOU` remain blocked for child processes
launched only from **interactive** mode. This is to help prevent nushell
from getting into an unrecoverable state, since we don't support
background jobs. Anyways, this fully fixes #9026.
# Other Notes
- Needs Rust version `>= 1.66` for a fix in
`std::process::Command::spawn`, but it looks our current Rust version is
way above this.
- Uses `sigaction` instead of `signal`, since the behavior of `signal`
can apparently differ across systems. Also, the `sigaction` man page
says:
> The sigaction() function supersedes the signal() function, and should
be used in preference.
Additionally, using both `sigaction` and `signal` is not recommended.
Since we were already using `sigaction` in some places (and possibly
some of our dependencies as well), this PR replaces all usages of
`signal`.
# Tests
Might want to wait for #11178 for testing.
2024-01-15 23:08:21 +01:00
|
|
|
if killpg(shell_pgid, Signal::SIGTTIN).is_err() {
|
2023-01-20 22:20:38 +01:00
|
|
|
eprintln!("ERROR: failed to SIGTTIN ourselves");
|
|
|
|
std::process::exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2023-07-17 23:32:29 +02:00
|
|
|
|
2023-09-08 18:19:01 +02:00
|
|
|
eprintln!("ERROR: failed to take control of the terminal, we might be orphaned");
|
2023-08-04 22:43:35 +02:00
|
|
|
std::process::exit(1);
|
2023-01-20 22:20:38 +01:00
|
|
|
}
|
2023-09-08 18:19:01 +02:00
|
|
|
|
|
|
|
extern "C" fn restore_terminal() {
|
|
|
|
// Safety: can only call async-signal-safe functions here
|
Do not block signals for child processes (#11402)
# Description / User-Facing Changes
Signals are no longer blocked for child processes launched from both
interactive and non-interactive mode. The only exception is that
`SIGTSTP`, `SIGTTIN`, and `SIGTTOU` remain blocked for child processes
launched only from **interactive** mode. This is to help prevent nushell
from getting into an unrecoverable state, since we don't support
background jobs. Anyways, this fully fixes #9026.
# Other Notes
- Needs Rust version `>= 1.66` for a fix in
`std::process::Command::spawn`, but it looks our current Rust version is
way above this.
- Uses `sigaction` instead of `signal`, since the behavior of `signal`
can apparently differ across systems. Also, the `sigaction` man page
says:
> The sigaction() function supersedes the signal() function, and should
be used in preference.
Additionally, using both `sigaction` and `signal` is not recommended.
Since we were already using `sigaction` in some places (and possibly
some of our dependencies as well), this PR replaces all usages of
`signal`.
# Tests
Might want to wait for #11178 for testing.
2024-01-15 23:08:21 +01:00
|
|
|
// `tcsetpgrp` and `getpgrp` are async-signal-safe
|
2023-09-08 18:19:01 +02:00
|
|
|
let initial_pgid = Pid::from_raw(INITIAL_PGID.load(Ordering::Relaxed));
|
|
|
|
if initial_pgid.as_raw() > 0 && initial_pgid != unistd::getpgrp() {
|
2024-03-27 16:43:37 +01:00
|
|
|
let _ = unistd::tcsetpgrp(unsafe { nu_system::stdin_fd() }, initial_pgid);
|
2023-09-08 18:19:01 +02:00
|
|
|
}
|
|
|
|
}
|
Do not block signals for child processes (#11402)
# Description / User-Facing Changes
Signals are no longer blocked for child processes launched from both
interactive and non-interactive mode. The only exception is that
`SIGTSTP`, `SIGTTIN`, and `SIGTTOU` remain blocked for child processes
launched only from **interactive** mode. This is to help prevent nushell
from getting into an unrecoverable state, since we don't support
background jobs. Anyways, this fully fixes #9026.
# Other Notes
- Needs Rust version `>= 1.66` for a fix in
`std::process::Command::spawn`, but it looks our current Rust version is
way above this.
- Uses `sigaction` instead of `signal`, since the behavior of `signal`
can apparently differ across systems. Also, the `sigaction` man page
says:
> The sigaction() function supersedes the signal() function, and should
be used in preference.
Additionally, using both `sigaction` and `signal` is not recommended.
Since we were already using `sigaction` in some places (and possibly
some of our dependencies as well), this PR replaces all usages of
`signal`.
# Tests
Might want to wait for #11178 for testing.
2024-01-15 23:08:21 +01:00
|
|
|
|
|
|
|
extern "C" fn sigterm_handler(_signum: libc::c_int) {
|
|
|
|
// Safety: can only call async-signal-safe functions here
|
|
|
|
// `restore_terminal`, `sigaction`, `raise`, and `_exit` are all async-signal-safe
|
|
|
|
|
|
|
|
restore_terminal();
|
|
|
|
|
|
|
|
let default = SigAction::new(SigHandler::SigDfl, SaFlags::empty(), SigSet::empty());
|
|
|
|
if unsafe { sigaction(Signal::SIGTERM, &default) }.is_err() {
|
|
|
|
// Failed to set signal handler to default.
|
|
|
|
// This should not be possible, but if it does happen,
|
|
|
|
// then this could result in an infinite loop due to the raise below.
|
|
|
|
// So, we'll just exit immediately if this happens.
|
|
|
|
unsafe { libc::_exit(1) };
|
|
|
|
};
|
|
|
|
|
|
|
|
if raise(Signal::SIGTERM).is_err() {
|
|
|
|
unsafe { libc::_exit(1) };
|
|
|
|
};
|
|
|
|
}
|