ask-password: do not reuse flags across Varlink calls
The flags parameter is parsed into a global variable, which means
when there are multiple consecutive calls it is reused. Switch to
a local copy.
Follow-up for 066f6bfb62
Assisted-by: kres (claude-opus-4-7)
Co-developed-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -6,9 +6,15 @@ set -o pipefail
|
||||
# shellcheck source=test/units/util.sh
|
||||
. "$(dirname "$0")"/util.sh
|
||||
|
||||
KEY=""
|
||||
SOCKET_DIR=""
|
||||
|
||||
at_exit() {
|
||||
set +e
|
||||
systemctl stop waldo-ask-pw-agent.service
|
||||
systemctl stop test-askpw.service
|
||||
[[ -n "$KEY" ]] && keyctl unlink "$KEY" @u
|
||||
rm -rf "$SOCKET_DIR"
|
||||
}
|
||||
|
||||
trap at_exit EXIT
|
||||
@@ -22,3 +28,23 @@ varlinkctl introspect /run/systemd/io.systemd.AskPassword
|
||||
systemd-run -u waldo-ask-pw-agent.service -p Environment=SYSTEMD_ASK_PASSWORD_AGENT_PASSWORD=waldo -p Type=notify systemd-tty-ask-password-agent --watch --console=/dev/console
|
||||
assert_eq "$(systemd-ask-password --no-tty)" "waldo"
|
||||
assert_eq "$(varlinkctl call /usr/bin/systemd-ask-password io.systemd.AskPassword.Ask '{"message":"foobar"}' | jq '.passwords[0]')" "\"waldo\""
|
||||
|
||||
# Per-request Varlink Ask flags must not leak across calls sharing one connection
|
||||
SOCKET_DIR="$(mktemp -d)"
|
||||
sock="$SOCKET_DIR/ask.sock"
|
||||
KEY="$(keyctl add user test-askpw hunter2 @u)"
|
||||
|
||||
systemd-run --unit=test-askpw.service -p Type=notify -p KeyringMode=shared \
|
||||
systemd-socket-activate --accept --fdname=varlink -l "$sock" -- \
|
||||
systemd-ask-password
|
||||
|
||||
# timeoutUSec:0 disables the agent, so the keyring cache is the only source.
|
||||
req_cached='{"method":"io.systemd.AskPassword.Ask","parameters":{"keyname":"test-askpw","timeoutUSec":0,"acceptCached":true}}'
|
||||
req_plain='{"method":"io.systemd.AskPassword.Ask","parameters":{"keyname":"test-askpw","timeoutUSec":0}}'
|
||||
printf '%s\0%s\0' "$req_cached" "$req_plain" | socat -t20 - "UNIX-CONNECT:$sock" >"$SOCKET_DIR/replies"
|
||||
mapfile -d '' -t replies <"$SOCKET_DIR/replies"
|
||||
|
||||
assert_eq "${#replies[@]}" "2"
|
||||
assert_in "hunter2" "${replies[0]}"
|
||||
assert_not_in "hunter2" "${replies[1]}"
|
||||
assert_in "NoPasswordAvailable" "${replies[1]}"
|
||||
|
||||
Reference in New Issue
Block a user