From a4482a262d6ffcc28f57b282ba8b5e6c20f8f4f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Marczell?=
 <30615058+iteroji@users.noreply.github.com>
Date: Thu, 14 Dec 2023 06:29:13 +0100
Subject: [PATCH] Added get_device_by_id to the device_manager and example
 (#117)

* Add get_device_by_id to the device_manager and example

* fixed typo in rust doc that caused doc test to fail

* Fixed format with rust fmt

* fixed unnecessary cast

---------

Co-authored-by: Andras <30615058+andy-3000@users.noreply.github.com>
---
 Cargo.toml                           |  2 ++
 examples/core/usb_device/Cargo.toml  | 12 ++++++++++
 examples/core/usb_device/src/main.rs | 21 ++++++++++++++++++
 frida/src/device_manager.rs          | 33 ++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 examples/core/usb_device/Cargo.toml
 create mode 100644 examples/core/usb_device/src/main.rs

diff --git a/Cargo.toml b/Cargo.toml
index 151fd0a..24faf57 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,7 @@ members = [
     "examples/gum/linux_no_std",
     "examples/gum/memory_access_monitor",
     "examples/core/hello",
+    "examples/core/usb_device",
     "examples/core/console_log",
 ]
 # We miss our linux_no_std example from the default members since `cargo check`
@@ -33,5 +34,6 @@ default-members = [
     "examples/gum/fast_interceptor",
     "examples/gum/memory_access_monitor",
     "examples/core/hello",
+    "examples/core/usb_device",
     "examples/core/console_log",
 ]
diff --git a/examples/core/usb_device/Cargo.toml b/examples/core/usb_device/Cargo.toml
new file mode 100644
index 0000000..a74b7de
--- /dev/null
+++ b/examples/core/usb_device/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "usb_device"
+version = "0.1.0"
+authors = ["Andras Marczell <andras@chaosrepeat.com>"]
+edition = "2018"
+license = "wxWindows"
+publish = false
+
+[dependencies]
+frida = { path = "../../../frida" }
+frida-sys = { path = "../../../frida-sys" }
+lazy_static = "1.4"
diff --git a/examples/core/usb_device/src/main.rs b/examples/core/usb_device/src/main.rs
new file mode 100644
index 0000000..c64d532
--- /dev/null
+++ b/examples/core/usb_device/src/main.rs
@@ -0,0 +1,21 @@
+use frida::DeviceType;
+
+fn main() {
+    let frida = unsafe { frida::Frida::obtain() };
+    let device_manager = frida::DeviceManager::obtain(&frida);
+
+    // get the first usb device (assuming there is one attached)
+    let device = device_manager.get_device_by_type(DeviceType::USB).unwrap();
+    assert_eq!(device.get_type(), DeviceType::USB);
+    println!(
+        "found {} with type: {}",
+        device.get_name(),
+        device.get_type()
+    );
+
+    // get the device id and use it to obtain a the device by the id
+    let device_id = device.get_id();
+    let device = device_manager.get_device_by_id(device_id).unwrap();
+    assert_eq!(device.get_id(), device_id);
+    println!("found {} with id: {}", device.get_name(), device.get_id());
+}
diff --git a/frida/src/device_manager.rs b/frida/src/device_manager.rs
index 0dbcf39..75e6dab 100644
--- a/frida/src/device_manager.rs
+++ b/frida/src/device_manager.rs
@@ -5,6 +5,7 @@
  */
 
 use frida_sys::_FridaDeviceManager;
+use std::ffi::CString;
 use std::marker::PhantomData;
 
 use crate::device::Device;
@@ -83,6 +84,38 @@ impl<'a> DeviceManager<'a> {
 
         return Ok(Device::from_raw(device_ptr));
     }
+
+    /// Returns the device with the specified id.
+    ///
+    /// # Example
+    ///
+    /// let frida = unsafe { frida::Frida::obtain() };
+    /// let device_manager = frida::DeviceManager::obtain(&frida);
+    ///
+    /// let id = "<some id>";
+    /// let device = device_manager.get_device_by_id(id).unwrap();
+    /// assert_eq!(device.get_id(), id);
+    ///
+    pub fn get_device_by_id(&'a self, device_id: &str) -> Result<Device<'a>> {
+        let mut error: *mut frida_sys::GError = std::ptr::null_mut();
+        let cstring = CString::new(device_id).unwrap();
+
+        let device_ptr = unsafe {
+            frida_sys::frida_device_manager_get_device_by_id_sync(
+                self.manager_ptr,
+                cstring.as_ptr(),
+                0,
+                std::ptr::null_mut(),
+                &mut error,
+            )
+        };
+
+        if !error.is_null() {
+            return Err(Error::DeviceLookupFailed);
+        }
+
+        return Ok(Device::from_raw(device_ptr));
+    }
 }
 
 impl<'a> Drop for DeviceManager<'a> {