mitmproxy-rs 0.7.0__tar.gz → 0.7.2__tar.gz

{mitmproxy_rs-0.7.0 → mitmproxy_rs-0.7.2}/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.7.2
+
+- Make `active_executables` raise for invalid paths on Windows.
+
+## 0.7.1
+
+- Make DnsResolver.lookup_* methods return error numbers matching `getaddrinfo`.
+
 ## 0.7.0
 
 - Set IPV6_V6ONLY flag for UDP sockets

{mitmproxy_rs-0.7.0 → mitmproxy_rs-0.7.2}/Cargo.lock

@@ -276,8 +276,7 @@ dependencies = [
 [[package]]
 name = "boringtun"
 version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "751787b019c674b9ac353f4eaa285e6711c21badb421cd8c199bf2c83b727f29"
+source = "git+https://github.com/cloudflare/boringtun?rev=e3252d9c4f4c8fc628995330f45369effd4660a1#e3252d9c4f4c8fc628995330f45369effd4660a1"
 dependencies = [
  "aead",
  "base64 0.13.1",
@@ -293,7 +292,7 @@ dependencies = [
  "rand_core",
  "ring",
  "tracing",
- "untrusted 0.9.0",
+ "untrusted",
  "x25519-dalek",
 ]
 
@@ -660,15 +659,14 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.0.0-rc.3"
+version = "4.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
  "fiat-crypto",
- "platforms",
  "rustc_version",
  "subtle",
  "zeroize",
@@ -820,9 +818,9 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.1.20"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "filetime"
@@ -1514,7 +1512,7 @@ checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd"
 
 [[package]]
 name = "macos-certificate-truster"
-version = "0.7.0"
+version = "0.7.2"
 dependencies = [
  "security-framework",
 ]
@@ -1606,7 +1604,7 @@ dependencies = [
 
 [[package]]
 name = "mitm-wg-test-client"
-version = "0.7.0"
+version = "0.7.2"
 dependencies = [
  "anyhow",
  "boringtun",
@@ -1617,7 +1615,7 @@ dependencies = [
 
 [[package]]
 name = "mitmproxy"
-version = "0.7.0"
+version = "0.7.2"
 dependencies = [
  "anyhow",
  "boringtun",
@@ -1654,7 +1652,7 @@ dependencies = [
 
 [[package]]
 name = "mitmproxy_rs"
-version = "0.7.0"
+version = "0.7.2"
 dependencies = [
  "anyhow",
  "boringtun",
@@ -1827,12 +1825,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "platforms"
-version = "3.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4c7666f2019727f9e8e14bf14456e99c707d780922869f1ba473eee101fa49"
-
 [[package]]
 name = "plotters"
 version = "0.3.6"
@@ -2201,17 +2193,17 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.16.20"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
+ "cfg-if",
+ "getrandom",
  "libc",
- "once_cell",
  "spin",
- "untrusted 0.7.1",
- "web-sys",
- "winapi",
+ "untrusted",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2395,9 +2387,9 @@ dependencies = [
 
 [[package]]
 name = "spin"
-version = "0.5.2"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "stable_deref_trait"
@@ -2781,12 +2773,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -3032,7 +3018,7 @@ dependencies = [
 
 [[package]]
 name = "windows-redirector"
-version = "0.7.0"
+version = "0.7.2"
 dependencies = [
  "anyhow",
  "env_logger",
@@ -3216,9 +3202,9 @@ dependencies = [
 
 [[package]]
 name = "x25519-dalek"
-version = "2.0.0-rc.3"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7fae07da688e17059d5886712c933bb0520f15eff2e09cfa18e30968f4e63a"
+checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
 dependencies = [
  "curve25519-dalek",
  "rand_core",

{mitmproxy_rs-0.7.0 → mitmproxy_rs-0.7.2}/Cargo.toml

@@ -6,7 +6,7 @@ authors = [
     "Fabio Valentini <decathorpe@gmail.com>",
     "Maximilian Hils <cargo@maximilianhils.com>",
 ]
-version = "0.7.0"
+version = "0.7.2"
 publish = false
 repository = "https://github.com/mitmproxy/mitmproxy-rs"
 edition = "2021"
@@ -31,7 +31,7 @@ rand_core = { version = "0.6.4", features = ["getrandom"] }
 smoltcp = "0.11"
 tokio = { version = "1.39.2", features = ["macros", "net", "rt-multi-thread", "sync", "time", "io-util", "process"] }
 boringtun = { version = "0.6", default-features = false }
-x25519-dalek = "=2.0.0-rc.3"
+x25519-dalek = "2.0.0"
 console-subscriber = { version = "0.4.0", optional = true }
 image = { version = "0.25.2", default-features = false, features = ["png", "tiff"] }
 prost = "0.13.1"
@@ -46,6 +46,7 @@ socket2 = "0.5.7"
 [patch.crates-io]
 # tokio = { path = "../tokio/tokio" }
 smoltcp = { git = 'https://github.com/smoltcp-rs/smoltcp', rev = 'ef67e7b46cabf49783053cbf68d8671ed97ff8d4' }
+boringtun = { git = 'https://github.com/cloudflare/boringtun', rev = 'e3252d9c4f4c8fc628995330f45369effd4660a1' }
 
 [target.'cfg(windows)'.dependencies.windows]
 version = "0.57.0"

{mitmproxy_rs-0.7.0 → mitmproxy_rs-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mitmproxy_rs
-Version: 0.7.0
+Version: 0.7.2
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -9,8 +9,8 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Development Status :: 5 - Production/Stable
-Requires-Dist: mitmproxy-windows ==0.7.0 ; os_name == 'nt'
-Requires-Dist: mitmproxy-macos ==0.7.0 ; sys_platform == 'darwin'
+Requires-Dist: mitmproxy-windows ==0.7.2 ; os_name == 'nt'
+Requires-Dist: mitmproxy-macos ==0.7.2 ; sys_platform == 'darwin'
 Author: Fabio Valentini <decathorpe@gmail.com>, Maximilian Hils <cargo@maximilianhils.com>
 Author-email: Fabio Valentini <decathorpe@gmail.com>, Maximilian Hils <cargo@maximilianhils.com>
 License: MIT

{mitmproxy_rs-0.7.0 → mitmproxy_rs-0.7.2}/mitmproxy-macos/redirector/ipc/mitmproxy_ipc.pb.swift

@@ -1,5 +1,6 @@
 // DO NOT EDIT.
 // swift-format-ignore-file
+// swiftlint:disable all
 //
 // Generated by the Swift generator plugin for the protocol buffer compiler.
 // Source: mitmproxy_ipc.proto

{mitmproxy_rs-0.7.0 → mitmproxy_rs-0.7.2}/mitmproxy-macos/version-info.toml

@@ -12,7 +12,7 @@ authors = [
     "Fabio Valentini <decathorpe@gmail.com>",
     "Maximilian Hils <cargo@maximilianhils.com>",
 ]
-version = "0.7.0"
+version = "0.7.2"
 publish = false
 repository = "https://github.com/mitmproxy/mitmproxy-rs"
 edition = "2021"
@@ -37,7 +37,7 @@ rand_core = { version = "0.6.4", features = ["getrandom"] }
 smoltcp = "0.11"
 tokio = { version = "1.39.2", features = ["macros", "net", "rt-multi-thread", "sync", "time", "io-util", "process"] }
 boringtun = { version = "0.6", default-features = false }
-x25519-dalek = "=2.0.0-rc.3"
+x25519-dalek = "2.0.0"
 console-subscriber = { version = "0.4.0", optional = true }
 image = { version = "0.25.2", default-features = false, features = ["png", "tiff"] }
 prost = "0.13.1"
@@ -52,6 +52,7 @@ socket2 = "0.5.7"
 [patch.crates-io]
 # tokio = { path = "../tokio/tokio" }
 smoltcp = { git = 'https://github.com/smoltcp-rs/smoltcp', rev = 'ef67e7b46cabf49783053cbf68d8671ed97ff8d4' }
+boringtun = { git = 'https://github.com/cloudflare/boringtun', rev = 'e3252d9c4f4c8fc628995330f45369effd4660a1' }
 
 [target.'cfg(windows)'.dependencies.windows]
 version = "0.57.0"

{mitmproxy_rs-0.7.0 → mitmproxy_rs-0.7.2}/mitmproxy-rs/src/dns_resolver.rs

@@ -1,4 +1,5 @@
 use mitmproxy::dns::{ResolveErrorKind, ResolveResult, ResponseCode, DNS_SERVERS};
+use once_cell::sync::OnceCell;
 use pyo3::exceptions::socket::gaierror;
 use pyo3::prelude::*;
 use pyo3::types::PyAny;
@@ -77,6 +78,30 @@ pub fn get_system_dns_servers() -> PyResult<Vec<String>> {
     })
 }
 
+struct AddrInfoErrorConst(&'static str, OnceCell<isize>);
+impl AddrInfoErrorConst {
+    const fn new(identifier: &'static str) -> Self {
+        AddrInfoErrorConst(identifier, OnceCell::new())
+    }
+    fn get(&self) -> isize {
+        *self.1.get_or_init(|| {
+            Python::with_gil(|py| {
+                py.import_bound("socket")
+                    .and_then(|m| m.getattr(self.0))
+                    .and_then(|m| m.extract())
+                    .unwrap_or_else(|e| {
+                        log::error!("Failed to resolve socket constant: {e}");
+                        0
+                    })
+            })
+        })
+    }
+}
+
+static EAI_AGAIN: AddrInfoErrorConst = AddrInfoErrorConst::new("EAI_AGAIN");
+static EAI_NONAME: AddrInfoErrorConst = AddrInfoErrorConst::new("EAI_NONAME");
+static EAI_NODATA: AddrInfoErrorConst = AddrInfoErrorConst::new("EAI_NODATA");
+
 fn resolve_result_to_py(resolved: ResolveResult<Vec<IpAddr>>) -> Result<Vec<String>, PyErr> {
     match resolved {
         Ok(resp) => Ok(resp
@@ -87,12 +112,12 @@ fn resolve_result_to_py(resolved: ResolveResult<Vec<IpAddr>>) -> Result<Vec<Stri
             ResolveErrorKind::NoRecordsFound {
                 response_code: ResponseCode::NXDomain,
                 ..
-            } => Err(gaierror::new_err("NXDOMAIN")),
+            } => Err(gaierror::new_err((EAI_NONAME.get(), "NXDOMAIN"))),
             ResolveErrorKind::NoRecordsFound {
                 response_code: ResponseCode::NoError,
                 ..
-            } => Err(gaierror::new_err("NOERROR")),
-            _ => Err(gaierror::new_err(e.to_string())),
+            } => Err(gaierror::new_err((EAI_NODATA.get(), "NOERROR"))),
+            _ => Err(gaierror::new_err((EAI_AGAIN.get(), e.to_string()))),
         },
     }
 }

{mitmproxy_rs-0.7.0 → mitmproxy_rs-0.7.2}/pyproject.toml

@@ -17,8 +17,8 @@ classifiers = [
 ]
 
 dependencies = [
-    "mitmproxy_windows==0.7.0; os_name == 'nt'",
-    "mitmproxy_macos==0.7.0; sys_platform == 'darwin'",
+    "mitmproxy_windows==0.7.2; os_name == 'nt'",
+    "mitmproxy_macos==0.7.2; sys_platform == 'darwin'",
 ]
 
 [tool.black]

{mitmproxy_rs-0.7.0 → mitmproxy_rs-0.7.2}/src/ipc/mitmproxy_ipc.rs

@@ -6,7 +6,6 @@
 // or file a PR and let CI handle it.
 
 /// Packet with associated tunnel info (Windows pipe to mitmproxy)
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PacketWithMeta {
     #[prost(bytes = "vec", tag = "1")]
@@ -14,7 +13,6 @@ pub struct PacketWithMeta {
     #[prost(message, optional, tag = "2")]
     pub tunnel_info: ::core::option::Option<TunnelInfo>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TunnelInfo {
     #[prost(uint32, tag = "1")]
@@ -23,7 +21,6 @@ pub struct TunnelInfo {
     pub process_name: ::core::option::Option<::prost::alloc::string::String>,
 }
 /// Packet or intercept spec (Windows pipe to redirector)
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct FromProxy {
     #[prost(oneof = "from_proxy::Message", tags = "1, 2")]
@@ -31,7 +28,6 @@ pub struct FromProxy {
 }
 /// Nested message and enum types in `FromProxy`.
 pub mod from_proxy {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Message {
         #[prost(message, tag = "1")]
@@ -41,14 +37,12 @@ pub mod from_proxy {
     }
 }
 /// Packet (macOS UDP Stream)
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Packet {
     #[prost(bytes = "vec", tag = "1")]
     pub data: ::prost::alloc::vec::Vec<u8>,
 }
 /// Intercept conf (macOS Control Stream)
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct InterceptConf {
     #[prost(bool, tag = "1")]
@@ -57,7 +51,6 @@ pub struct InterceptConf {
     pub actions: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
 /// New flow (macOS TCP/UDP Stream)
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct NewFlow {
     #[prost(oneof = "new_flow::Message", tags = "1, 2")]
@@ -65,7 +58,6 @@ pub struct NewFlow {
 }
 /// Nested message and enum types in `NewFlow`.
 pub mod new_flow {
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Message {
         #[prost(message, tag = "1")]
@@ -74,7 +66,6 @@ pub mod new_flow {
         Udp(super::UdpFlow),
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TcpFlow {
     #[prost(message, optional, tag = "1")]
@@ -82,7 +73,6 @@ pub struct TcpFlow {
     #[prost(message, optional, tag = "2")]
     pub tunnel_info: ::core::option::Option<TunnelInfo>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UdpFlow {
     #[prost(message, optional, tag = "1")]
@@ -90,7 +80,6 @@ pub struct UdpFlow {
     #[prost(message, optional, tag = "3")]
     pub tunnel_info: ::core::option::Option<TunnelInfo>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UdpPacket {
     #[prost(bytes = "vec", tag = "1")]
@@ -98,7 +87,6 @@ pub struct UdpPacket {
     #[prost(message, optional, tag = "2")]
     pub remote_address: ::core::option::Option<Address>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Address {
     #[prost(string, tag = "1")]

{mitmproxy_rs-0.7.0 → mitmproxy_rs-0.7.2}/src/processes/windows_icons.rs

@@ -36,6 +36,11 @@ impl IconCache {
                 Ok(self.icons.get(e.get()).unwrap())
             }
             Entry::Vacant(e) => {
+                if !e.key().exists() {
+                    // ExtractAssociatedIconW always returns a placeholder icon for invalid paths.
+                    // We want unknown paths to raise on all platforms.
+                    bail!("Executable does not exist.");
+                }
                 let pixels = unsafe {
                     let hinst = GetModuleHandleW(None)?;
                     icon_for_executable(e.key(), hinst)?
@@ -167,3 +172,23 @@ unsafe fn icon_to_pixels(icon: HICON) -> PixelData {
         height: height_u32,
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn png() {
+        let path = PathBuf::from("C:\\Windows\\System32\\calc.exe");
+        let mut icon_cache = IconCache::default();
+        let vec = icon_cache.get_png(path).unwrap();
+        assert!(!vec.is_empty());
+    }
+
+    #[test]
+    fn no_icon_found() {
+        let path = PathBuf::from("invalid path");
+        let mut icon_cache = IconCache::default();
+        assert!(icon_cache.get_png(path).is_err());
+    }
+}