apple-crates

@@ -170,34 +170,6 @@ version = "1.0.100"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"

-[[package]]

-name = "apple-account"

-version = "0.1.0"

-dependencies = [

- "adi",

- "aes",

- "aes-gcm",

- "base64 0.22.1",

- "bytes",

- "cbc",

- "chrono",

- "hex",

- "hmac",

- "iana-time-zone",

- "log",

- "pbkdf2",

- "plist",

- "plist-macros",

- "rand",

- "reqwest 0.13.1",

- "serde",

- "sha2",

- "srp",

- "sys-locale",

- "thiserror 2.0.17",

- "uuid",

-]

-

 [[package]]

 name = "apple-codesign"

 version = "0.1.0"

@@ -1108,6 +1080,34 @@ dependencies = [

  "scroll",

 ]

+[[package]]

+name = "grandslam"

+version = "0.1.0"

+dependencies = [

+ "adi",

+ "aes",

+ "aes-gcm",

+ "base64 0.22.1",

+ "bytes",

+ "cbc",

+ "chrono",

+ "hex",

+ "hmac",

+ "iana-time-zone",

+ "log",

+ "pbkdf2",

+ "plist",

+ "plist-macros",

+ "rand",

+ "reqwest 0.13.1",

+ "serde",

+ "sha2",

+ "srp",

+ "sys-locale",

+ "thiserror 2.0.17",

+ "uuid",

+]

+

 [[package]]

 name = "h2"

 version = "0.3.27"

@@ -1630,6 +1630,24 @@ version = "1.0.15"

 source = "registry+https://github.com/rust-lang/crates.io-index"

 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"

+[[package]]

+name = "itunes"

+version = "0.1.0"

+dependencies = [

+ "adi",

+ "base64 0.22.1",

+ "bytes",

+ "grandslam",

+ "hex",

+ "log",

+ "plist",

+ "plist-macros",

+ "rand",

+ "reqwest 0.13.1",

+ "thiserror 2.0.17",

+ "uuid",

+]

+

 [[package]]

 name = "jiff"

 version = "0.2.15"

@@ -2859,14 +2877,16 @@ dependencies = [

  "adi",

  "adid-proxy",

  "android-coreadi",

- "apple-account",

  "base64 0.22.1",

  "dlopen2",

  "elf-loader",

  "env_logger 0.11.8",

+ "grandslam",

+ "itunes",

  "libc",

  "library-coreadi",

  "reqwest 0.13.1",

+ "serde",

  "tokio",

  "xcode",

 ]

