SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/device: do not drop backslashes in SYSTEMD_WANTS=/SYSTEMD_USER_WANTS= (#35869)

Browse Source 
Let consider the following udev rules:
```
PROGRAM="/usr/bin/systemd-escape foo-bar-baz", ENV{SYSTEMD_WANTS}+="test1@$result.service"
PROGRAM="/usr/bin/systemd-escape aaa-bbb-ccc", ENV{SYSTEMD_WANTS}+="test2@$result.service"
```
Then, a device expectedly gains a property:
```
SYSTEMD_WANTS=test1@foo\x2dbar\x2dbaz.service test2@aaa\x2dbbb\x2dccc.service
```
After the event being processed by udevd, PID1 processes the device, the
property previously was parsed with
`extract_first_word(EXTRACT_UNQUOTE)`, then the device unit gained the
following dependencies:
```
Wants=test1@foox2dbarx2dbaz.service test2@aaax2dbbbx2dccc.service
```
So both `%i` and `%I` for the template services did not match with the
original data, and it was hard to use `systemd-escape` in `PROGRAM=`
udev rule token.

This makes the property parsed with
`extract_first_word(EXTRACT_UNQUOTE|EXTRACT_RETAIN_ESCAPE)`, hence the
device unit now gains the following dependencies:
```
Wants=test1@foo\x2dbar\x2dbaz.service test2@aaa\x2dbbb\x2dccc.service
```
and `%I` for the template services match with the original data.

Fixes a bug caused by ceed8f0c8b (v233).

Fixes #16735.
Replaces #16737 and #35768.
This commit is contained in:
Yu Watanabe
2025-01-23 09:04:12 +09:00
committed by GitHub
parent ef199874ae 4c9da4dc91
commit b6b8148459
3 changed files with 109 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/device.c
+1 -1
View File
@@ -558,7 +558,7 @@ static int device_add_udev_wants(Unit *u, sd_device *dev) {
for (;;) {
_cleanup_free_ char *word = NULL, *k = NULL;
r = extract_first_word(&wants, &word, NULL, EXTRACT_UNQUOTE);
r = extract_first_word(&wants, &word, NULL, EXTRACT_UNQUOTE | EXTRACT_RETAIN_ESCAPE);
if (r == 0)
break;
if (r == -ENOMEM)
src/test/test-extract-word.c
+43
View File
@@ -547,6 +547,49 @@ TEST(extract_first_word) {
ASSERT_STREQ(t, "가너도루");
free(t);
assert_se(isempty(p));
/* For issue #16735. */
p = "test1@foo\\x2dbar\\x2dbaz.service test2@aaa\\x2dbbb\\x2dccc.service test3@escaped-path-like-data.service test4@/pure/path/like/data.service";
ASSERT_OK_POSITIVE(extract_first_word(&p, &t, NULL, EXTRACT_UNQUOTE));
ASSERT_STREQ(t, "test1@foox2dbarx2dbaz.service");
free(t);
ASSERT_OK_POSITIVE(extract_first_word(&p, &t, NULL, EXTRACT_UNQUOTE));
ASSERT_STREQ(t, "test2@aaax2dbbbx2dccc.service");
free(t);
ASSERT_OK_POSITIVE(extract_first_word(&p, &t, NULL, EXTRACT_UNQUOTE));
ASSERT_STREQ(t, "test3@escaped-path-like-data.service");
free(t);
ASSERT_OK_POSITIVE(extract_first_word(&p, &t, NULL, EXTRACT_UNQUOTE));
ASSERT_STREQ(t, "test4@/pure/path/like/data.service");
free(t);
p = "test1@foo\\x2dbar\\x2dbaz.service test2@aaa\\x2dbbb\\x2dccc.service test3@escaped-path-like-data.service test4@/pure/path/like/data.service";
ASSERT_OK_POSITIVE(extract_first_word(&p, &t, NULL, EXTRACT_UNQUOTE | EXTRACT_RETAIN_ESCAPE));
ASSERT_STREQ(t, "test1@foo\\x2dbar\\x2dbaz.service");
free(t);
ASSERT_OK_POSITIVE(extract_first_word(&p, &t, NULL, EXTRACT_UNQUOTE | EXTRACT_RETAIN_ESCAPE));
ASSERT_STREQ(t, "test2@aaa\\x2dbbb\\x2dccc.service");
free(t);
ASSERT_OK_POSITIVE(extract_first_word(&p, &t, NULL, EXTRACT_UNQUOTE | EXTRACT_RETAIN_ESCAPE));
ASSERT_STREQ(t, "test3@escaped-path-like-data.service");
free(t);
ASSERT_OK_POSITIVE(extract_first_word(&p, &t, NULL, EXTRACT_UNQUOTE | EXTRACT_RETAIN_ESCAPE));
ASSERT_STREQ(t, "test4@/pure/path/like/data.service");
free(t);
p = "test1@foo\\x2dbar\\x2dbaz.service test2@aaa\\x2dbbb\\x2dccc.service test3@escaped-path-like-data.service test4@/pure/path/like/data.service";
ASSERT_OK_POSITIVE(extract_first_word(&p, &t, NULL, EXTRACT_UNQUOTE | EXTRACT_CUNESCAPE));
ASSERT_STREQ(t, "test1@foo-bar-baz.service");
free(t);
ASSERT_OK_POSITIVE(extract_first_word(&p, &t, NULL, EXTRACT_UNQUOTE | EXTRACT_CUNESCAPE));
ASSERT_STREQ(t, "test2@aaa-bbb-ccc.service");
free(t);
ASSERT_OK_POSITIVE(extract_first_word(&p, &t, NULL, EXTRACT_UNQUOTE | EXTRACT_CUNESCAPE));
ASSERT_STREQ(t, "test3@escaped-path-like-data.service");
free(t);
ASSERT_OK_POSITIVE(extract_first_word(&p, &t, NULL, EXTRACT_UNQUOTE | EXTRACT_CUNESCAPE));
ASSERT_STREQ(t, "test4@/pure/path/like/data.service");
free(t);
}
TEST(extract_first_word_and_warn) {
test/units/TEST-17-UDEV.SYSTEMD_WANTS-escape.sh
Executable
+65
View File
@@ -0,0 +1,65 @@
#!/usr/bin/env bash
# SPDX-License-Identifier: LGPL-2.1-or-later
# shellcheck disable=SC2317
set -ex
set -o pipefail
# shellcheck source=test/units/util.sh
. "$(dirname "$0")"/util.sh
# This is a test case for #16735.
IFNAME=test-netif-foo
at_exit() {
set +e
rm -f /tmp/output-i /tmp/output-I
rm -rf /run/udev/rules.d/
udevadm control --reload
rm -f /run/systemd/system/test@.service
systemctl daemon-reload
ip link del "$IFNAME"
}
trap at_exit EXIT
udevadm settle --timeout 30
mkdir -p /run/systemd/system/
cat >/run/systemd/system/test@.service <<EOF
[Service]
Type=oneshot
ExecStart=bash -xec 'echo "i=%i" >/tmp/output-i; echo "I=/%I" >/tmp/output-I'
RemainAfterExit=yes
EOF
systemctl daemon-reload
mkdir -p /run/udev/rules.d/
cat >/run/udev/rules.d/99-testsuite.rules <<EOF
SUBSYSTEM=="net", KERNEL=="${IFNAME}", ACTION=="add", OPTIONS="log_level=debug", \
PROGRAM="/usr/bin/systemd-escape -p %S%p", ENV{SYSTEMD_WANTS}+="test@%c.service"
EOF
udevadm control --reload
ip link add "$IFNAME" type dummy
SYSPATH="/sys$(udevadm info --query=property --property DEVPATH --value "/sys/class/net/${IFNAME}")"
ESCAPED=$(systemd-escape -p "${SYSPATH}")
SHELL_ESCAPED=$(printf '%q' "${ESCAPED}")
assert_eq "$(systemd-escape -u -p "${ESCAPED}")" "${SYSPATH}"
udevadm wait --timeout 30 --settle "/sys/class/net/${IFNAME}"
assert_eq "$(udevadm info --query=property --property SYSTEMD_WANTS --value "/sys/class/net/${IFNAME}")" "test@${ESCAPED}.service"
# The value shown by systemctl is doubly escaped and quoted.
assert_eq "$(systemctl show -p Wants --value "${ESCAPED}.device")" "\"test@${SHELL_ESCAPED}.service\""
timeout 30 bash -c 'until [[ -s /tmp/output-i ]] && [[ -s /tmp/output-I ]]; do sleep .5; done'
assert_eq "$(cat /tmp/output-i)" "i=${ESCAPED}"
assert_eq "$(cat /tmp/output-I)" "I=${SYSPATH}"
exit 0