fix(Device Hiding): move hidden device nodes to /dev/inputplumber/sources

Author: ShadowApex

src/udev/mod.rs

@@ -30,11 +30,33 @@ pub async fn hide_device(path: &str) -> Result<(), Box<dyn Error>> {
         return Err("Unable to create match rule for device".into());
     };
 
+    // Create the directory to move devnodes to
+    tokio::fs::create_dir_all("/dev/inputplumber/sources").await?;
+
     // Find the chmod command to use for hiding
     let chmod_cmd = if Path::new("/bin/chmod").exists() {
-        "/bin/chmod"
+        "/bin/chmod".to_string()
+    } else if Path::new("/usr/bin/chmod").exists() {
+        "/usr/bin/chmod".to_string()
     } else {
-        "/usr/bin/chmod"
+        let output = Command::new("which").arg("chmod").output().await?;
+        if !output.status.success() {
+            return Err("Unable to determine chmod command location".into());
+        }
+        str::from_utf8(output.stdout.as_slice())?.trim().to_string()
+    };
+
+    // Find the mv command to use for hiding
+    let mv_cmd = if Path::new("/bin/mv").exists() {
+        "/bin/mv".to_string()
+    } else if Path::new("/usr/bin/mv").exists() {
+        "/usr/bin/mv".to_string()
+    } else {
+        let output = std::process::Command::new("which").arg("mv").output()?;
+        if !output.status.success() {
+            return Err("Unable to determine mv command location".into());
+        }
+        str::from_utf8(output.stdout.as_slice())?.trim().to_string()
     };
 
     // Create an early udev rule to hide the device
@@ -44,8 +66,10 @@ pub async fn hide_device(path: &str) -> Result<(), Box<dyn Error>> {
 {match_rule}, GOTO="inputplumber_valid"
 GOTO="inputplumber_end"
 LABEL="inputplumber_valid"
-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"
+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"
+KERNEL=="js[0-9]*|event[0-9]*", SUBSYSTEM=="{subsystem}", RUN+="{mv_cmd} /dev/input/%k /dev/inputplumber/sources/%k"
+KERNEL=="hidraw[0-9]*", SUBSYSTEM=="{subsystem}", RUN+="{mv_cmd} /dev/%k /dev/inputplumber/sources/%k"
 LABEL="inputplumber_end"
 "#
     );
@@ -65,6 +89,8 @@ GOTO="inputplumber_end"
 LABEL="inputplumber_valid"
 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"
+KERNEL=="js[0-9]*|event[0-9]*", SUBSYSTEM=="{subsystem}", RUN+="{mv_cmd} /dev/input/%k /dev/inputplumber/sources/%k"
+KERNEL=="hidraw[0-9]*", SUBSYSTEM=="{subsystem}", RUN+="{mv_cmd} /dev/%k /dev/inputplumber/sources/%k"
 LABEL="inputplumber_end"
 "#
     );
@@ -96,6 +122,17 @@ pub async fn unhide_device(path: String) -> Result<(), Box<dyn Error>> {
     );
     fs::remove_file(rule_path)?;
 
+    // Move the device back
+    let src_path = format!("/dev/inputplumber/sources/{name}");
+    let dst_path = if name.as_str().starts_with("event") {
+        format!("/dev/input/{name}")
+    } else {
+        format!("/dev/{name}")
+    };
+    if let Err(e) = fs::rename(&src_path, &dst_path) {
+        log::warn!("Failed to move device node from {src_path} to {dst_path}: {e}");
+    }
+
     // Reload udev
     reload_children(parent).await?;
 
@@ -104,6 +141,7 @@ pub async fn unhide_device(path: String) -> Result<(), Box<dyn Error>> {
 
 /// Unhide all devices hidden by InputPlumber
 pub async fn unhide_all() -> Result<(), Box<dyn Error>> {
+    // Remove all created udev rules
     let entries = fs::read_dir(RULES_PREFIX)?;
     for entry in entries {
         let Ok(entry) = entry else {
@@ -117,6 +155,24 @@ pub async fn unhide_all() -> Result<(), Box<dyn Error>> {
         fs::remove_file(path)?;
     }
 
+    // Move all devices back
+    let entries = fs::read_dir("/dev/inputplumber/sources")?;
+    for entry in entries {
+        let Ok(entry) = entry else {
+            continue;
+        };
+        let path = entry.path();
+        let name = entry.file_name().to_string_lossy().to_string();
+        let dst_path = if name.as_str().starts_with("event") {
+            format!("/dev/input/{name}")
+        } else {
+            format!("/dev/{name}")
+        };
+        if let Err(e) = fs::rename(&path, &dst_path) {
+            log::warn!("Failed to move device node from {path:?} to {dst_path}: {e}");
+        }
+    }
+
     // Reload udev rules
     reload_all().await?;