Skip to content

fix(udev) Resolve permission errors when unhiding devices (#582) #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dripsnek wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(udev) Resolve permission errors when unhiding devices (#582) #586

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/udev/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ pub mod device_test;

pub mod device;

use std::{error::Error, fs, path::PathBuf};
use std::{
error::Error,
fs,
path::{Path, PathBuf},
};

use tokio::process::Command;
use udev::Enumerator;
Expand Down Expand Up @@ -46,16 +50,21 @@ pub async fn hide_device(path: &str, flags: &[HideFlag]) -> Result<(), Box<dyn E
return Err("Unable to determine chmod command location".into());
};
let chmod_cmd = chmod_cmd.to_string_lossy().to_string();
// Find the setfacl command to clear any facls as we are overwriting using chmod
let Some(setfacl_cmd) = find_executable("setfacl") else {
return Err("Unable to determine setfacl command location".into());
};
let setfacl_cmd = setfacl_cmd.to_string_lossy().to_string();

// Build the rule content
chmod_early_rule = format!(
r#"KERNEL=="js[0-9]*|event[0-9]*", SUBSYSTEM=="{subsystem}", MODE:="0000", GROUP:="root", RUN+="{chmod_cmd} 000 /dev/input/%k", SYMLINK+="inputplumber/by-hidden/%k"
KERNEL=="hidraw[0-9]*", SUBSYSTEM=="{subsystem}", MODE:="0000", GROUP:="root", RUN+="{chmod_cmd} 000 /dev/%k", SYMLINK+="inputplumber/by-hidden/%k"
r#"KERNEL=="js[0-9]*|event[0-9]*", SUBSYSTEM=="{subsystem}", MODE:="0000", GROUP:="root", RUN+="{chmod_cmd} 000 /dev/input/%k", RUN+="{setfacl_cmd} -b /dev/input/%k", SYMLINK+="inputplumber/by-hidden/%k"
KERNEL=="hidraw[0-9]*", SUBSYSTEM=="{subsystem}", MODE:="0000", GROUP:="root", RUN+="{chmod_cmd} 000 /dev/%k", RUN+="{setfacl_cmd} -b /dev/%k", SYMLINK+="inputplumber/by-hidden/%k"
"#
);
chmod_late_rule = format!(
r#"KERNEL=="js[0-9]*|event[0-9]*", SUBSYSTEM=="{subsystem}", MODE="000", GROUP="root", TAG-="uaccess", RUN+="{chmod_cmd} 000 /dev/input/%k"
KERNEL=="hidraw[0-9]*", SUBSYSTEM=="{subsystem}", MODE="000", GROUP="root", TAG-="uaccess", RUN+="{chmod_cmd} 000 /dev/%k"
r#"KERNEL=="js[0-9]*|event[0-9]*", SUBSYSTEM=="{subsystem}", MODE="000", GROUP="root", TAG-="uaccess", RUN+="{chmod_cmd} 000 /dev/input/%k", RUN+="{setfacl_cmd} -b /dev/input/%k"
KERNEL=="hidraw[0-9]*", SUBSYSTEM=="{subsystem}", MODE="000", GROUP="root", TAG-="uaccess", RUN+="{chmod_cmd} 000 /dev/%k", RUN+="{setfacl_cmd} -b /dev/%k"
"#
);
}
Expand Down Expand Up @@ -180,6 +189,11 @@ pub async fn unhide_all() -> Result<(), Box<dyn Error>> {
fs::remove_file(path)?;
}

if !Path::new("/dev/inputplumber/sources").is_dir() {
reload_all().await?;
return Ok(());
}

// Move all devices back
let entries = fs::read_dir("/dev/inputplumber/sources")?;
for entry in entries {
Expand Down