Skip to content

Native iCloud apps for Windows and Linux, built in Rust. Notes, Reminders, Calendar, Contacts, Drive and Photos, offline and in sync with your iPhone.

Report Apple's actual error, and recover when 409 is a false negative

Yashwanth Kamireddif1d9c67ace54
diff --git a/crates/quince-auth/src/lib.rs b/crates/quince-auth/src/lib.rs
index fad2068..93c5676 100644
--- a/crates/quince-auth/src/lib.rs
+++ b/crates/quince-auth/src/lib.rs
@@ -56,6 +56,27 @@ pub enum Error {
type Result<T> = std::result::Result<T, Error>;
+/// Apple returns `{"serviceErrors":[{"code":"-21669","message":"..."}]}` on failures.
+/// Surface its own words; a bare status code explains nothing.
+fn apple_error(context: &str, status: StatusCode, body: &str) -> Error {
+ let parsed: Option<Value> = serde_json::from_str(body).ok();
+ if let Some(v) = &parsed {
+ if let Some(errs) = v["serviceErrors"].as_array().filter(|a| !a.is_empty()) {
+ let code = errs[0]["code"].as_str().unwrap_or("");
+ let message = errs[0]["message"].as_str().unwrap_or("").trim();
+ // -21669 is Apple's "incorrect verification code".
+ if code == "-21669" {
+ return Error::BadCode;
+ }
+ if !message.is_empty() {
+ return Error::Protocol(format!("{context}: {message} (Apple code {code}, HTTP {status})"));
+ }
+ }
+ }
+ let snippet: String = body.chars().take(220).collect::<String>().replace('\n', " ");
+ Error::Protocol(format!("{context}: HTTP {status} {snippet}"))
+}
+
/// A phone Apple will text a code to, when no trusted device responds.
#[derive(Debug, Clone, serde::Serialize)]
#[serde(rename_all = "camelCase")]
@@ -444,11 +465,19 @@ impl Client {
.await?;
self.capture(&r);
let status = r.status();
+ let body = r.text().await.unwrap_or_default();
if !status.is_success() && status != StatusCode::NO_CONTENT {
- return Err(match status {
- StatusCode::BAD_REQUEST | StatusCode::PRECONDITION_FAILED => Error::BadCode,
- s => Error::Protocol(format!("code check failed ({s})")),
- });
+ let err = apple_error("checking that texted code", status, &body);
+ if matches!(err, Error::BadCode) {
+ return Err(err);
+ }
+ if self.trust().await.is_ok() {
+ let data = self.account_login().await?;
+ self.absorb(&data);
+ self.persist()?;
+ return Ok(());
+ }
+ return Err(err);
}
self.trust().await?;
let data = self.account_login().await?;
@@ -470,12 +499,23 @@ impl Client {
.await?;
self.capture(&r);
let status = r.status();
+ let body = r.text().await.unwrap_or_default();
if !status.is_success() && status != StatusCode::NO_CONTENT {
- // Apple uses 400/412 for a wrong code; anything else is a real protocol problem.
- return Err(match status {
- StatusCode::BAD_REQUEST | StatusCode::PRECONDITION_FAILED => Error::BadCode,
- s => Error::Protocol(format!("code check failed ({s})")),
- });
+ let err = apple_error("checking that code", status, &body);
+ // A genuinely wrong code is final; don't burn an attempt probing further.
+ if matches!(err, Error::BadCode) {
+ return Err(err);
+ }
+ // Apple answers 409 on this endpoint in some flows even though the code WAS
+ // accepted. The status alone is not evidence, so ask whether the session became
+ // usable before reporting a failure.
+ if self.trust().await.is_ok() {
+ let data = self.account_login().await?;
+ self.absorb(&data);
+ self.persist()?;
+ return Ok(());
+ }
+ return Err(err);
}
self.trust().await?;
@@ -491,8 +531,9 @@ impl Client {
let r = self.http.get(format!("{AUTH}/2sv/trust")).headers(headers).send().await?;
self.capture(&r);
let status = r.status();
+ let body = r.text().await.unwrap_or_default();
if !status.is_success() && status != StatusCode::NO_CONTENT {
- return Err(Error::Protocol(format!("couldn't trust this device ({status})")));
+ return Err(apple_error("trusting this device", status, &body));
}
if self.session.trust_token.is_none() {
return Err(Error::NoTrustToken);
diff --git a/probe/src/main.rs b/probe/src/main.rs
index 9b57efa..608bfa3 100644
--- a/probe/src/main.rs
+++ b/probe/src/main.rs
@@ -111,6 +111,7 @@ fn state_dir() -> PathBuf {
#[tokio::main]
async fn main() -> Result<()> {
let fresh = std::env::args().any(|a| a == "--fresh");
+ let code_only = std::env::args().any(|a| a == "--code");
let dir = state_dir();
let mut client = Client::new(&dir)?;
@@ -135,7 +136,31 @@ async fn main() -> Result<()> {
}
// ---- 2. full sign-in --------------------------------------------------------
- if !resumed {
+ // `--code` resumes an in-flight 2FA challenge using the session already on disk, so a
+ // retry doesn't cost another sign-in.
+ if !resumed && code_only {
+ println!("Resuming the pending two-factor challenge (no new sign-in)…\n");
+ let opts = client.two_factor_options().await?;
+ println!(" trusted devices Apple pushed to : {}", opts.trusted_device_count);
+ for (i, ph) in opts.phones.iter().enumerate() {
+ println!(" [{}] {}", i + 1, ph.masked_number);
+ }
+ loop {
+ let code = prompt(" Code: ")?;
+ let code = code.trim().to_string();
+ if code.len() != 6 || !code.chars().all(|c| c.is_ascii_digit()) {
+ println!(" that isn't a 6-digit code");
+ continue;
+ }
+ match client.submit_two_factor(&code).await {
+ Ok(()) => {
+ println!(" \x1b[32maccepted\x1b[0m");
+ break;
+ }
+ Err(e) => println!(" {e}"),
+ }
+ }
+ } else if !resumed {
let apple_id = match std::env::var("QUINCE_APPLE_ID") {
Ok(v) if !v.is_empty() => v,
_ => prompt("Apple ID: ")?,