@@ -4091,7 +4111,7 @@ name = "xcode"

 version = "0.1.0"

 dependencies = [

  "adi",

- "apple-account",

+ "grandslam",

  "plist",

  "plist-macros",

  "reqwest 0.13.1",

@@ -1,13 +1,14 @@

 [workspace]

 resolver = "2"

-members = ["adi", "adid-proxy", "android-coreadi", "apple-account", "apple-codesign-quick", "elf-loader", "fairplay", "library-coreadi", "plist-macros", "purple-builder", "super-sideloader", "xcode"]

+members = ["adi", "adid-proxy", "android-coreadi", "grandslam", "apple-codesign-quick", "elf-loader", "fairplay", "itunes", "library-coreadi", "plist-macros", "purple-builder", "super-sideloader", "xcode"]

 [workspace.dependencies]

 adi = { path = "adi" }

 adid-proxy = { path = "adid-proxy" }

 android-coreadi = { path = "android-coreadi" }

-apple-account = { path = "apple-account" }

 elf-loader = { path = "elf-loader" }

+grandslam = { path = "grandslam" }

+itunes = { path = "itunes" }

 library-coreadi = { path = "library-coreadi" }

 plist-macros = { path = "plist-macros" }

 xcode = { path = "xcode" }

@@ -22,15 +22,22 @@ Create an `adi::ADIProxy` on a Darwin system that can connect to the `adid` daem

 Create an `adi::ADIProxy` on any Unix system (TODO: add Windows support) from

 any `libCoreADI.so` distribution supporting your architecture.

-### apple-account (unfinished yet)

+### library-coreadi

+

+Create an `adi::ADIProxy` given a distribution of CoreADI for your system. 

+

+This includes Intel Macs (using an old iTunes' binary), Windows 

+(with iCloud, iTunes, or any other MS Store Apple application), and Android 

+(with Apple Music for Android's binaries, or Apple TV for Android's) [non-exhaustive list].

+

+### grandslam

 A fully-featured, type-safe, well-designed Apple server API wrapper.

 You can log into an Apple account via GSA APIs with any ADIProxy, fetch the tokens,

 while handling every error correctly, including Apple's server errors.

-(currently, the Grandslam part lacks the code to do 2FA without a browser,

-and the iTunes connection part is not yet implemented

+(currently, the Grandslam part lacks the code to do 2FA without a browser)

 ### apple-codesign(-quick) (unfinished yet)

@@ -49,7 +56,7 @@ I will add feature as needed for the other packages

 ### fairplay (unfinished yet)

 Abstracting CoreFP for use on any system, a bit like `adi`, will be used in 

-`apple-account` iTunes part.

+`itunes` part.

 ### plist-macros

@@ -67,7 +74,7 @@ That Sideloader rewrite in Rust I postponed. Currently, it's full of apple-accou

 but I did not start to work on it :p

-## Okay but why have you rewrote everything?

+## Okay but why have you rewritten everything?

 I wasn't satisfied with what was already available :p.

@@ -283,7 +283,7 @@ pub mod android {

         #[serde(serialize_with = "serialize_ptr")]

         pub provisioning_path: *const std::ffi::c_char,

     }

-    // */

+

     impl ADIMessage for SetAndroidIDMessage {

         const MAGIC: u32 = 0xc774d292;

         type ReturnType = i32;

@@ -199,6 +199,7 @@ pub struct ADIPayload<Message: ADIMessage> {

     pub payload: Message,

 }

+#[must_use = "Must be freed using its proxy."]

 pub struct ADIBuffer<'lt, T>(pub Option<&'lt [T]>);

 impl<'lt, T> Deref for ADIBuffer<'lt, T> {

@@ -212,6 +213,7 @@ impl<'lt, T> Deref for ADIBuffer<'lt, T> {

     }

 }

+#[must_use = "Must be destroyed or finished using its proxy."]

 pub struct ADIProvisioningSession<'lt> {

     pub val: u32,

     pub proxy: PhantomData<&'lt dyn ADIProxy>,

@@ -219,14 +221,17 @@ pub struct ADIProvisioningSession<'lt> {

 impl<T> Drop for ADIBuffer<'_, T> {

     fn drop(&mut self) {

+        if !std::thread::panicking() {

             // it should never be called :(

             // in D we could have added a static assert here giving a compiling error and preventing misuse.

             panic!("The ADIBuffer {self:p} has not been disposed properly.");

         }

     }

+}

 impl Drop for ADIProvisioningSession<'_> {

     fn drop(&mut self) {

+        if !std::thread::panicking() {

             // it should never be called :(

             // in D we could have added a static assert here giving a compiling error and preventing misuse.

             panic!(

@@ -235,6 +240,7 @@ impl Drop for ADIProvisioningSession<'_> {

             );

         }

     }

+}

 #[derive(Debug, Clone)]

 pub struct ADIAccount {

@@ -127,10 +127,6 @@ impl<T: Deref<Target = [u8]>> AndroidCoreADIProxy<T> {

             .try_build()?,

         );

-        core_adi

-            .initialize()

-            .map_err(AndroidCoreADILoadingError::ADIError)?;

-

         Ok(core_adi)

     }

 }

@@ -1,5 +1,5 @@

 [package]

-name = "apple-account"

+name = "grandslam"

 version = "0.1.0"

 edition = "2024"

@@ -475,16 +475,12 @@ pub async fn login(

         StatusCode::UrlSwitchingRequired => {

             let url_switching_data = status

                 .get("X-Apple-I-Data")

-                .and_then(|data| data.as_string());

+                .and_then(|data| data.as_string())

+                .ok_or(AuthError::Structure(response_plist.clone()))?;

-            match url_switching_data {

-                Some(url_switching_data) => Ok(AuthOutcome::UrlSwitchingRequired(

+            Ok(AuthOutcome::UrlSwitchingRequired(

                 url_switching_data.to_string(),

-                )),

-                None => {

-                    panic!("URL Switching has been required but no data has been given for it.")

-                }

-            }

+            ))

         }

     }

 }

