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

trade: adjust logging for deserializing confirmations (#237)

Browse source
This commit is contained in:
Carson McManus 2023-06-26 19:11:15 -04:00 committed by GitHub
parent f8ae7d4e0e
commit 4fed9486de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -2217,6 +2217,7 @@ dependencies = [
"secrecy",
"serde",
"serde_json",
"serde_path_to_error",
"standback",
"thiserror",
"uuid",

1
steamguard/Cargo.toml
View file

@ -34,6 +34,7 @@ protobuf = "3.2.0"
protobuf-json-mapping = "3.2.0"
hmac-sha256 = "1.1.7"
phonenumber = "0.3"
serde_path_to_error = "0.1.11"
[build-dependencies]
anyhow = "^1.0"

22
steamguard/src/lib.rs
View file

@ -179,10 +179,10 @@ impl SteamGuardAccount {
trace!("{:?}", resp);
let text = resp.text().unwrap();
trace!("text: {:?}", text);
trace!("{}", text);
debug!("Confirmations response: {}", text);
let body: ConfirmationListResponse = serde_json::from_str(text.as_str())?;
let mut deser = serde_json::Deserializer::from_str(text.as_str());
let body: ConfirmationListResponse = serde_path_to_error::deserialize(&mut deser)?;
ensure!(body.success);
Ok(body.conf)
}
@ -222,7 +222,8 @@ impl SteamGuardAccount {
let raw = resp.text()?;
debug!("send_confirmation_ajax() response body: {:?}", &raw);
let body: SendConfirmationResponse = serde_json::from_str(raw.as_str())?;
let mut deser = serde_json::Deserializer::from_str(raw.as_str());
let body: SendConfirmationResponse = serde_path_to_error::deserialize(&mut deser)?;
if !body.success {
return Err(anyhow!("Server responded with failure."));
@ -256,16 +257,19 @@ impl SteamGuardAccount {
let time = steamapi::get_server_time()?.server_time();
let query_params = self.get_confirmation_query_params("details", time);
let resp: ConfirmationDetailsResponse = client.get(format!("https://steamcommunity.com/mobileconf/details/{}", conf.id).parse::<Url>().unwrap())
let resp = client.get(format!("https://steamcommunity.com/mobileconf/details/{}", conf.id).parse::<Url>().unwrap())
.header("X-Requested-With", "com.valvesoftware.android.steam.community")
.header(USER_AGENT, "Mozilla/5.0 (Linux; U; Android 4.1.1; en-us; Google Nexus 4 - 4.1.1 - API 16 - 768x1280 Build/JRO03S) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30")
.header(COOKIE, cookies.cookies(&url).unwrap())
.query(&query_params)
.send()?
.json()?;
.send()?;
ensure!(resp.success);
Ok(resp.html)
let text = resp.text()?;
let mut deser = serde_json::Deserializer::from_str(text.as_str());
let body: ConfirmationDetailsResponse = serde_path_to_error::deserialize(&mut deser)?;
ensure!(body.success);
Ok(body.html)
}
/// Removes the mobile authenticator from the steam account. If this operation succeeds, this object can no longer be considered valid.