diff options
author | Chris Down <chris@chrisdown.name> | 2022-11-01 00:17:21 +0000 |
---|---|---|
committer | Craig Small <csmall@dropbear.xyz> | 2023-01-15 04:05:40 +0000 |
commit | 866abacf8805a74fb7c59cae1f64963e0a540b14 (patch) | |
tree | 56ad0980a9a39cbfa8eabbe8406ffbcb98729ac2 /testsuite | |
parent | 1db14dafd95e29b1d9aca5dc1775598aabc0a24b (diff) | |
download | procps-ng-866abacf8805a74fb7c59cae1f64963e0a540b14.tar.gz |
pgrep: Support matching on the presence of a userspace signal handler
In production we've had several incidents over the years where a process
has a signal handler registered for SIGHUP or one of the SIGUSR signals
which can be used to signal a request to reload configs, rotate log
files, and the like. While this may seem harmless enough, what we've
seen happen repeatedly is something like the following:
1. A process is using SIGHUP/SIGUSR[12] to request some
application-handled state change -- reloading configs, rotating a log
file, etc;
2. This kind of request is deprecated and removed, so the signal handler
is removed. However, a site where the signal might be sent from is
missed (often logrotate or a service manager);
3. Because the default disposition of these signals is terminal, sooner
or later these applications are going to be sent SIGHUP or similar
and end up unexpectedly killed.
I know for a fact that we're not the only organisation experiencing
this: in general, signal use is pretty tricky to reason about and safely
remove because of the fairly aggressive SIG_DFL behaviour for some
common signals, especially for SIGHUP which has a particularly ambiguous
meaning. Especially in a large, highly interconnected codebase,
reasoning about signal interactions between system configuration and
applications can be highly complex, and it's inevitable that on occasion
a callsite will be missed.
In some cases the right call to avoid this will be to migrate services
towards other forms of IPC for this purpose, but inevitably there will
be some services which must continue using signals, so we need a safe
way to support them.
This patch adds support for the -H/--require-handler flag, which matches
on processes with a userspace handler present for the signal being sent.
With this flag we can enforce that all SIGHUP reload cases and SIGUSR
equivalents use --require-handler. This effectively mitigates the case
we've seen time and time again where SIGHUP is used to rotate log files
or reload configs, but the sending site is mistakenly left present after
the removal of signal handler, resulting in unintended termination of
the process.
Signed-off-by: Chris Down <chris@chrisdown.name>
Diffstat (limited to 'testsuite')
-rw-r--r-- | testsuite/pgrep.test/pgrep.exp | 3 | ||||
-rw-r--r-- | testsuite/pwait.test/pwait.exp | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/testsuite/pgrep.test/pgrep.exp b/testsuite/pgrep.test/pgrep.exp index e57e044..1110e70 100644 --- a/testsuite/pgrep.test/pgrep.exp +++ b/testsuite/pgrep.test/pgrep.exp @@ -20,6 +20,7 @@ make_testproc set testproc_len [ string length $testproc_comm ] set testproc_trim [ string range $testproc_comm 0 [ expr { $testproc_len - 2 } ] ] set testproc1_sid [ string trim [ exec $ps --no-headers -o sid $testproc1_pid ] ] +set not_testproc1_sid [ expr { $testproc1_sid + 1 } ] set test "pgrep find both test pids" spawn $pgrep $testproc_comm @@ -75,7 +76,7 @@ spawn $pgrep -s $testproc1_sid $testproc_comm expect_pass "$test" "^$testproc1_pid\\s+$testproc2_pid\\s*$" set test "pgrep doesn't match with bogus sid" -spawn $pgrep -s -1 $testproc_comm +spawn $pgrep -s $not_testproc1_sid $testproc_comm expect_blank "$test" set test "pgrep matches on tty" diff --git a/testsuite/pwait.test/pwait.exp b/testsuite/pwait.test/pwait.exp index 5ec6bed..060024f 100644 --- a/testsuite/pwait.test/pwait.exp +++ b/testsuite/pwait.test/pwait.exp @@ -20,6 +20,10 @@ expect_pass "$test" "^\(lt-\)\?pwait: no matching criteria specified\\s*" make_testproc +set ps "${topdir}src/ps/pscommand" +set testproc1_sid [ string trim [ exec $ps --no-headers -o sid $testproc1_pid ] ] +set not_testproc1_sid [ expr { $testproc1_sid + 1 } ] + set test "pwait with not matching gid" spawn $pwait -G $not_gid $testproc_comm expect_blank $test @@ -29,7 +33,7 @@ spawn $pwait -P $not_ppid $testproc_comm expect_blank "$test" set test "pwait doesn't match with bogus sid" -spawn $pwait -s -1 $testproc_comm +spawn $pwait -s $not_testproc1_sid $testproc_comm expect_blank "$test" set test "pwait doesn't match with bogus tty" |