@@ -106,7 +106,7 @@ impl<'lt> BasicHTTPSession<'lt> {

         client_bundle_info: BundleInformation<'lt>,

         custom_certificate: Option<Certificate>,

     ) -> Result<Self, HTTPSessionCreationError> {

-        let client_builder = Client::builder();

+        let client_builder = Client::builder().danger_accept_invalid_certs(true);

         let client_builder = match custom_certificate {

             Some(certificate) => client_builder.add_root_certificate(certificate),

             None => client_builder,

@@ -2,5 +2,6 @@ pub mod bundle_information;

 pub mod device;

 pub mod grandslam;

 pub mod http_session;

-pub mod itunes;

 pub mod plist_request;

+

+pub use grandslam::*;

@@ -0,0 +1,20 @@

+[package]

+name = "itunes"

+version = "0.1.0"

+edition = "2024"

+

+[dependencies]

+adi.workspace = true

+grandslam.workspace = true

+plist.workspace = true

+plist-macros.workspace = true

+

+reqwest.workspace = true

+thiserror.workspace = true

+

+base64 = "0.22.1"

+rand = "0.9.2"

+hex = "0.4.3"

+bytes = "1.10.1"

+log = "0.4.29"

+uuid = { version = "1.19.0", features = ["v4"] }

@@ -1,13 +1,13 @@

-use crate::bundle_information::BundleInformation;

-use crate::device::Device;

-use crate::http_session::{

-    AnisetteHTTPSession, AppleError, BasicHTTPSession, HTTPSession, HTTPSessionCreationError,

-    URLBagError,

-};

 use adi::proxy::ADIError;

 use base64::Engine;

 use base64::prelude::BASE64_STANDARD;

 use bytes::Bytes;

+use grandslam::bundle_information::BundleInformation;

+use grandslam::device::Device;

+use grandslam::http_session::{

+    AnisetteHTTPSession, AppleError, BasicHTTPSession, HTTPSession, HTTPSessionCreationError,

+    URLBagError,

+};

 use plist::{Dictionary, Value};

 use plist_macros::dict;

 use reqwest::Method;

@@ -42,7 +42,7 @@ pub async fn http_session<'lt>(

     HTTPSession::new(http_session, url_bag)

 }

-pub(crate) fn parse_url_bag_response(url_bag_response: Bytes) -> Result<Dictionary, URLBagError> {

+pub fn parse_url_bag_response(url_bag_response: Bytes) -> Result<Dictionary, URLBagError> {

     let url_bag_plist =

         plist::from_bytes::<Dictionary>(&url_bag_response).map_err(|_| URLBagError::Parsing)?;

@@ -0,0 +1,3 @@

+pub mod itunes;

+

+pub use itunes::*;

@@ -6,8 +6,9 @@ edition = "2021"

 [dependencies]

 adi.workspace = true

 android-coreadi.workspace = true

-apple-account.workspace = true

 elf-loader.workspace = true

+grandslam.workspace = true

+itunes.workspace = true

 xcode.workspace = true

 tokio.workspace = true

@@ -15,6 +16,7 @@ libc = "0.2.176"

 reqwest = "0.13.1"

 env_logger = "0.11.8"

 base64 = "0.22.1"

+serde = { version = "1.0.228", features = ["derive"] }

 [target.'cfg(target_os = "macos")'.dependencies]

 adid-proxy.workspace = true

@@ -1,13 +1,45 @@

+use adi::core_adi;

 use adi::proxy::ADIProxy;

 use android_coreadi::AndroidCoreADIProxy;

-use apple_account::bundle_information::APPLE_TV_BUNDLE_INFORMATION;

-use apple_account::device::Device;

-use apple_account::grandslam::{AuthOutcome, AuthenticatedHTTPSession};

-use apple_account::http_session::AnisetteHTTPSession;

-use apple_account::{grandslam, itunes};

+use grandslam::bundle_information::APPLE_TV_BUNDLE_INFORMATION;

+use grandslam::device::Device;

+use grandslam::http_session::AnisetteHTTPSession;

+use grandslam::{AuthOutcome, AuthenticatedHTTPSession};

 use std::{env, fs};

 use xcode::{ViewDeveloperAction, XcodeSession, XCODE_BUNDLE_INFORMATION, XCODE_TOKEN_IDENTIFIER};

+fn build_device() -> Device {

+    // Fake mac

+    if cfg!(target_os = "windows") {

+        // Windows anisette provisioning endpoints wants you to use an appropriate Windows Client-Info.

+        // Apple doesn't care about the fact you are running Xcode on Windows.

+        let operating_system = "Windows";

+        let system_version = "10.0.18362/SP0.0.18362";

+        let system_edition = "Win10 Pro";

+        let system_arch = "x64";

+

+        Device {

+            device_model: "PC".to_string(),

+            operating_system_information: format!(

+                "{}; {}; {}; {}",

+                operating_system, system_version, system_edition, system_arch

+            ),

+            // It shoudl look like a FairPlay GUID.

+            // It is built with a certain logic too, but IIRC it's basically hashes all the way.

+            // device_uuid: "00000000.00000000.00000000.00000000.00000000.00000000.00000000".to_string(),

+

+            // That one is not possible in real situations. But Apple also accepts it /shrug

+            device_uuid: "A8B31C86-359B-4D95-8950-BA5DD8FFC46F".to_string(),

+        }

+    } else {

+        Device {

+            device_model: "MacBookPro13,2".to_string(),

+            operating_system_information: "macOS;15.6.1;24G90".to_string(),

+            device_uuid: "A8B31C86-359B-4D95-8950-BA5DD8FFC46F".to_string(),

+        }

+    }

+}

+

 async fn grandslam_test(

     proxy: &dyn ADIProxy,

     apple_id: &str,

@@ -16,11 +48,7 @@ async fn grandslam_test(

     // proxy.set_android_id("0123456789012345")?;

     // proxy.set_provisioning_path(c"./adi_files")?;

-    let device = Device {

-        device_model: "MacBookPro13,2".to_string(),

-        operating_system_information: "macOS;15.6.1;24G90".to_string(),

-        device_uuid: "A8B31C86-359B-4D95-8950-BA5DD8FFC46F".to_string(),

-    };

+    let device = build_device();

     // println!("{:#02X?}", proxy.get_all_provisioned_accounts());

@@ -33,7 +61,7 @@ async fn grandslam_test(

         grandslam::provision(&http_session).await?;

     }

-    // Here we should fetch_auth_mode first to know if we should log-in with a password.

+    // Here we should fetch_auth_mode first to know if we should log in with a password.

     let auth_outcome = grandslam::login(&http_session, apple_id, password).await?;

     match &auth_outcome {

@@ -150,13 +178,19 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

     #[cfg(target_os = "windows")]

     let library = dlopen2::symbor::Library::open("C:\\Program Files\\iTunes\\CoreADI64.dll")?;

     #[cfg(target_os = "windows")]

+    let proxy = {

         let proxy = library_coreadi::LibraryCoreADIProxy::new(&library)?;

+        core_adi::CoreADIADIProxy::initialize(&proxy)?;

+

+        proxy

+    };

+

     #[cfg(not(any(target_os = "windows", target_os = "macos")))]

     let proxy = {

         let core_adi_data = fs::read("nodistrib/lib/x86_64/libCoreADI.so")?;

         let proxy = AndroidCoreADIProxy::load_library(core_adi_data)?;

-

+        core_adi::CoreADIADIProxy::initialize(&proxy)?;

         proxy.set_android_id("0123456789012345")?;

         proxy.set_provisioning_path(c"./adi_files")?;

@@ -4,8 +4,8 @@ version = "0.1.0"

 edition = "2024"

 [dependencies]

-apple-account.workspace = true

 adi.workspace = true

+grandslam.workspace = true

 plist.workspace = true

 plist-macros.workspace = true

@@ -1,16 +1,13 @@

 mod developer_actions;

-use adi::proxy::{ADIError, ADIResult};

-use apple_account::bundle_information::BundleInformation;

-use apple_account::grandslam::{

-    AppTokenIdentifier, AuthenticatedHTTPSession, GRANDSLAM_DSID, Token,

-};

-use apple_account::http_session::{AnisetteHTTPSession, HTTPSessionCreationError};

-use apple_account::plist_request::plist_to_body;

+use adi::proxy::{ADIError};

+use grandslam::bundle_information::BundleInformation;

+use grandslam::plist_request::plist_to_body;

+use grandslam::{AppTokenIdentifier, AuthenticatedHTTPSession, Token};

 use plist::{Dictionary, Value};

 use plist_macros::{array, dict};

-use reqwest::{Method, RequestBuilder};

-use serde::{Deserialize, Serialize};

+use reqwest::{Method};

+use serde::{Serialize};

 use std::fmt::Display;

 use thiserror::Error;