Skip to content

Skip submitting validation data in login_apple_delegates if not provided by os_config #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
malmeloo wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −7
Open

Skip submitting validation data in login_apple_delegates if not provided by os_config #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d26f694
Skip submitting validation data in `login_apple_delegates` if not pro…
malmeloo May 5, 2026
3293392
Add serde alias for `MobileMeDelegateResponse` config field
malmeloo May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ pub struct IDSDelegateResponse {
#[derive(Deserialize)]
pub struct MobileMeDelegateResponse {
pub tokens: HashMap<String, String>,
#[serde(default)]
#[serde(alias = "com.apple.mobileme", default)]
pub config: Dictionary,
}

Expand Down Expand Up @@ -383,7 +383,7 @@ pub async fn login_apple_delegates<T: AnisetteProvider>(account: &AppleAccount<T
}
};

let validation_data = os_config.generate_validation_data().await?;
let validation_data = os_config.generate_validation_data().await;

let base_headers = account.anisette.lock().await.get_headers().await?.clone();
let mut anisette_headers: HeaderMap = base_headers.into_iter().map(|(a, b)| (HeaderName::from_str(&a).unwrap(), b.parse().unwrap())).collect();
Expand All @@ -392,17 +392,26 @@ pub async fn login_apple_delegates<T: AnisetteProvider>(account: &AppleAccount<T
anisette_headers.insert("Cookie", HeaderValue::from_str(cookie).unwrap());
}

let resp = REQWEST.post(os_config.get_login_url())
let mut req = REQWEST.post(os_config.get_login_url())
.header("Accept-Encoding", "gzip")
.header("User-Agent", os_config.get_normal_ua("com.apple.iCloudHelper/282"))
.header("X-Mme-Client-Info", os_config.get_mme_clientinfo(&os_config.get_aoskit_version()))
.header("X-Mme-Nas-Qualify", base64_encode(&validation_data))
.header("X-Apple-ADSID", adsid)
.headers(anisette_headers.clone())
.basic_auth(username, Some(pet))
.body(plist_to_string(&request)?)
.send()
.await?;
.body(plist_to_string(&request)?);

if let Ok(ref vd) = validation_data {
if !vd.is_empty() {
req = req.header("X-Mme-Nas-Qualify", base64_encode(vd));
} else {
debug!("Skipping validation data: generated data was empty");
}
} else {
debug!("Skipping validation data: result was an error: {:?}", validation_data.err());
}

let resp = req.send().await?;
let text = resp.text().await?;

let parsed = plist::Value::from_reader(Cursor::new(text.as_str()))?;
Expand Down