From 3829b3f8b2f521ca2f4034115e01a2f8ca95b98e Mon Sep 17 00:00:00 2001 From: C Date: Fri, 20 Nov 2026 18:06:14 -0800 Subject: [PATCH] fix: pkexec privilege escalation --- embedded/add_udev_rules.sh | 16 ---------- src/udev_helper.c | 63 +++++++++++++++++++++++++------------- 2 files changed, 41 insertions(+), 38 deletions(-) delete mode 100644 embedded/add_udev_rules.sh diff --git a/embedded/add_udev_rules.sh b/embedded/add_udev_rules.sh deleted file mode 100644 index d6e2c4e..0000000 --- a/embedded/add_udev_rules.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -e - -cat > /etc/udev/rules.d/turdusra1n.rules <<'EOF' -SUBSYSTEM=="usb", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1227", GROUP="plugdev", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1338", GROUP="plugdev", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="4141", GROUP="plugdev", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1281", GROUP="plugdev", MODE="0666" -EOF - -getent group plugdev >/dev/null 2>&1 || groupadd plugdev -usermod -aG plugdev "$USER" - -udevadm control --reload-rules -udevadm trigger diff --git a/src/udev_helper.c b/src/udev_helper.c index 6a2d800..034ac1e 100644 --- a/src/udev_helper.c +++ b/src/udev_helper.c @@ -29,13 +29,22 @@ #include "udev_helper.h" +#include #include #include -#include +#include #include // waitpid -#include // chmod +#include -#include "gen/embedded/add_udev_rules.h" +static const char *current_username(void) +{ + struct passwd *pw = getpwuid(getuid()); + if (pw && pw->pw_name && pw->pw_name[0] != '\0') { + return pw->pw_name; + } + const char *env_user = getenv("USER"); + return (env_user && env_user[0] != '\0') ? env_user : NULL; +} int udev_rules_exist(void) { @@ -44,36 +53,46 @@ int udev_rules_exist(void) int add_udev_rules(void) { - FILE *f = fopen("/tmp/udevhelper.sh", "wb"); - if (!f) - return 1; + static const char *script = + "set -e\n" + "cat > /etc/udev/rules.d/turdusra1n.rules <<'EOF'\n" + "SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"05ac\", ATTRS{idProduct}==\"1227\", GROUP=\"plugdev\", MODE=\"0666\"\n" + "SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"05ac\", ATTRS{idProduct}==\"1338\", GROUP=\"plugdev\", MODE=\"0666\"\n" + "SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"05ac\", ATTRS{idProduct}==\"4141\", GROUP=\"plugdev\", MODE=\"0666\"\n" + "SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"05ac\", ATTRS{idProduct}==\"1281\", GROUP=\"plugdev\", MODE=\"0666\"\n" + "EOF\n" + "getent group plugdev >/dev/null 2>&1 || groupadd plugdev\n" + "if [ -n \"$1\" ]; then\n" + " usermod -aG plugdev \"$1\"\n" + "fi\n" + "udevadm control --reload-rules\n" + "udevadm trigger\n"; - fwrite( - embedded_add_udev_rules_sh, - 1, - embedded_add_udev_rules_sh_len, - f - ); - fclose(f); - - chmod("/tmp/udevhelper.sh", 0700); + const char *user = current_username(); pid_t pid = fork(); - if (pid < 0) { - unlink("/tmp/udevhelper.sh"); return 1; } if (pid == 0) { - execlp("pkexec", "pkexec", "/tmp/udevhelper.sh", (char *)NULL); - exit(1); + execlp( + "pkexec", + "pkexec", + "sh", + "-c", + script, + "turdusra1n-udev", + user ? user : "", + (char *)NULL + ); + _exit(127); } int status; - waitpid(pid, &status, 0); - - unlink("/tmp/udevhelper.sh"); + if (waitpid(pid, &status, 0) < 0) { + return 1; + } return WIFEXITED(status) ? WEXITSTATUS(status) : 1; }