Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 24 additions & 2 deletions src/accountmanager/legacy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::{

use log::debug;
use secrecy::{CloneableSecret, DebugSecret, ExposeSecret};
use serde::Deserialize;
use serde::{Deserialize, Deserializer};
use steamguard::{token::TwoFactorSecret, SecretString, SteamGuardAccount};
use zeroize::{Zeroize, ZeroizeOnDrop};

Expand Down Expand Up @@ -154,10 +154,32 @@ pub struct Session {
pub web_cookie: Option<String>,
#[serde(default, rename = "OAuthToken")]
pub token: Option<String>,
#[serde(rename = "SteamID")]
#[serde(
default,
rename = "SteamID",
deserialize_with = "deserialize_optional_u64"
)]
pub steam_id: Option<u64>,
}

fn deserialize_optional_u64<'de, D: Deserializer<'de>>(
deserializer: D,
) -> Result<Option<u64>, D::Error> {
#[derive(Deserialize)]
#[serde(untagged)]
enum StringOrU64 {
String(String),
U64(u64),
}

Option::<StringOrU64>::deserialize(deserializer)?
.map(|value| match value {
StringOrU64::String(value) => value.parse().map_err(serde::de::Error::custom),
StringOrU64::U64(value) => Ok(value),
})
.transpose()
}

impl CloneableSecret for Session {}
impl DebugSecret for Session {}

Expand Down
5 changes: 5 additions & 0 deletions src/accountmanager/migrate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,11 @@ mod tests {
account_name: "example",
steam_id: 1234,
},
Test {
mafile: "src/fixtures/maFiles/compat/string-steam-id.maFile",
account_name: "example",
steam_id: 76561000000000000,
},
Test {
mafile: "src/fixtures/maFiles/compat/steamv2/sample.maFile",
account_name: "afarihm",
Expand Down
20 changes: 20 additions & 0 deletions src/fixtures/maFiles/compat/string-steam-id.maFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"shared_secret": "zvIayp3JPvtvX/QGHqsqKBk/44s=",
"serial_number": "14767137786155771371",
"revocation_code": "R12345",
"uri": "otpauth://totp/Steam:example?secret=ASDF&issuer=Steam",
"account_name": "example",
"token_gid": "5f28d367c8d78a0",
"identity_secret": "kjsdlwowiqe=",
"secret_1": "sklduhfgsdlkjhf=",
"device_id": "android:99d2ad0e-4bad-4247-b111-26393aae0be3",
"server_time": 1790072054,
"fully_enrolled": true,
"Session": {
"SteamID": "76561000000000000",
"SessionID": "4dd7d775277043d772537f67",
"SteamLoginSecure": "76561000000000000%7C%7Csynthetic-token",
"AccessToken": "synthetic-access-token",
"RefreshToken": "synthetic-refresh-token"
}
}
Loading