mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 04:46:08 +00:00
Some Microsoft accounts get a delegation-compact (d=) ticket, which the
pinned Xbox backend (Nexus 0.2.8) rejected: the library stayed empty
(store-ticket-format) and downloads failed. This moves the backend to
Nexus 0.2.12, which has the upstream store-ticket fix, rebases the
DroidDeck credentials, launch-view and cloud-token patches, and strips
the d= prefix from compact JWE tickets so downloads work again.
Tested by seven users in the Discord Xbox Store Issues thread on the
pr-1729 build at d55e05a0.
* Update Xbox backend to 0.2.12
* Fix cloud offering fallback and add regression tests
* Fix Xbox authentication with compact JWE tickets
80 lines
3.5 KiB
Diff
80 lines
3.5 KiB
Diff
--- a/crates/xodus/src/models/secrets.rs
|
|
+++ b/crates/xodus/src/models/secrets.rs
|
|
@@ -80,9 +80,17 @@
|
|
}
|
|
}
|
|
|
|
-/// Store and licensing services reject delegation-compact tickets in the "d="
|
|
-/// form that Xbox Live sign-in needs (InvalidMsaTicketFormat) and accept the
|
|
-/// same value as "t=". Convert only where a ticket is sent to those services.
|
|
+// Xbox accepts compact JWE tickets without the delegation prefix; opaque
|
|
+// delegation tickets keep their original wire representation.
|
|
+pub fn xbox_ticket(ticket: String) -> String {
|
|
+ match ticket.strip_prefix("d=") {
|
|
+ Some(raw) if is_compact_jwe(raw) => raw.to_owned(),
|
|
+ _ => ticket,
|
|
+ }
|
|
+}
|
|
+
|
|
+/// Store services accept delegation-compact tickets in the "t=" form.
|
|
+/// Convert only where a ticket is sent to those services.
|
|
pub fn store_ticket(ticket: String) -> String {
|
|
match ticket.strip_prefix("d=") {
|
|
Some(value) => format!("t={value}"),
|
|
--- a/crates/xodus/src/models/licensing_ticket_tests.rs
|
|
+++ b/crates/xodus/src/models/licensing_ticket_tests.rs
|
|
@@ -1,5 +1,5 @@
|
|
//! Public synthetic data only, no account, keyring or network access.
|
|
-use super::{Token, licensing_ticket, store_ticket};
|
|
+use super::{Token, licensing_ticket, store_ticket, xbox_ticket};
|
|
use crate::models::soap;
|
|
use base64::{Engine, engine::general_purpose::URL_SAFE_NO_PAD};
|
|
use serde_json::json;
|
|
@@ -77,3 +77,35 @@
|
|
let long_header = jwe(json!({"alg":"dir","enc":"A256GCM","kid":"a".repeat(9000)}), "");
|
|
assert_eq!(licensing_ticket(format!("d={long_header}")), format!("t={long_header}"));
|
|
}
|
|
+
|
|
+#[test]
|
|
+fn credential_xbox_ticket_compact_jwe_uses_bare_wire_format_without_changing_store_conversion() {
|
|
+ for raw in [
|
|
+ jwe(json!({"alg":"dir","enc":"A128CBC-HS256"}), ""),
|
|
+ jwe(json!({"alg":"RSA-OAEP-256","enc":"A256GCM"}), "a2V5"),
|
|
+ ] {
|
|
+ let Token::Compact(original) = delegation(&raw) else { panic!("fixture"); };
|
|
+ assert_eq!(original, format!("d={raw}"));
|
|
+ assert_eq!(store_ticket(original.clone()), format!("t={raw}"));
|
|
+ assert_eq!(xbox_ticket(original), raw);
|
|
+ assert_eq!(xbox_ticket(raw.clone()), raw);
|
|
+ assert_eq!(xbox_ticket(format!("t={raw}")), format!("t={raw}"));
|
|
+ }
|
|
+}
|
|
+
|
|
+#[test]
|
|
+fn credential_xbox_ticket_opaque_and_malformed_tokens_are_preserved() {
|
|
+ let valid = jwe(json!({"alg":"dir","enc":"A256GCM"}), "");
|
|
+ let mut cases = vec!["d=opaque".to_string(), "opaque".into(), "".into(), "d=".into(),
|
|
+ "d=opaque..iv.ciphertext.tag".into(), "d=eyJ..a.b.c".into(),
|
|
+ format!("d={valid}.extra"), format!("d={}", valid.replace("..", ".+.")),
|
|
+ format!("d={}", jwe(json!({"alg":"dir"}), "")),
|
|
+ format!("d={}", jwe(json!({"alg":"dir","enc":""}), "")),
|
|
+ format!("d={}", jwe(json!({"alg":"dir","enc":"A256GCM","kid":"a".repeat(9000)}), ""))];
|
|
+ let mut parts: Vec<_> = valid.split('.').map(str::to_string).collect();
|
|
+ for index in [2, 3, 4] {
|
|
+ let old = parts[index].clone(); parts[index].clear();
|
|
+ cases.push(format!("d={}", parts.join("."))); parts[index] = old;
|
|
+ }
|
|
+ for ticket in cases { assert_eq!(xbox_ticket(ticket.clone()), ticket); }
|
|
+}
|
|
--- a/crates/xodus/src/api/xbox/auth.rs
|
|
+++ b/crates/xodus/src/api/xbox/auth.rs
|
|
@@ -12,7 +12,7 @@
|
|
properties: UserAuthProperties {
|
|
auth_method: "RPS".to_string(),
|
|
site_name: "user.auth.xboxlive.com".to_string(),
|
|
- rps_ticket,
|
|
+ rps_ticket: crate::models::secrets::xbox_ticket(rps_ticket),
|
|
},
|
|
};
|
|
|