simono41/steamguard-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adjust the types used for migrating from SDA to be a little more lenient (#338)

Browse source 
fixes #337
This commit is contained in:
Carson McManus 2023-10-25 10:17:21 -04:00 committed by GitHub
parent a9e39b4215
commit 8bfab8d2a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/accountmanager/legacy.rs
View file

@ -128,9 +128,11 @@ pub struct SdaAccount {
pub token_gid: String, pub token_gid: String,
#[serde(with = "crate::secret_string")] #[serde(with = "crate::secret_string")]
pub identity_secret: SecretString, pub identity_secret: SecretString,
#[serde(default)]
pub server_time: u64, pub server_time: u64,
#[serde(with = "crate::secret_string")] #[serde(with = "crate::secret_string")]
pub uri: SecretString, pub uri: SecretString,
#[serde(default)]
pub fully_enrolled: bool, pub fully_enrolled: bool,
pub device_id: String, pub device_id: String,
#[serde(with = "crate::secret_string")] #[serde(with = "crate::secret_string")]

9
src/accountmanager/migrate.rs
View file

@ -359,6 +359,10 @@ mod tests {
manifest: "src/fixtures/maFiles/compat/difficult-migration/manifest.json", manifest: "src/fixtures/maFiles/compat/difficult-migration/manifest.json",
passkey: None, passkey: None,
}, },
Test {
manifest: "src/fixtures/maFiles/compat/missing-unnecessary/manifest.json",
passkey: None,
},
]; ];
for case in cases { for case in cases {
eprintln!("testing: {:?}", case); eprintln!("testing: {:?}", case);
@ -421,6 +425,11 @@ mod tests {
account_name: "example", account_name: "example",
steam_id: 1234, steam_id: 1234,
}, },
Test {
mafile: "src/fixtures/maFiles/compat/missing-unnecessary/1234.maFile",
account_name: "example",
steam_id: 1234,
},
]; ];
for case in cases { for case in cases {
eprintln!("testing: {:?}", case); eprintln!("testing: {:?}", case);

1
src/fixtures/maFiles/compat/missing-unnecessary/1234.maFile Normal file
View file

@ -0,0 +1 @@
{"shared_secret":"zvIayp3JPvtvX/QGHqsqKBk/44s=","serial_number":"kljasfhds","revocation_code":"R12345","uri":"otpauth://totp/Steam:example?secret=ASDF&issuer=Steam","account_name":"example","token_gid":"jkkjlhkhjgf","identity_secret":"kjsdlwowiqe=","secret_1":"sklduhfgsdlkjhf=","status":1,"device_id":"android:99d2ad0e-4bad-4247-b111-26393aae0be3","Session":{"SessionID":"a;lskdjf","SteamLogin":"983498437543","SteamLoginSecure":"dlkjdsl;j%7C%32984730298","WebCookie":";lkjsed;klfjas98093","OAuthToken":"asdk;lf;dsjlkfd","SteamID":1234}}

1
src/fixtures/maFiles/compat/missing-unnecessary/manifest.json Normal file
View file

@ -0,0 +1 @@
{"encrypted":false,"first_run":true,"entries":[{"encryption_iv":null,"encryption_salt":null,"filename":"1234.maFile","steamid":1234}],"periodic_checking":false,"periodic_checking_interval":5,"periodic_checking_checkall":false,"auto_confirm_market_transactions":false,"auto_confirm_trades":false}