refactor: remove pairing_file field and state param from RemotePairingClient#96
Merged
jkcoxson merged 5 commits intoMay 8, 2026
Conversation
…gClient Move pairing_file from a struct field (&'a mut borrow) to a parameter on connect() and its callees. This removes the lifetime parameter from the struct and scopes the mutable borrow to the function call. Also remove the unused state: S generic from connect/pair/request_pair_consent, since every caller passed 0u8 and ignored it. Callers can capture state via move closures instead.
84c37ea to
4168ea7
Compare
jkcoxson
reviewed
May 7, 2026
- Add internal _serde_json and _reqwest features to gate From impls - Remove unused json and byteorder optional dependencies - Add missing xpc dependency to remote_pairing feature - Simplify map_err workarounds in tunnel code to use ? directly
The openssl variant of PairingFile had escrow_bag as Vec<u8> while RawPairingFile has it as Option<Data> (it's None on Apple Watch). This caused compile errors in the From/TryFrom impls when building with the openssl feature. The rustls variant already had the correct Option<Vec<u8>> type.
* fix: make openssl crypto path a first-class backend Un-gate `ca.rs` and `pair()` from rustls — they only use pure Rust crates (rsa, x509-cert, sha2) so pairing now works with openssl. Always detect legacy devices instead of only with openssl feature. Add openssl feature to FFI crate. Clean up SNI string and gate rustls-only PEM helpers to fix dead code warnings. * refactor: return legacy flag from start_session, remove duplicate detection `LockdownClient::start_session` already queries ProductVersion to detect legacy devices. Four callers were making the same query beforehand. Now `start_session` returns the legacy bool so callers reuse it instead of round-tripping to the device twice.
…xson#93) AFC's close-on-drop used block_in_place + block_on to synchronously send a FileClose packet, requiring tokio's rt-multi-thread feature. This is heavyweight for a best-effort cleanup that already did nothing on wasm and single-threaded runtimes. Replace with a simple no-op drop that warns (debug_assert + println) if .close().await wasn't called. The device reclaims FDs when the AFC session ends regardless. Also fix the afc tool to explicitly close file descriptors after use.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
This fixes a borrow conflict where you can't save the pairing file while the
RemotePairingClientis still alive, since the struct held a&mutborrow for its entire lifetime:By moving the
&mut RpPairingFileto a parameter onconnect(), the borrow is released whenconnect()returns, so callers can freely use bothrpcandrpfafterwards.Changes Made
pairing_file: &'a mut RpPairingFilefrom theRemotePairingClientstruct, eliminating the'alifetime parameter. Instead,connect()accepts&mut RpPairingFileby argument. The mutable borrow is now scoped to the function call rather than the struct's lifetime.state: Sgeneric fromconnect,pair, andrequest_pair_consent. Callers can capture any needed state via move closures instead.tools/andffi/to match the new signatures.TypeState Pattern
This struct would be a good candidate for the TypeState pattern since it transitions through two distinct phases (unconnected, paired) where different operations are valid at each phase. Encoding these states as type parameters would make it a compile-time error to call
create_tcp_listener()orencryption_key()before pairing completes, rather than relying on runtime checks and placeholder cipher values. I wasn't sure if that large of an API refactor would be in the interest of the project though. It would also almost certainly requirevalidate_pairing/pairto become internal functions, since if they consumeselfto return a new type state, thenconnectcan't do the "try validate first, fall back to pair on error" flow.