From 4fca58a2f3dbfde63cc846c8ce1161f29253c7ff Mon Sep 17 00:00:00 2001 From: Jackson Coxson Date: Wed, 13 Aug 2025 08:06:58 -0600 Subject: [PATCH] Cargo fmt check during CI --- idevice/src/ca.rs | 4 +-- idevice/src/pairing_file.rs | 2 +- idevice/src/provider.rs | 2 +- idevice/src/services/amfi.rs | 2 +- idevice/src/services/core_device_proxy.rs | 2 +- idevice/src/services/crashreportcopymobile.rs | 2 +- idevice/src/services/debug_proxy.rs | 2 +- idevice/src/services/diagnostics_relay.rs | 27 ++++++------------- .../src/services/dvt/location_simulation.rs | 3 ++- idevice/src/services/dvt/message.rs | 6 ++--- idevice/src/services/dvt/mod.rs | 2 +- idevice/src/services/dvt/process_control.rs | 2 +- idevice/src/services/heartbeat.rs | 2 +- idevice/src/services/house_arrest.rs | 2 +- idevice/src/services/lockdown.rs | 2 +- idevice/src/services/misagent.rs | 2 +- idevice/src/services/mobilebackup2.rs | 1 - idevice/src/services/os_trace_relay.rs | 2 +- idevice/src/services/restore_service.rs | 2 +- idevice/src/services/rsd.rs | 2 +- idevice/src/services/springboardservices.rs | 2 +- idevice/src/services/syslog_relay.rs | 2 +- idevice/src/sni.rs | 12 ++++----- idevice/src/tcp/adapter.rs | 4 +-- idevice/src/tcp/handle.rs | 6 ++--- idevice/src/tcp/mod.rs | 2 +- idevice/src/tunneld.rs | 1 - idevice/src/usbmuxd/mod.rs | 2 +- justfile | 1 + 29 files changed, 46 insertions(+), 57 deletions(-) diff --git a/idevice/src/ca.rs b/idevice/src/ca.rs index 72aab2e..9429a68 100644 --- a/idevice/src/ca.rs +++ b/idevice/src/ca.rs @@ -4,19 +4,19 @@ use std::str::FromStr; use rsa::{ + RsaPrivateKey, RsaPublicKey, pkcs1::DecodeRsaPublicKey, pkcs1v15::SigningKey, pkcs8::{EncodePrivateKey, LineEnding, SubjectPublicKeyInfo}, - RsaPrivateKey, RsaPublicKey, }; use sha2::Sha256; use x509_cert::{ + Certificate, builder::{Builder, CertificateBuilder, Profile}, der::EncodePem, name::Name, serial_number::SerialNumber, time::Validity, - Certificate, }; #[derive(Clone, Debug)] diff --git a/idevice/src/pairing_file.rs b/idevice/src/pairing_file.rs index 7f2b5b2..9288bae 100644 --- a/idevice/src/pairing_file.rs +++ b/idevice/src/pairing_file.rs @@ -7,7 +7,7 @@ use std::path::Path; use log::warn; use plist::Data; -use rustls::pki_types::{pem::PemObject, CertificateDer}; +use rustls::pki_types::{CertificateDer, pem::PemObject}; use serde::{Deserialize, Serialize}; /// Represents a complete iOS device pairing record diff --git a/idevice/src/provider.rs b/idevice/src/provider.rs index bc0250e..91d96c6 100644 --- a/idevice/src/provider.rs +++ b/idevice/src/provider.rs @@ -8,7 +8,7 @@ use std::{future::Future, pin::Pin}; #[cfg(feature = "tcp")] use tokio::net::TcpStream; -use crate::{pairing_file::PairingFile, Idevice, IdeviceError, ReadWrite}; +use crate::{Idevice, IdeviceError, ReadWrite, pairing_file::PairingFile}; #[cfg(feature = "usbmuxd")] use crate::usbmuxd::UsbmuxdAddr; diff --git a/idevice/src/services/amfi.rs b/idevice/src/services/amfi.rs index c317127..3cf2b91 100644 --- a/idevice/src/services/amfi.rs +++ b/idevice/src/services/amfi.rs @@ -2,7 +2,7 @@ use plist::Dictionary; -use crate::{obf, Idevice, IdeviceError, IdeviceService}; +use crate::{Idevice, IdeviceError, IdeviceService, obf}; /// Client for interacting with the AMFI service on the device pub struct AmfiClient { diff --git a/idevice/src/services/core_device_proxy.rs b/idevice/src/services/core_device_proxy.rs index 6aafed3..36e4f5c 100644 --- a/idevice/src/services/core_device_proxy.rs +++ b/idevice/src/services/core_device_proxy.rs @@ -13,7 +13,7 @@ //! # Features //! - `tunnel_tcp_stack`: Enables software TCP/IP tunnel creation using a virtual adapter. See the tcp moduel. -use crate::{obf, Idevice, IdeviceError, IdeviceService}; +use crate::{Idevice, IdeviceError, IdeviceService, obf}; use byteorder::{BigEndian, WriteBytesExt}; use serde::{Deserialize, Serialize}; diff --git a/idevice/src/services/crashreportcopymobile.rs b/idevice/src/services/crashreportcopymobile.rs index 7b426d4..f98f1a4 100644 --- a/idevice/src/services/crashreportcopymobile.rs +++ b/idevice/src/services/crashreportcopymobile.rs @@ -9,7 +9,7 @@ use log::{debug, warn}; -use crate::{afc::AfcClient, lockdown::LockdownClient, obf, Idevice, IdeviceError, IdeviceService}; +use crate::{Idevice, IdeviceError, IdeviceService, afc::AfcClient, lockdown::LockdownClient, obf}; /// Client for managing crash logs on an iOS device. /// diff --git a/idevice/src/services/debug_proxy.rs b/idevice/src/services/debug_proxy.rs index ab3237f..7e5c28f 100644 --- a/idevice/src/services/debug_proxy.rs +++ b/idevice/src/services/debug_proxy.rs @@ -8,7 +8,7 @@ use log::debug; use std::fmt::Write; use tokio::io::{AsyncReadExt, AsyncWriteExt}; -use crate::{obf, IdeviceError, ReadWrite, RsdService}; +use crate::{IdeviceError, ReadWrite, RsdService, obf}; impl RsdService for DebugProxyClient> { fn rsd_service_name() -> std::borrow::Cow<'static, str> { diff --git a/idevice/src/services/diagnostics_relay.rs b/idevice/src/services/diagnostics_relay.rs index 7b525c5..9b31f78 100644 --- a/idevice/src/services/diagnostics_relay.rs +++ b/idevice/src/services/diagnostics_relay.rs @@ -1,6 +1,6 @@ //! Diagnostics Relay -use crate::{obf, Idevice, IdeviceError, IdeviceService}; +use crate::{Idevice, IdeviceError, IdeviceService, obf}; /// Client for interacting with the Diagnostics Relay pub struct DiagnosticsRelayClient { @@ -74,7 +74,6 @@ impl DiagnosticsRelayClient { .and_then(|x| x.into_dictionary()) .and_then(|mut x| x.remove("IORegistry")) .and_then(|x| x.into_dictionary()); - Ok(res) } @@ -92,7 +91,7 @@ impl DiagnosticsRelayClient { ) -> Result, IdeviceError> { let mut req = plist::Dictionary::new(); req.insert("Request".into(), "MobileGestalt".into()); - + if let Some(keys) = keys { let keys_array: Vec = keys.into_iter().map(|k| k.into()).collect(); req.insert("MobileGestaltKeys".into(), plist::Value::Array(keys_array)); @@ -110,9 +109,7 @@ impl DiagnosticsRelayClient { } } - let res = res - .remove("Diagnostics") - .and_then(|x| x.into_dictionary()); + let res = res.remove("Diagnostics").and_then(|x| x.into_dictionary()); Ok(res) } @@ -137,9 +134,7 @@ impl DiagnosticsRelayClient { } } - let res = res - .remove("Diagnostics") - .and_then(|x| x.into_dictionary()); + let res = res.remove("Diagnostics").and_then(|x| x.into_dictionary()); Ok(res) } @@ -164,9 +159,7 @@ impl DiagnosticsRelayClient { } } - let res = res - .remove("Diagnostics") - .and_then(|x| x.into_dictionary()); + let res = res.remove("Diagnostics").and_then(|x| x.into_dictionary()); Ok(res) } @@ -191,9 +184,7 @@ impl DiagnosticsRelayClient { } } - let res = res - .remove("Diagnostics") - .and_then(|x| x.into_dictionary()); + let res = res.remove("Diagnostics").and_then(|x| x.into_dictionary()); Ok(res) } @@ -272,9 +263,7 @@ impl DiagnosticsRelayClient { } } - let res = res - .remove("Diagnostics") - .and_then(|x| x.into_dictionary()); + let res = res.remove("Diagnostics").and_then(|x| x.into_dictionary()); Ok(res) } @@ -293,4 +282,4 @@ impl DiagnosticsRelayClient { _ => Err(IdeviceError::UnexpectedResponse), } } -} \ No newline at end of file +} diff --git a/idevice/src/services/dvt/location_simulation.rs b/idevice/src/services/dvt/location_simulation.rs index ecea710..ec90f51 100644 --- a/idevice/src/services/dvt/location_simulation.rs +++ b/idevice/src/services/dvt/location_simulation.rs @@ -37,11 +37,12 @@ use plist::Value; use crate::{ + IdeviceError, ReadWrite, dvt::{ message::AuxValue, remote_server::{Channel, RemoteServerClient}, }, - obf, IdeviceError, ReadWrite, + obf, }; /// A client for the location simulation service diff --git a/idevice/src/services/dvt/message.rs b/idevice/src/services/dvt/message.rs index 006fad7..4298e77 100644 --- a/idevice/src/services/dvt/message.rs +++ b/idevice/src/services/dvt/message.rs @@ -278,9 +278,9 @@ impl Aux { let mut res = Vec::new(); let buffer_size = 496_u32; res.extend_from_slice(&buffer_size.to_le_bytes()); // TODO: find what - // this means and how to actually serialize it - // go-ios just uses 496 - // pymobiledevice3 doesn't seem to parse the header at all + // this means and how to actually serialize it + // go-ios just uses 496 + // pymobiledevice3 doesn't seem to parse the header at all res.extend_from_slice(&0_u32.to_le_bytes()); res.extend_from_slice(&(values_payload.len() as u32).to_le_bytes()); res.extend_from_slice(&0_u32.to_le_bytes()); diff --git a/idevice/src/services/dvt/mod.rs b/idevice/src/services/dvt/mod.rs index 904f584..90a3bab 100644 --- a/idevice/src/services/dvt/mod.rs +++ b/idevice/src/services/dvt/mod.rs @@ -1,6 +1,6 @@ // Jackson Coxson -use crate::{obf, IdeviceError, ReadWrite, RsdService}; +use crate::{IdeviceError, ReadWrite, RsdService, obf}; #[cfg(feature = "location_simulation")] pub mod location_simulation; diff --git a/idevice/src/services/dvt/process_control.rs b/idevice/src/services/dvt/process_control.rs index 8ae7e15..c1f6edb 100644 --- a/idevice/src/services/dvt/process_control.rs +++ b/idevice/src/services/dvt/process_control.rs @@ -37,7 +37,7 @@ use log::warn; use plist::{Dictionary, Value}; -use crate::{dvt::message::AuxValue, obf, IdeviceError, ReadWrite}; +use crate::{IdeviceError, ReadWrite, dvt::message::AuxValue, obf}; use super::remote_server::{Channel, RemoteServerClient}; diff --git a/idevice/src/services/heartbeat.rs b/idevice/src/services/heartbeat.rs index a57690d..745abaf 100644 --- a/idevice/src/services/heartbeat.rs +++ b/idevice/src/services/heartbeat.rs @@ -3,7 +3,7 @@ //! iOS automatically closes service connections if there is no heartbeat client connected and //! responding. -use crate::{obf, Idevice, IdeviceError, IdeviceService}; +use crate::{Idevice, IdeviceError, IdeviceService, obf}; /// Client for interacting with the iOS device heartbeat service /// diff --git a/idevice/src/services/house_arrest.rs b/idevice/src/services/house_arrest.rs index f4de8ab..a38a85c 100644 --- a/idevice/src/services/house_arrest.rs +++ b/idevice/src/services/house_arrest.rs @@ -6,7 +6,7 @@ use plist::{Dictionary, Value}; -use crate::{obf, Idevice, IdeviceError, IdeviceService}; +use crate::{Idevice, IdeviceError, IdeviceService, obf}; use super::afc::AfcClient; diff --git a/idevice/src/services/lockdown.rs b/idevice/src/services/lockdown.rs index cbbd2a9..3ef2133 100644 --- a/idevice/src/services/lockdown.rs +++ b/idevice/src/services/lockdown.rs @@ -7,7 +7,7 @@ use log::error; use plist::Value; use serde::{Deserialize, Serialize}; -use crate::{obf, pairing_file, Idevice, IdeviceError, IdeviceService}; +use crate::{Idevice, IdeviceError, IdeviceService, obf, pairing_file}; /// Client for interacting with the iOS lockdown service /// diff --git a/idevice/src/services/misagent.rs b/idevice/src/services/misagent.rs index a3e3787..9f8de5a 100644 --- a/idevice/src/services/misagent.rs +++ b/idevice/src/services/misagent.rs @@ -6,7 +6,7 @@ use log::warn; use plist::Dictionary; -use crate::{obf, Idevice, IdeviceError, IdeviceService, RsdService}; +use crate::{Idevice, IdeviceError, IdeviceService, RsdService, obf}; /// Client for interacting with the iOS misagent service /// diff --git a/idevice/src/services/mobilebackup2.rs b/idevice/src/services/mobilebackup2.rs index e8703ba..6fb47c3 100644 --- a/idevice/src/services/mobilebackup2.rs +++ b/idevice/src/services/mobilebackup2.rs @@ -1300,4 +1300,3 @@ impl MobileBackup2Client { Ok(()) } } - diff --git a/idevice/src/services/os_trace_relay.rs b/idevice/src/services/os_trace_relay.rs index 0a6d4eb..793f80a 100644 --- a/idevice/src/services/os_trace_relay.rs +++ b/idevice/src/services/os_trace_relay.rs @@ -7,7 +7,7 @@ use chrono::{DateTime, NaiveDateTime}; use plist::Dictionary; use tokio::io::AsyncWriteExt; -use crate::{obf, Idevice, IdeviceError, IdeviceService}; +use crate::{Idevice, IdeviceError, IdeviceService, obf}; /// Client for interacting with the iOS device OsTraceRelay service pub struct OsTraceRelayClient { diff --git a/idevice/src/services/restore_service.rs b/idevice/src/services/restore_service.rs index 2942e71..b2f4590 100644 --- a/idevice/src/services/restore_service.rs +++ b/idevice/src/services/restore_service.rs @@ -3,7 +3,7 @@ use log::warn; use plist::Dictionary; -use crate::{obf, IdeviceError, ReadWrite, RemoteXpcClient, RsdService}; +use crate::{IdeviceError, ReadWrite, RemoteXpcClient, RsdService, obf}; /// Client for interacting with the Restore Service pub struct RestoreServiceClient { diff --git a/idevice/src/services/rsd.rs b/idevice/src/services/rsd.rs index 58566b9..9c41982 100644 --- a/idevice/src/services/rsd.rs +++ b/idevice/src/services/rsd.rs @@ -6,7 +6,7 @@ use std::collections::HashMap; use log::warn; use serde::Deserialize; -use crate::{provider::RsdProvider, IdeviceError, ReadWrite, RemoteXpcClient}; +use crate::{IdeviceError, ReadWrite, RemoteXpcClient, provider::RsdProvider}; /// Describes an available XPC service #[derive(Debug, Clone, Deserialize)] diff --git a/idevice/src/services/springboardservices.rs b/idevice/src/services/springboardservices.rs index 99a8564..f115f30 100644 --- a/idevice/src/services/springboardservices.rs +++ b/idevice/src/services/springboardservices.rs @@ -3,7 +3,7 @@ //! Provides functionality for interacting with the SpringBoard services on iOS devices, //! which manages home screen and app icon related operations. -use crate::{obf, Idevice, IdeviceError, IdeviceService}; +use crate::{Idevice, IdeviceError, IdeviceService, obf}; /// Client for interacting with the iOS SpringBoard services /// diff --git a/idevice/src/services/syslog_relay.rs b/idevice/src/services/syslog_relay.rs index cf1069a..0b35380 100644 --- a/idevice/src/services/syslog_relay.rs +++ b/idevice/src/services/syslog_relay.rs @@ -1,6 +1,6 @@ //! iOS Device SyslogRelay Service Abstraction -use crate::{obf, Idevice, IdeviceError, IdeviceService}; +use crate::{Idevice, IdeviceError, IdeviceService, obf}; /// Client for interacting with the iOS device SyslogRelay service pub struct SyslogRelayClient { diff --git a/idevice/src/sni.rs b/idevice/src/sni.rs index 965d12c..1bf9806 100644 --- a/idevice/src/sni.rs +++ b/idevice/src/sni.rs @@ -7,16 +7,16 @@ // Assuming that there's no use for unchecked certs is naive. use rustls::{ - client::{ - danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier}, - WebPkiServerVerifier, - }, - pki_types::{pem::PemObject, CertificateDer, PrivateKeyDer, ServerName, UnixTime}, ClientConfig, DigitallySignedStruct, + client::{ + WebPkiServerVerifier, + danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier}, + }, + pki_types::{CertificateDer, PrivateKeyDer, ServerName, UnixTime, pem::PemObject}, }; use std::sync::Arc; -use crate::{pairing_file::PairingFile, IdeviceError}; +use crate::{IdeviceError, pairing_file::PairingFile}; #[derive(Debug)] pub struct NoServerNameVerification { diff --git a/idevice/src/tcp/adapter.rs b/idevice/src/tcp/adapter.rs index 4bcc943..714f5f3 100644 --- a/idevice/src/tcp/adapter.rs +++ b/idevice/src/tcp/adapter.rs @@ -206,7 +206,7 @@ impl Adapter { break; } ConnectionStatus::Error(e) => { - return Err(std::io::Error::new(e, "failed to connect")) + return Err(std::io::Error::new(e, "failed to connect")); } ConnectionStatus::WaitingForSyn => { continue; @@ -236,7 +236,7 @@ impl Adapter { file.write_all(&0_i32.to_le_bytes()).await?; // timezone file.write_all(&0_u32.to_le_bytes()).await?; // accuracy file.write_all(&(u16::MAX as u32).to_le_bytes()).await?; // snaplen - // https://www.tcpdump.org/linktypes.html + // https://www.tcpdump.org/linktypes.html file.write_all(&101_u32.to_le_bytes()).await?; // link type self.pcap = Some(Arc::new(Mutex::new(file))); diff --git a/idevice/src/tcp/handle.rs b/idevice/src/tcp/handle.rs index 86c08ac..43e6612 100644 --- a/idevice/src/tcp/handle.rs +++ b/idevice/src/tcp/handle.rs @@ -6,8 +6,8 @@ use std::{collections::HashMap, path::PathBuf, sync::Mutex, task::Poll}; -use crossfire::{mpsc, spsc, stream::AsyncStream, AsyncRx, MTx, Tx}; -use futures::{stream::FuturesUnordered, StreamExt}; +use crossfire::{AsyncRx, MTx, Tx, mpsc, spsc, stream::AsyncStream}; +use futures::{StreamExt, stream::FuturesUnordered}; use log::trace; use tokio::{ io::{AsyncRead, AsyncWrite}, @@ -309,7 +309,7 @@ impl AsyncWrite for StreamHandle { return Poll::Ready(Err(std::io::Error::new( std::io::ErrorKind::BrokenPipe, "channel closed", - ))) + ))); } None => break, // nothing pending } diff --git a/idevice/src/tcp/mod.rs b/idevice/src/tcp/mod.rs index 64302be..df755bd 100644 --- a/idevice/src/tcp/mod.rs +++ b/idevice/src/tcp/mod.rs @@ -8,7 +8,7 @@ use std::{ use log::debug; use tokio::io::AsyncWriteExt; -use crate::{provider::RsdProvider, ReadWrite}; +use crate::{ReadWrite, provider::RsdProvider}; pub mod adapter; pub mod handle; diff --git a/idevice/src/tunneld.rs b/idevice/src/tunneld.rs index dcbb8de..f6f747c 100644 --- a/idevice/src/tunneld.rs +++ b/idevice/src/tunneld.rs @@ -106,4 +106,3 @@ mod tests { } } } - diff --git a/idevice/src/usbmuxd/mod.rs b/idevice/src/usbmuxd/mod.rs index 3d18005..d1eebad 100644 --- a/idevice/src/usbmuxd/mod.rs +++ b/idevice/src/usbmuxd/mod.rs @@ -15,7 +15,7 @@ use log::{debug, warn}; use tokio::io::{AsyncReadExt, AsyncWriteExt}; use crate::{ - pairing_file::PairingFile, provider::UsbmuxdProvider, Idevice, IdeviceError, ReadWrite, + Idevice, IdeviceError, ReadWrite, pairing_file::PairingFile, provider::UsbmuxdProvider, }; mod des; diff --git a/justfile b/justfile index 238d4ef..9b3788c 100644 --- a/justfile +++ b/justfile @@ -5,6 +5,7 @@ check-features: ci-check: build-ffi-native build-tools-native build-cpp build-c cargo clippy --all-targets --all-features -- -D warnings + cargo fmt -- --check macos-ci-check: ci-check xcframework cd tools && cargo build --release --target x86_64-apple-darwin windows-ci-check: build-ffi-native build-tools-native build-cpp