diff --git a/.gitignore b/.gitignore index eb5a316..7b3aad1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ target + +state.plist \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index b83065f..188bca2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,15 +8,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" -[[package]] -name = "aho-corasick" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" -dependencies = [ - "memchr", -] - [[package]] name = "android_system_properties" version = "0.1.5" @@ -26,69 +17,29 @@ dependencies = [ "libc", ] -[[package]] -name = "anstream" -version = "0.6.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" - -[[package]] -name = "anstyle-parse" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" -dependencies = [ - "anstyle", - "once_cell_polyfill", - "windows-sys 0.61.2", -] - [[package]] name = "async-compression" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ec5f6c2f8bc326c994cb9e241cc257ddaba9afa8555a43cffbb5dd86efaa37" +checksum = "d10e4f991a553474232bc0a31799f6d24b034a84c0971d80d2e2f78b2e576e40" dependencies = [ "compression-codecs", "compression-core", - "futures-core", "pin-project-lite", "tokio", ] +[[package]] +name = "async-trait" +version = "0.1.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -103,9 +54,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-lc-rs" -version = "1.15.2" +version = "1.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88aab2464f1f25453baa7a07c84c5b7684e274054ba06817f382357f77a288" +checksum = "e84ce723ab67259cfeb9877c6a639ee9eb7a27b28123abd71db7f0d5d0cc9d86" dependencies = [ "aws-lc-sys", "zeroize", @@ -113,9 +64,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45afffdee1e7c9126814751f88dddc747f41d91da16c9551a0f1e8a11e788a1" +checksum = "43a442ece363113bd4bd4c8b18977a7798dd4d3c3383f34fb61936960e8f4ad8" dependencies = [ "cc", "cmake", @@ -135,6 +86,15 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + [[package]] name = "bumpalo" version = "3.19.1" @@ -149,9 +109,9 @@ checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "cc" -version = "1.2.49" +version = "1.2.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215" +checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932" dependencies = [ "find-msvc-tools", "jobserver", @@ -192,19 +152,13 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b042e5d8a74ae91bb0961acd039822472ec99f8ab0948cbf6d1369588f8be586" +checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d" dependencies = [ "cc", ] -[[package]] -name = "colorchoice" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" - [[package]] name = "combine" version = "4.6.7" @@ -217,9 +171,9 @@ dependencies = [ [[package]] name = "compression-codecs" -version = "0.4.35" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0f7ac3e5b97fdce45e8922fb05cae2c37f7bbd63d30dd94821dacfd8f3f2bf2" +checksum = "00828ba6fd27b45a448e57dbfe84f1029d4c9f26b368157e9a448a5f49a2ec2a" dependencies = [ "compression-core", "flate2", @@ -258,6 +212,15 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + [[package]] name = "crc32fast" version = "1.5.0" @@ -267,6 +230,22 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crypto-common" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "data-encoding" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" + [[package]] name = "deranged" version = "0.5.5" @@ -276,6 +255,16 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -302,29 +291,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "env_filter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "jiff", - "log", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -333,15 +299,15 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "find-msvc-tools" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" +checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db" [[package]] name = "flate2" -version = "1.1.5" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" +checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369" dependencies = [ "crc32fast", "miniz_oxide", @@ -383,6 +349,17 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "futures-sink" version = "0.3.31" @@ -402,16 +379,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-core", + "futures-macro", + "futures-sink", "futures-task", "pin-project-lite", "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", ] [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "js-sys", @@ -459,6 +449,12 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "http" version = "1.4.0" @@ -669,15 +665,16 @@ dependencies = [ [[package]] name = "idevice" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d99be8d1969168237987908274fe41bcb2c8a1f9a37aa12fd15d5713acb9dd2b" +checksum = "f4031af51250d2f22f61a0d7fb7ea71ba8b6144b2b9dd3b7ee4a931fccbd1ec0" dependencies = [ "base64", "plist", + "plist-macro", "rustls", "serde", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokio", "tokio-rustls", "tracing", @@ -706,9 +703,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", "hashbrown", @@ -730,55 +727,35 @@ dependencies = [ "serde", ] -[[package]] -name = "is_terminal_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" - [[package]] name = "isideload" version = "0.2.0" dependencies = [ + "async-trait", + "base64", "chrono", + "futures-util", + "hex", "idevice", - "log", "plist", "plist-macro", + "rand", "reqwest", - "thiserror 2.0.17", - "thiserror-context", + "rootcause", + "serde", + "serde_json", + "sha2", + "thiserror 2.0.18", + "tokio-tungstenite", + "tracing", + "uuid", ] [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" - -[[package]] -name = "jiff" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67e8da4c49d6d9909fe03361f9b620f58898859f5c7aded68351e85e71ecf50" -dependencies = [ - "jiff-static", - "log", - "portable-atomic", - "portable-atomic-util", - "serde_core", -] - -[[package]] -name = "jiff-static" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c84ee7f197eca9a86c6fd6cb771e55eb991632f15f2bc3ca6ec838929e6e78" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "jni" @@ -814,19 +791,25 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.83" +version = "0.3.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" +checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" dependencies = [ "once_cell", "wasm-bindgen", ] [[package]] -name = "libc" -version = "0.2.178" +name = "lazy_static" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.180" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "litemap" @@ -862,9 +845,10 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" name = "minimal" version = "0.1.0" dependencies = [ - "env_logger", "isideload", "tokio", + "tracing", + "tracing-subscriber", ] [[package]] @@ -888,6 +872,15 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "nu-ansi-term" +version = "0.50.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "num-conv" version = "0.1.0" @@ -909,17 +902,11 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" -[[package]] -name = "once_cell_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" - [[package]] name = "openssl-probe" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f50d9b3dabb09ecd771ad0aa242ca6894994c130308ca3d7684634df8037391" +checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" [[package]] name = "percent-encoding" @@ -954,28 +941,13 @@ dependencies = [ [[package]] name = "plist-macro" -version = "0.1.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb72007326fe20721ef27304fcf2d1bd5877b92d13dbd8df735fd33407e31c2a" +checksum = "8888e02e251eba3258cc58fb79f0d8675c34b3428749e738562d58a0271bf035" dependencies = [ "plist", ] -[[package]] -name = "portable-atomic" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950" - -[[package]] -name = "portable-atomic-util" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" -dependencies = [ - "portable-atomic", -] - [[package]] name = "potential_utf" version = "0.1.4" @@ -1002,9 +974,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.103" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] @@ -1032,7 +1004,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokio", "tracing", "web-time", @@ -1054,7 +1026,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.17", + "thiserror 2.0.18", "tinyvec", "tracing", "web-time", @@ -1076,9 +1048,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.42" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" dependencies = [ "proc-macro2", ] @@ -1111,42 +1083,13 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" dependencies = [ "getrandom 0.3.4", ] -[[package]] -name = "regex" -version = "1.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" - [[package]] name = "reqwest" version = "0.13.1" @@ -1195,12 +1138,34 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.16", + "getrandom 0.2.17", "libc", "untrusted", "windows-sys 0.52.0", ] +[[package]] +name = "rootcause" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a751633dcb95a6b1c954f0fa15c2afd9b4802640f8045432f68a1f4bde4b871" +dependencies = [ + "hashbrown", + "indexmap", + "rootcause-internals", + "rustc-hash", + "triomphe", +] + +[[package]] +name = "rootcause-internals" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9eeddca0d656f1a58ce3fc3f41b0b877a7e760460108712ad39b60181fdcb3e" +dependencies = [ + "triomphe", +] + [[package]] name = "rustc-hash" version = "2.1.1" @@ -1209,9 +1174,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustls" -version = "0.23.35" +version = "0.23.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" +checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" dependencies = [ "aws-lc-rs", "once_cell", @@ -1235,9 +1200,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c" +checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" dependencies = [ "web-time", "zeroize", @@ -1272,9 +1237,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.8" +version = "0.103.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" +checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" dependencies = [ "aws-lc-rs", "ring", @@ -1288,12 +1253,6 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - [[package]] name = "same-file" version = "1.0.6" @@ -1367,15 +1326,46 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", ] [[package]] @@ -1426,9 +1416,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.111" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", @@ -1487,19 +1477,13 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.17", + "thiserror-impl 2.0.18", ] -[[package]] -name = "thiserror-context" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d4cf778b0694c0adf030668380054b3a382f1e5e6a2e9a0b54bc5e677045bca" - [[package]] name = "thiserror-impl" version = "1.0.69" @@ -1513,9 +1497,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", @@ -1523,31 +1507,40 @@ dependencies = [ ] [[package]] -name = "time" -version = "0.3.44" +name = "thread_local" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "time" +version = "0.3.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd" dependencies = [ "deranged", "itoa", "num-conv", "powerfmt", - "serde", + "serde_core", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" +checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca" [[package]] name = "time-macros" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" +checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd" dependencies = [ "num-conv", "time-core", @@ -1614,6 +1607,22 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-tungstenite" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" +dependencies = [ + "futures-util", + "log", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tungstenite", + "webpki-roots 0.26.11", +] + [[package]] name = "tokio-util" version = "0.7.18" @@ -1629,9 +1638,9 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" dependencies = [ "futures-core", "futures-util", @@ -1679,9 +1688,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -1701,19 +1710,76 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.35" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", + "valuable", ] +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "triomphe" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd69c5aa8f924c7519d6372789a74eac5b94fb0f8fcf0d4a97eb0bfc3e785f39" + [[package]] name = "try-lock" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "tungstenite" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442" +dependencies = [ + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "rustls", + "rustls-pki-types", + "sha1", + "thiserror 2.0.18", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" + [[package]] name = "unicode-ident" version = "1.0.22" @@ -1738,6 +1804,12 @@ dependencies = [ "serde", ] +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "utf8_iter" version = "1.0.4" @@ -1745,10 +1817,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] -name = "utf8parse" -version = "0.2.2" +name = "uuid" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "valuable" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -1777,18 +1865,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.1+wasi-0.2.4" +version = "1.0.2+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" +checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" dependencies = [ "cfg-if", "once_cell", @@ -1799,11 +1887,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.56" +version = "0.4.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" +checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f" dependencies = [ "cfg-if", + "futures-util", "js-sys", "once_cell", "wasm-bindgen", @@ -1812,9 +1901,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" +checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1822,9 +1911,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" +checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" dependencies = [ "bumpalo", "proc-macro2", @@ -1835,18 +1924,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.83" +version = "0.3.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" +checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598" dependencies = [ "js-sys", "wasm-bindgen", @@ -1871,6 +1960,24 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "webpki-roots" +version = "0.26.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +dependencies = [ + "webpki-roots 1.0.5", +] + +[[package]] +name = "webpki-roots" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12bed680863276c63889429bfd6cab3b99943659923822de1c8a39c49e4d722c" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "winapi-util" version = "0.1.11" @@ -2174,9 +2281,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "wit-bindgen" -version = "0.46.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" [[package]] name = "writeable" @@ -2209,18 +2316,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.31" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" +checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.31" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" +checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" dependencies = [ "proc-macro2", "quote", @@ -2286,3 +2393,9 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zmij" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65" diff --git a/examples/minimal/Cargo.toml b/examples/minimal/Cargo.toml index 4cf593c..a96136b 100644 --- a/examples/minimal/Cargo.toml +++ b/examples/minimal/Cargo.toml @@ -5,5 +5,6 @@ edition = "2024" [dependencies] isideload = { path = "../../isideload" } -env_logger = "0.11.8" tokio = { version = "1.49.0", features = ["rt-multi-thread", "macros"] } +tracing = "0.1.44" +tracing-subscriber = "0.3.22" diff --git a/examples/minimal/src/main.rs b/examples/minimal/src/main.rs index ae679b2..b29fd5a 100644 --- a/examples/minimal/src/main.rs +++ b/examples/minimal/src/main.rs @@ -3,10 +3,15 @@ use std::{env, path::PathBuf}; use isideload::{ anisette::remote_v3::RemoteV3AnisetteProvider, auth::apple_account::AppleAccountBuilder, }; +use tracing::Level; +use tracing_subscriber::FmtSubscriber; #[tokio::main] async fn main() { - env_logger::init(); + let subscriber = FmtSubscriber::builder() + .with_max_level(Level::DEBUG) + .finish(); + tracing::subscriber::set_global_default(subscriber).expect("setting default subscriber failed"); let args: Vec = env::args().collect(); let _app_path = PathBuf::from( @@ -22,13 +27,17 @@ async fn main() { let mut code = String::new(); println!("Enter 2FA code:"); std::io::stdin().read_line(&mut code).unwrap(); - Ok(code.trim().to_string()) + Some(code.trim().to_string()) }; - let _account = AppleAccountBuilder::new(apple_id) + let account = AppleAccountBuilder::new(apple_id) .danger_debug(true) .anisette(RemoteV3AnisetteProvider::default().set_serial_number("2".to_string())) .login(apple_password, get_2fa_code) - .await - .unwrap(); + .await; + + match account { + Ok(_account) => println!("Successfully logged in to Apple ID"), + Err(e) => eprintln!("Failed to log in to Apple ID: {}", e), + } } diff --git a/isideload/Cargo.toml b/isideload/Cargo.toml index 5dd6ad1..4e924fe 100644 --- a/isideload/Cargo.toml +++ b/isideload/Cargo.toml @@ -16,10 +16,20 @@ install = ["dep:idevice"] [dependencies] idevice = { version = "0.1.51", optional = true } -plist = "1.8.0" -plist-macro = "0.1.0" -log = "0.4" +plist = "1.8" +plist-macro = "0.1.3" reqwest = { version = "0.13.1", features = ["json", "gzip"] } thiserror = "2.0.17" -thiserror-context = "0.1.2" chrono = "0.4.43" +async-trait = "0.1.89" +serde = "1.0.228" +rand = "0.9.2" +uuid = "1.19.0" +sha2 = "0.10.9" +tracing = "0.1.44" +tokio-tungstenite = { version = "0.28.0", features = ["rustls-tls-webpki-roots"] } +rootcause = "0.11.1" +futures-util = "0.3.31" +serde_json = "1.0.149" +base64 = "0.22.1" +hex = "0.4.3" diff --git a/isideload/src/anisette/mod.rs b/isideload/src/anisette/mod.rs index 9f21bb5..196fe25 100644 --- a/isideload/src/anisette/mod.rs +++ b/isideload/src/anisette/mod.rs @@ -1,3 +1,22 @@ pub mod remote_v3; -pub trait AnisetteProvider {} +use crate::auth::grandslam::GrandSlam; +use rootcause::prelude::*; +use serde::Deserialize; +use std::collections::HashMap; + +#[derive(Deserialize, Debug, Clone)] +pub struct AnisetteClientInfo { + pub client_info: String, + pub user_agent: String, +} + +#[async_trait::async_trait] +pub trait AnisetteProvider { + async fn get_anisette_headers( + &mut self, + gs: &mut GrandSlam, + ) -> Result, Report>; + + async fn get_client_info(&mut self) -> Result; +} diff --git a/isideload/src/anisette/remote_v3.rs b/isideload/src/anisette/remote_v3.rs deleted file mode 100644 index 17d7fb5..0000000 --- a/isideload/src/anisette/remote_v3.rs +++ /dev/null @@ -1,92 +0,0 @@ -use std::path::PathBuf; - -use chrono::{DateTime, SubsecRound, Utc}; -use reqwest::header::{HeaderMap, HeaderValue}; - -use crate::SideloadResult as Result; -use crate::anisette::AnisetteProvider; - -pub const DEFAULT_ANISETTE_V3_URL: &str = "https://ani.sidestore.io"; - -pub struct RemoteV3AnisetteProvider { - url: String, - config_path: PathBuf, - serial_number: String, -} - -impl RemoteV3AnisetteProvider { - /// Create a new RemoteV3AnisetteProvider with the given URL and config path - /// - /// # Arguments - /// - `url`: The URL of the remote anisette service - /// - `config_path`: The path to the config file - /// - `serial_number`: The serial number of the device - pub fn new(url: &str, config_path: PathBuf, serial_number: String) -> Self { - Self { - url: url.to_string(), - config_path, - serial_number, - } - } - - pub fn set_url(mut self, url: &str) -> RemoteV3AnisetteProvider { - self.url = url.to_string(); - self - } - - pub fn set_config_path(mut self, config_path: PathBuf) -> RemoteV3AnisetteProvider { - self.config_path = config_path; - self - } - - pub fn set_serial_number(mut self, serial_number: String) -> RemoteV3AnisetteProvider { - self.serial_number = serial_number; - self - } -} - -impl Default for RemoteV3AnisetteProvider { - fn default() -> Self { - Self::new(DEFAULT_ANISETTE_V3_URL, PathBuf::new(), "0".to_string()) - } -} - -#[derive(Debug)] -pub struct AnisetteData { - machine_id: String, - one_time_password: String, - routing_info: String, - device_description: String, - device_unique_identifier: String, - local_user_id: String, -} - -impl AnisetteData { - pub fn get_headers(&self, serial: String) -> Result { - let dt: DateTime = Utc::now().round_subsecs(0); - - let mut headers = HeaderMap::new(); - - for (key, value) in vec![ - ( - "X-Apple-I-Client-Time", - dt.format("%+").to_string().replace("+00:00", "Z"), - ), - ("X-Apple-I-SRL-NO", serial), - ("X-Apple-I-TimeZone", "UTC".to_string()), - ("X-Apple-Locale", "en_US".to_string()), - ("X-Apple-I-MD-RINFO", self.routing_info.clone()), - ("X-Apple-I-MD-LU", self.local_user_id.clone()), - ("X-Mme-Device-Id", self.device_unique_identifier.clone()), - ("X-Apple-I-MD", self.one_time_password.clone()), - ("X-Apple-I-MD-M", self.machine_id.clone()), - ("X-Mme-Client-Info", self.device_description.clone()), - ] { - headers.insert(key, HeaderValue::from_str(&value)?); - } - - Ok(headers) - } -} - -impl AnisetteProvider for RemoteV3AnisetteProvider {} diff --git a/isideload/src/anisette/remote_v3/mod.rs b/isideload/src/anisette/remote_v3/mod.rs new file mode 100644 index 0000000..bc63071 --- /dev/null +++ b/isideload/src/anisette/remote_v3/mod.rs @@ -0,0 +1,393 @@ +mod state; + +use std::collections::HashMap; +use std::fs; +use std::path::PathBuf; + +use base64::prelude::*; +use chrono::{DateTime, SubsecRound, Utc}; +use plist_macro::plist; +use reqwest::header::{HeaderMap, HeaderValue}; +use rootcause::prelude::*; +use serde::Deserialize; +use tokio_tungstenite::tungstenite::Message; +use tracing::{debug, info}; + +use crate::anisette::remote_v3::state::AnisetteState; +use crate::anisette::{AnisetteClientInfo, AnisetteProvider}; +use crate::auth::grandslam::GrandSlam; +use crate::util::plist::plist_to_xml_string; +use futures_util::{SinkExt, StreamExt}; + +pub const DEFAULT_ANISETTE_V3_URL: &str = "https://ani.sidestore.io"; + +#[derive(Debug)] +pub struct AnisetteData { + machine_id: String, + one_time_password: String, + routing_info: String, + device_description: String, + device_unique_identifier: String, + local_user_id: String, +} + +impl AnisetteData { + pub fn get_headers(&self, serial: String) -> HashMap { + let dt: DateTime = Utc::now().round_subsecs(0); + + HashMap::from_iter( + [ + ( + "X-Apple-I-Client-Time".to_string(), + dt.format("%+").to_string().replace("+00:00", "Z"), + ), + ("X-Apple-I-SRL-NO".to_string(), serial), + ("X-Apple-I-TimeZone".to_string(), "UTC".to_string()), + ("X-Apple-Locale".to_string(), "en_US".to_string()), + ("X-Apple-I-MD-RINFO".to_string(), self.routing_info.clone()), + ("X-Apple-I-MD-LU".to_string(), self.local_user_id.clone()), + ( + "X-Mme-Device-Id".to_string(), + self.device_unique_identifier.clone(), + ), + ("X-Apple-I-MD".to_string(), self.one_time_password.clone()), + ("X-Apple-I-MD-M".to_string(), self.machine_id.clone()), + ( + "X-Mme-Client-Info".to_string(), + self.device_description.clone(), + ), + ] + .into_iter(), + ) + } +} + +pub struct RemoteV3AnisetteProvider { + pub state: Option, + url: String, + config_path: PathBuf, + serial_number: String, + client_info: Option, + client: reqwest::Client, +} + +impl RemoteV3AnisetteProvider { + /// Create a new RemoteV3AnisetteProvider with the given URL and config path + /// + /// # Arguments + /// - `url`: The URL of the remote anisette service + /// - `config_path`: The path to the config file + /// - `serial_number`: The serial number of the device + /// + pub fn new(url: &str, config_path: PathBuf, serial_number: String) -> Self { + Self { + state: None, + url: url.to_string(), + config_path, + serial_number, + client_info: None, + client: reqwest::ClientBuilder::new() + .danger_accept_invalid_certs(true) + .build() + .unwrap(), + } + } + + pub fn set_url(mut self, url: &str) -> RemoteV3AnisetteProvider { + self.url = url.to_string(); + self + } + + pub fn set_config_path(mut self, config_path: PathBuf) -> RemoteV3AnisetteProvider { + self.config_path = config_path; + self + } + + pub fn set_serial_number(mut self, serial_number: String) -> RemoteV3AnisetteProvider { + self.serial_number = serial_number; + self + } +} + +impl Default for RemoteV3AnisetteProvider { + fn default() -> Self { + Self::new(DEFAULT_ANISETTE_V3_URL, PathBuf::new(), "0".to_string()) + } +} + +#[async_trait::async_trait] +impl AnisetteProvider for RemoteV3AnisetteProvider { + async fn get_anisette_headers( + &mut self, + gs: &mut GrandSlam, + ) -> Result, Report> { + let state = self.get_state(gs).await?; + + unimplemented!() + } + + async fn get_client_info(&mut self) -> Result { + self.ensure_client_info().await?; + Ok(self.client_info.as_ref().unwrap().clone()) + } +} + +impl RemoteV3AnisetteProvider { + async fn ensure_client_info(&mut self) -> Result<(), Report> { + if self.client_info.is_none() { + let resp = self + .client + .get(format!("{}/v3/client_info", self.url)) + .send() + .await? + .error_for_status()? + .json::() + .await?; + + self.client_info = Some(resp); + } + + debug!("Got client client_info: {:?}", self.client_info); + + Ok(()) + } + + async fn get_state(&mut self, gs: &mut GrandSlam) -> Result<&mut AnisetteState, Report> { + let state_path = self.config_path.join("state.plist"); + fs::create_dir_all(&self.config_path)?; + if self.state.is_none() { + if let Ok(state) = plist::from_file(&state_path) { + debug!("Loaded existing anisette state from {:?}", state_path); + self.state = Some(state); + } else { + debug!("No existing anisette state found"); + self.state = Some(AnisetteState::new()); + } + } + + let state = self.state.as_mut().unwrap(); + if !state.is_provisioned() { + info!("Provisioning required..."); + Self::provision(state, gs, &self.url) + .await + .context("Failed to provision")?; + } + plist::to_file_xml(&state_path, &state)?; + + Ok(state) + } + + async fn provisioning_headers( + state: &AnisetteState, + gs: &mut GrandSlam, + ) -> Result { + let mut headers = HeaderMap::new(); + headers.insert( + "X-Apple-I-MD-LU", + HeaderValue::from_str(&hex::encode(state.get_md_lu()))?, + ); + headers.insert( + "X-Apple-I-Client-Time", + HeaderValue::from_str( + &Utc::now() + .round_subsecs(0) + .format("%+") + .to_string() + .replace("+00:00", "Z"), + )?, + ); + headers.insert("X-Apple-I-TimeZone", HeaderValue::from_static("UTC")); + headers.insert("X-Apple-Locale", HeaderValue::from_static("en_US")); + headers.insert( + "X-Mme-Device-Id", + HeaderValue::from_str(&state.get_device_id())?, + ); + + Ok(headers) + } + async fn provision( + state: &mut AnisetteState, + gs: &mut GrandSlam, + url: &str, + ) -> Result<(), Report> { + info!("Starting provisioning"); + let urls = gs.get_url_bag().await?; + + let start_provisioning = urls + .get("midStartProvisioning") + .and_then(|v| v.as_string()) + .ok_or(report!("Missing URL bag entry for midStartProvisioning"))? + .to_string(); + let end_provisioning = urls + .get("midFinishProvisioning") + .and_then(|v| v.as_string()) + .ok_or(report!("Missing URL bag entry for midFinishProvisioning"))? + .to_string(); + + let websocket_url = format!("{}/v3/provisioning_session", url) + .replace("https://", "wss://") + .replace("http://", "ws://"); + let (mut ws_stream, _) = tokio_tungstenite::connect_async(&websocket_url) + .await + .context("Failed to connect anisette provisioning socket")?; + + loop { + let Some(msg) = ws_stream.next().await else { + continue; + }; + let msg = msg.context("Failed to read anisette provisioning socket message")?; + if msg.is_close() { + bail!("Anisette provisioning socket closed unexpectedly"); + } + let msg = msg + .into_text() + .context("Failed to parse provisioning message")?; + + debug!("Received provisioning message: {}", msg); + let provision_msg: ProvisioningMessage = + serde_json::from_str(&msg).context("Unknown provisioning message")?; + + match provision_msg { + ProvisioningMessage::GiveIdentifier => { + ws_stream + .send(Message::Text( + serde_json::json!({ + "identifier": BASE64_STANDARD.encode(&state.keychain_identifier), + }) + .to_string() + .into(), + )) + .await + .context("Failed to send identifier")?; + } + ProvisioningMessage::GiveStartProvisioningData => { + let body = plist!(dict { + "Header": {}, + "Request": {} + }); + + let resp = gs + .post(&start_provisioning)? + .headers(Self::provisioning_headers(state, gs).await?) + .body(plist_to_xml_string(&body)) + .send() + .await + .context("Failed to send start provisioning request")? + .error_for_status() + .context("Start provisioning request returned error")? + .text() + .await + .context("Failed to read start provisioning response text")?; + + let resp_plist: plist::Dictionary = plist::from_bytes(resp.as_bytes()) + .context("Failed to parse start provisioning response plist")?; + + let spim = resp_plist + .get("Response") + .and_then(|v| v.as_dictionary()) + .and_then(|d| d.get("spim")) + .and_then(|v| v.as_string()) + .ok_or(report!("Start provisioning response missing spim"))?; + + ws_stream + .send(Message::Text( + serde_json::json!({ + "spim": spim, + }) + .to_string() + .into(), + )) + .await + .context("Failed to send start provisioning data")?; + } + ProvisioningMessage::GiveEndProvisioningData { cpim } => { + let body = plist!(dict { + "Header": {}, + "Request": { + "cpim": cpim, + } + }); + + let resp = gs + .post(&end_provisioning)? + .headers(Self::provisioning_headers(state, gs).await?) + .body(plist_to_xml_string(&body)) + .send() + .await + .context("Failed to send end provisioning request")? + .error_for_status() + .context("End provisioning request returned error")? + .text() + .await + .context("Failed to read end provisioning response text")?; + + let resp_plist: plist::Dictionary = plist::from_bytes(resp.as_bytes()) + .context("Failed to parse end provisioning response plist")?; + let response = resp_plist + .get("Response") + .and_then(|v| v.as_dictionary()) + .ok_or(report!( + "End provisioning response missing Response dictionary" + ))?; + + ws_stream + .send(Message::Text( + serde_json::json!({ + "ptm": response + .get("ptm") + .and_then(|v| v.as_string()) + .ok_or(report!("End provisioning response missing ptm"))?, + "tk": response + .get("tk") + .and_then(|v| v.as_string()) + .ok_or(report!("End provisioning response missing tk"))?, + }) + .to_string() + .into(), + )) + .await + .context("Failed to send start provisioning data")?; + } + ProvisioningMessage::ProvisioningSuccess { adi_pb } => { + state.adi_pb = Some(BASE64_STANDARD.decode(adi_pb)?); + ws_stream.close(None).await?; + info!("Provisioning successful"); + break; + } + ProvisioningMessage::Timeout => bail!("Anisette provisioning timed out"), + ProvisioningMessage::InvalidIdentifier => { + bail!("Anisette provisioning failed: invalid identifier") + } + ProvisioningMessage::StartProvisioningError { message } => { + return Err( + report!("Anisette provisioning failed: start provisioning error") + .attach(message) + .into(), + ); + } + ProvisioningMessage::EndProvisioningError { message } => { + return Err( + report!("Anisette provisioning failed: end provisioning error") + .attach(message) + .into(), + ); + } + } + } + + Ok(()) + } +} + +#[derive(Deserialize)] +#[serde(tag = "result")] +enum ProvisioningMessage { + GiveIdentifier, + GiveStartProvisioningData, + GiveEndProvisioningData { cpim: String }, + ProvisioningSuccess { adi_pb: String }, + Timeout, + InvalidIdentifier, + StartProvisioningError { message: String }, + EndProvisioningError { message: String }, +} diff --git a/isideload/src/anisette/remote_v3/state.rs b/isideload/src/anisette/remote_v3/state.rs new file mode 100644 index 0000000..d87499b --- /dev/null +++ b/isideload/src/anisette/remote_v3/state.rs @@ -0,0 +1,81 @@ +// Serialization/Desieralization borrowed from https://github.com/SideStore/apple-private-apis/blob/master/omnisette/src/remote_anisette_v3.rs + +use plist::Data; +use rand::Rng; +use serde::{Deserialize, Deserializer, Serialize, Serializer}; +use sha2::{Digest, Sha256}; +use uuid::Uuid; + +fn bin_serialize(x: &[u8], s: S) -> Result +where + S: Serializer, +{ + s.serialize_bytes(x) +} + +fn bin_serialize_opt(x: &Option>, s: S) -> Result +where + S: Serializer, +{ + x.clone().map(|i| Data::new(i)).serialize(s) +} + +fn bin_deserialize_opt<'de, D>(d: D) -> Result>, D::Error> +where + D: Deserializer<'de>, +{ + let s: Option = Deserialize::deserialize(d)?; + Ok(s.map(|i| i.into())) +} + +fn bin_deserialize_16<'de, D>(d: D) -> Result<[u8; 16], D::Error> +where + D: Deserializer<'de>, +{ + let s: Data = Deserialize::deserialize(d)?; + let s: Vec = s.into(); + Ok(s.try_into().unwrap()) +} + +#[derive(Serialize, Deserialize)] +pub struct AnisetteState { + #[serde( + serialize_with = "bin_serialize", + deserialize_with = "bin_deserialize_16" + )] + pub keychain_identifier: [u8; 16], + #[serde( + serialize_with = "bin_serialize_opt", + deserialize_with = "bin_deserialize_opt" + )] + pub adi_pb: Option>, +} + +impl Default for AnisetteState { + fn default() -> Self { + AnisetteState { + keychain_identifier: rand::rng().random::<[u8; 16]>(), + adi_pb: None, + } + } +} + +impl AnisetteState { + pub fn new() -> AnisetteState { + AnisetteState::default() + } + + pub fn is_provisioned(&self) -> bool { + self.adi_pb.is_some() + } + + pub fn get_md_lu(&self) -> [u8; 32] { + let mut hasher = Sha256::new(); + hasher.update(&self.keychain_identifier); + hasher.finalize().into() + } + + pub fn get_device_id(&self) -> String { + Uuid::from_bytes(self.keychain_identifier).to_string() + } +} diff --git a/isideload/src/auth/apple_account.rs b/isideload/src/auth/apple_account.rs index 208ca3b..281e820 100644 --- a/isideload/src/auth/apple_account.rs +++ b/isideload/src/auth/apple_account.rs @@ -1,19 +1,15 @@ use crate::{ - SideloadResult as Result, anisette::{AnisetteProvider, remote_v3::RemoteV3AnisetteProvider}, auth::grandslam::GrandSlam, }; -use log::{info, warn}; -use reqwest::{Certificate, ClientBuilder}; -use thiserror_context::Context; - -const APPLE_ROOT: &[u8] = include_bytes!("./apple_root.der"); +use rootcause::prelude::*; +use tracing::{info, warn}; pub struct AppleAccount { pub email: String, pub spd: Option, - pub client: reqwest::Client, pub anisette: Box, + pub grandslam_client: GrandSlam, } pub struct AppleAccountBuilder { @@ -56,16 +52,20 @@ impl AppleAccountBuilder { /// - `two_factor_callback`: A callback function that returns the two-factor authentication code /// # Errors /// Returns an error if the reqwest client cannot be built - pub async fn login(self, _password: &str, _two_factor_callback: F) -> Result + pub async fn login( + self, + password: &str, + two_factor_callback: F, + ) -> Result where - F: Fn() -> Result, + F: Fn() -> Option, { let debug = self.debug.unwrap_or(false); let anisette = self .anisette .unwrap_or_else(|| Box::new(RemoteV3AnisetteProvider::default())); - AppleAccount::login(&self.email, debug, anisette).await + AppleAccount::login(&self.email, password, two_factor_callback, anisette, debug).await } } @@ -83,43 +83,36 @@ impl AppleAccount { /// Reccomended to use the AppleAccountBuilder instead pub async fn login( email: &str, + password: &str, + two_factor_callback: impl Fn() -> Option, + mut anisette: Box, debug: bool, - anisette: Box, - ) -> Result { + ) -> Result { info!("Logging in to apple ID: {}", email); if debug { warn!("Debug mode enabled: this is a security risk!"); } - let client = Self::build_client(debug)?; - let mut gs = GrandSlam::new(&client); - gs.get_url_bag() + let client_info = anisette + .get_client_info() .await - .context("Failed to get URL bag from GrandSlam")?; + .context("Failed to get anisette client info")?; + let mut grandslam_client = GrandSlam::new(client_info, debug); + let url_bag = grandslam_client + .get_url_bag() + .await + .context("Failed to get URL bag for login")?; + + let headers = anisette + .get_anisette_headers(&mut grandslam_client) + .await + .context("Failed to get anisette headers for login")?; Ok(AppleAccount { email: email.to_string(), spd: None, - client, anisette, + grandslam_client, }) } - - /// Build a reqwest client with the Apple root certificate - /// - /// # Arguments - /// - `debug`: DANGER, If true, accept invalid certificates and enable verbose connection logging - /// # Errors - /// Returns an error if the reqwest client cannot be built - pub fn build_client(debug: bool) -> Result { - let cert = Certificate::from_der(APPLE_ROOT)?; - let client = ClientBuilder::new() - .add_root_certificate(cert) - .http1_title_case_headers() - .danger_accept_invalid_certs(debug) - .connection_verbose(debug) - .build()?; - - Ok(client) - } } diff --git a/isideload/src/auth/grandslam.rs b/isideload/src/auth/grandslam.rs index 593b5f2..f302f1e 100644 --- a/isideload/src/auth/grandslam.rs +++ b/isideload/src/auth/grandslam.rs @@ -1,64 +1,102 @@ -use crate::SideloadResult as Result; -use log::debug; use plist::Dictionary; -use plist_macro::pretty_print_dictionary; -use reqwest::header::HeaderValue; +use reqwest::{Certificate, ClientBuilder, header::HeaderValue}; +use rootcause::prelude::*; +use tracing::debug; +use crate::anisette::AnisetteClientInfo; + +const APPLE_ROOT: &[u8] = include_bytes!("./apple_root.der"); const URL_BAG: &str = "https://gsa.apple.com/grandslam/GsService2/lookup"; -pub struct GrandSlam<'a> { - client: &'a reqwest::Client, - url_bag: Option, +pub struct GrandSlam { + pub client: reqwest::Client, + pub client_info: AnisetteClientInfo, + pub url_bag: Option, } -impl<'a> GrandSlam<'a> { +impl GrandSlam { /// Create a new GrandSlam instance /// /// # Arguments /// - `client`: The reqwest client to use for requests - pub fn new(client: &'a reqwest::Client) -> Self { + pub fn new(client_info: AnisetteClientInfo, debug: bool) -> Self { Self { - client, + client: Self::build_reqwest_client(debug).unwrap(), + client_info, url_bag: None, } } /// Get the URL bag from GrandSlam - pub async fn get_url_bag(&mut self) -> Result<&Dictionary> { + pub async fn get_url_bag(&mut self) -> Result<&Dictionary, Report> { if self.url_bag.is_none() { debug!("Fetching URL bag from GrandSlam"); let resp = self .client .get(URL_BAG) - .headers(Self::base_headers()) + .headers(self.base_headers()?) .send() - .await? + .await + .context("Failed to fetch URL Bag")? .text() - .await?; - let dict: Dictionary = plist::from_bytes(resp.as_bytes())?; - debug!("{}", pretty_print_dictionary(&dict)); - self.url_bag = Some(dict); + .await + .context("Failed to read URL Bag response text")?; + + let dict: Dictionary = + plist::from_bytes(resp.as_bytes()).context("Failed to parse URL Bag plist")?; + let urls = dict + .get("urls") + .and_then(|v| v.as_dictionary()) + .cloned() + .ok_or_else(|| report!("URL Bag plist missing 'urls' dictionary"))?; + + self.url_bag = Some(urls); } Ok(self.url_bag.as_ref().unwrap()) } - fn base_headers() -> reqwest::header::HeaderMap { + pub fn post(&self, url: &str) -> Result { + let builder = self.client.post(url).headers(self.base_headers()?); + + Ok(builder) + } + + fn base_headers(&self) -> Result { let mut headers = reqwest::header::HeaderMap::new(); - headers.insert("Context-Type", HeaderValue::from_static("text/x-xml-plist")); + headers.insert("Content-Type", HeaderValue::from_static("text/x-xml-plist")); headers.insert("Accept", HeaderValue::from_static("text/x-xml-plist")); headers.insert( "X-Mme-Client-Info", - HeaderValue::from_static( - " ", - ), + HeaderValue::from_str(&self.client_info.client_info)?, + ); + headers.insert( + "User-Agent", + HeaderValue::from_str(&self.client_info.user_agent)?, ); - headers.insert("User-Agent", HeaderValue::from_static("Xcode")); headers.insert("X-Xcode-Version", HeaderValue::from_static("14.2 (14C18)")); headers.insert( "X-Apple-App-Info", HeaderValue::from_static("com.apple.gs.xcode.auth"), ); - headers + Ok(headers) + } + + /// Build a reqwest client with the Apple root certificate + /// + /// # Arguments + /// - `debug`: DANGER, If true, accept invalid certificates and enable verbose connection logging + /// # Errors + /// Returns an error if the reqwest client cannot be built + pub fn build_reqwest_client(debug: bool) -> Result { + let cert = Certificate::from_der(APPLE_ROOT)?; + let client = ClientBuilder::new() + .add_root_certificate(cert) + .http1_title_case_headers() + .danger_accept_invalid_certs(debug) + .connection_verbose(debug) + .build()?; + + Ok(client) } } diff --git a/isideload/src/lib.rs b/isideload/src/lib.rs index 00ca26b..c20b94a 100644 --- a/isideload/src/lib.rs +++ b/isideload/src/lib.rs @@ -1,21 +1,3 @@ -use thiserror::Error as ThisError; -use thiserror_context::{Context, impl_context}; - pub mod anisette; pub mod auth; - -#[derive(Debug, ThisError)] -pub enum ErrorInner { - #[error("Failed sending request: {0}")] - Reqwest(#[from] reqwest::Error), - - #[error("Failed parsing plist: {0}")] - Plist(#[from] plist::Error), - - #[error("Invalid Header: {0}")] - InvalidHeader(#[from] reqwest::header::InvalidHeaderValue), -} - -impl_context!(Error(ErrorInner)); - -pub type SideloadResult = std::result::Result; +pub mod util; diff --git a/isideload/src/util/mod.rs b/isideload/src/util/mod.rs new file mode 100644 index 0000000..088c202 --- /dev/null +++ b/isideload/src/util/mod.rs @@ -0,0 +1 @@ +pub mod plist; diff --git a/isideload/src/util/plist.rs b/isideload/src/util/plist.rs new file mode 100644 index 0000000..a067b5c --- /dev/null +++ b/isideload/src/util/plist.rs @@ -0,0 +1,9 @@ +use plist_macro::{plist_to_xml_bytes, plist_value_to_xml_bytes}; + +pub fn plist_to_xml_string(p: &plist::Dictionary) -> String { + String::from_utf8(plist_to_xml_bytes(p)).unwrap() +} + +pub fn plist_value_to_xml_string(p: &plist::Value) -> String { + String::from_utf8(plist_value_to_xml_bytes(p)).unwrap() +}