Macos processes

.gitignore

@@ -6,3 +6,4 @@
 /docs/
 __pycache__/
 *.xcuserstate
+*.DS_Store

Cargo.toml

@@ -45,6 +45,9 @@ prost = "0.12.0"
 tokio-util = { version = "0.7.8", features = ["codec"] }
 futures-util = { version = "0.3.28", features = ["sink"] }
 
+sysinfo = "0.29.10"
+data-encoding = "2.4.0"
+
 # [patch.crates-io]
 # tokio = { path = "../tokio/tokio" }
 # smoltcp = { git = 'https://github.com/mhils/smoltcp', rev = 'f65351adfa92db5193f368368cb668bac721fe43' }
@@ -68,6 +71,10 @@ features = [
 [target.'cfg(target_os = "macos")'.dependencies]
 apple-security-framework = "2.9.2"
 nix = { version = "0.27.1", default-features = false, features = ["fs"] }
+core-graphics = "0.23"
+core-foundation = "0.9"
+cocoa = "0.25"
+objc = "0.2"
 
 [dev-dependencies]
 env_logger = "0.10"

benches/process.rs

@@ -1,4 +1,6 @@
 use criterion::{criterion_group, criterion_main, Criterion};
+#[cfg(target_os = "macos")]
+use mitmproxy::macos::icons;
 #[cfg(windows)]
 use mitmproxy::windows::{icons, processes};
 
@@ -45,6 +47,27 @@ fn criterion_benchmark(c: &mut Criterion) {
             b.iter(processes::active_executables)
         });
     }
+    #[cfg(target_os = "macos")]
+    {
+        let test_app = std::path::PathBuf::from(
+            "/System/Library/CoreServices/Finder.app/Contents/MacOS/Finder",
+        );
+
+        c.bench_function("get_png", |b| {
+            b.iter(|| {
+                icons::IconCache::default()
+                    .get_png(test_app.clone())
+                    .unwrap();
+            })
+        });
+
+        let mut cache = icons::IconCache::default();
+        c.bench_function("get_png (cached)", |b| {
+            b.iter(|| {
+                cache.get_png(test_app.clone()).unwrap();
+            })
+        });
+    }
 }
 
 criterion_group!(benches, criterion_benchmark);

mitmproxy-rs/src/process_info.rs

@@ -3,10 +3,12 @@ use std::path::{Path, PathBuf};
 use anyhow::Result;
 use pyo3::prelude::*;
 
+#[cfg(target_os = "macos")]
+use mitmproxy::macos::{icons, processes};
 #[allow(unused_imports)]
-use mitmproxy::processes::{image, ProcessList};
+use mitmproxy::processes::image;
 #[cfg(windows)]
-use mitmproxy::windows;
+use mitmproxy::windows::{icons, processes};
 
 #[pyclass(module = "mitmproxy_rs", frozen)]
 pub struct Process(mitmproxy::processes::ProcessInfo);
@@ -46,13 +48,13 @@ impl Process {
 /// *Availability: Windows*
 #[pyfunction]
 pub fn active_executables() -> PyResult<Vec<Process>> {
-    #[cfg(windows)]
+    #[cfg(any(windows, target_os = "macos"))]
     {
-        windows::processes::active_executables()
+        processes::active_executables()
             .map(|p| p.into_iter().map(Process).collect())
             .map_err(|e| pyo3::exceptions::PyRuntimeError::new_err(format!("{}", e)))
     }
-    #[cfg(not(windows))]
+    #[cfg(not(any(windows, target_os = "macos")))]
     Err(pyo3::exceptions::PyNotImplementedError::new_err(
         "active_executables is only available on Windows",
     ))
@@ -61,15 +63,15 @@ pub fn active_executables() -> PyResult<Vec<Process>> {
 #[pyfunction]
 #[allow(unused_variables)]
 pub fn executable_icon(path: PathBuf) -> Result<PyObject> {
-    #[cfg(windows)]
+    #[cfg(any(windows, target_os = "macos"))]
     {
-        let mut icon_cache = windows::icons::ICON_CACHE.lock().unwrap();
+        let mut icon_cache = icons::ICON_CACHE.lock().unwrap();
         let png_bytes = icon_cache.get_png(path)?;
         Ok(Python::with_gil(|py| {
             pyo3::types::PyBytes::new(py, png_bytes).to_object(py)
         }))
     }
-    #[cfg(not(windows))]
+    #[cfg(not(any(windows, target_os = "macos")))]
     Err(pyo3::exceptions::PyNotImplementedError::new_err(
         "executable_icon is only available on Windows",
     )

mitmproxy-rs/src/util.rs

@@ -90,7 +90,7 @@ pub fn add_cert(py: Python<'_>, pem: String) -> PyResult<()> {
             return Err(anyhow!("{} does not exist", executable_path.display()).into());
         }
         let der = BASE64.decode(pem_body.as_bytes()).unwrap();
-        match macos::add_cert(der, executable_path.to_str().unwrap()) {
+        match macos::certificates::add_cert(der, executable_path.to_str().unwrap()) {
             Ok(_) => Ok(()),
             Err(e) => Err(PyErr::new::<PyOSError, _>(format!(
                 "Failed to add certificate: {:?}",
@@ -109,7 +109,7 @@ pub fn add_cert(py: Python<'_>, pem: String) -> PyResult<()> {
 pub fn remove_cert() -> PyResult<()> {
     #[cfg(target_os = "macos")]
     {
-        match macos::remove_cert() {
+        match macos::certificates::remove_cert() {
             Ok(_) => Ok(()),
             Err(e) => Err(PyErr::new::<PyOSError, _>(format!(
                 "Failed to remove certificate: {:?}",