trade: use bulk confirmation operations (#248)
- Confirmer: add bulk confirmation operations - trade: use bulk confirmation operations closes #241
This commit is contained in:
parent
0b8de57e3a
commit
4b92d46049
2 changed files with 133 additions and 50 deletions
|
@ -69,8 +69,7 @@ impl AccountCommand for TradeCommand {
|
||||||
let mut any_failed = false;
|
let mut any_failed = false;
|
||||||
if self.accept_all {
|
if self.accept_all {
|
||||||
info!("accepting all confirmations");
|
info!("accepting all confirmations");
|
||||||
for conf in &confirmations {
|
match confirmer.accept_confirmations(&confirmations) {
|
||||||
match confirmer.accept_confirmation(conf) {
|
|
||||||
Ok(_) => {}
|
Ok(_) => {}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
warn!("accept confirmation result: {}", err);
|
warn!("accept confirmation result: {}", err);
|
||||||
|
@ -80,11 +79,9 @@ impl AccountCommand for TradeCommand {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
} else if std::io::stdout().is_tty() {
|
} else if std::io::stdout().is_tty() {
|
||||||
let (accept, deny) = tui::prompt_confirmation_menu(confirmations)?;
|
let (accept, deny) = tui::prompt_confirmation_menu(confirmations)?;
|
||||||
for conf in &accept {
|
match confirmer.accept_confirmations(&accept) {
|
||||||
match confirmer.accept_confirmation(conf) {
|
|
||||||
Ok(_) => {}
|
Ok(_) => {}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
warn!("accept confirmation result: {}", err);
|
warn!("accept confirmation result: {}", err);
|
||||||
|
@ -94,9 +91,7 @@ impl AccountCommand for TradeCommand {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
match confirmer.deny_confirmations(&deny) {
|
||||||
for conf in &deny {
|
|
||||||
match confirmer.deny_confirmation(conf) {
|
|
||||||
Ok(_) => {}
|
Ok(_) => {}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
warn!("deny confirmation result: {}", err);
|
warn!("deny confirmation result: {}", err);
|
||||||
|
@ -106,7 +101,6 @@ impl AccountCommand for TradeCommand {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
warn!("not a tty, not showing menu");
|
warn!("not a tty, not showing menu");
|
||||||
for conf in &confirmations {
|
for conf in &confirmations {
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
use std::collections::HashMap;
|
use std::borrow::Cow;
|
||||||
|
|
||||||
use hmacsha1::hmac_sha1;
|
use hmacsha1::hmac_sha1;
|
||||||
use log::*;
|
use log::*;
|
||||||
use reqwest::{
|
use reqwest::{
|
||||||
cookie::CookieStore,
|
cookie::CookieStore,
|
||||||
header::{COOKIE, USER_AGENT},
|
header::{CONTENT_TYPE, COOKIE, USER_AGENT},
|
||||||
Url,
|
Url,
|
||||||
};
|
};
|
||||||
use secrecy::ExposeSecret;
|
use secrecy::ExposeSecret;
|
||||||
|
@ -26,30 +26,33 @@ impl<'a> Confirmer<'a> {
|
||||||
Self { account }
|
Self { account }
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_confirmation_query_params(&self, tag: &str, time: u64) -> HashMap<&str, String> {
|
fn get_confirmation_query_params<'q>(
|
||||||
let mut params: HashMap<&str, String> = HashMap::new();
|
&'q self,
|
||||||
params.insert("p", self.account.device_id.clone());
|
tag: &'q str,
|
||||||
params.insert("a", self.account.steam_id.to_string());
|
time: u64,
|
||||||
params.insert(
|
) -> Vec<(&'static str, Cow<'q, str>)> {
|
||||||
|
[
|
||||||
|
("p", self.account.device_id.as_str().into()),
|
||||||
|
("a", self.account.steam_id.to_string().into()),
|
||||||
|
(
|
||||||
"k",
|
"k",
|
||||||
generate_confirmation_hash_for_time(
|
generate_confirmation_hash_for_time(
|
||||||
time,
|
time,
|
||||||
tag,
|
tag,
|
||||||
self.account.identity_secret.expose_secret(),
|
self.account.identity_secret.expose_secret(),
|
||||||
|
)
|
||||||
|
.into(),
|
||||||
),
|
),
|
||||||
);
|
("t", time.to_string().into()),
|
||||||
params.insert("t", time.to_string());
|
("m", "react".into()),
|
||||||
params.insert("m", String::from("react"));
|
("tag", tag.into()),
|
||||||
params.insert("tag", String::from(tag));
|
]
|
||||||
params
|
.into()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn build_cookie_jar(&self) -> reqwest::cookie::Jar {
|
fn build_cookie_jar(&self) -> reqwest::cookie::Jar {
|
||||||
let cookies = reqwest::cookie::Jar::default();
|
let cookies = reqwest::cookie::Jar::default();
|
||||||
let tokens = self.account.tokens.as_ref().unwrap();
|
let tokens = self.account.tokens.as_ref().unwrap();
|
||||||
// cookies.add_cookie_str("mobileClientVersion=0 (2.1.3)", &url);
|
|
||||||
// cookies.add_cookie_str("mobileClient=android", &url);
|
|
||||||
// cookies.add_cookie_str("Steam_Language=english", &url);
|
|
||||||
cookies.add_cookie_str("dob=", &STEAM_COOKIE_URL);
|
cookies.add_cookie_str("dob=", &STEAM_COOKIE_URL);
|
||||||
cookies.add_cookie_str(
|
cookies.add_cookie_str(
|
||||||
format!("steamid={}", self.account.steam_id).as_str(),
|
format!("steamid={}", self.account.steam_id).as_str(),
|
||||||
|
@ -110,6 +113,7 @@ impl<'a> Confirmer<'a> {
|
||||||
conf: &Confirmation,
|
conf: &Confirmation,
|
||||||
action: ConfirmationAction,
|
action: ConfirmationAction,
|
||||||
) -> Result<(), ConfirmerError> {
|
) -> Result<(), ConfirmerError> {
|
||||||
|
debug!("responding to a single confirmation: send_confirmation_ajax()");
|
||||||
let operation = action.to_operation();
|
let operation = action.to_operation();
|
||||||
|
|
||||||
let cookies = self.build_cookie_jar();
|
let cookies = self.build_cookie_jar();
|
||||||
|
@ -119,9 +123,9 @@ impl<'a> Confirmer<'a> {
|
||||||
|
|
||||||
let time = steamapi::get_server_time()?.server_time();
|
let time = steamapi::get_server_time()?.server_time();
|
||||||
let mut query_params = self.get_confirmation_query_params("conf", time);
|
let mut query_params = self.get_confirmation_query_params("conf", time);
|
||||||
query_params.insert("op", operation.to_owned());
|
query_params.push(("op", operation.into()));
|
||||||
query_params.insert("cid", conf.id.to_string());
|
query_params.push(("cid", Cow::Borrowed(&conf.id)));
|
||||||
query_params.insert("ck", conf.nonce.to_string());
|
query_params.push(("ck", Cow::Borrowed(&conf.nonce)));
|
||||||
|
|
||||||
let resp = client
|
let resp = client
|
||||||
.get(
|
.get(
|
||||||
|
@ -164,6 +168,91 @@ impl<'a> Confirmer<'a> {
|
||||||
self.send_confirmation_ajax(conf, ConfirmationAction::Deny)
|
self.send_confirmation_ajax(conf, ConfirmationAction::Deny)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Respond to more than 1 confirmation.
|
||||||
|
///
|
||||||
|
/// Host: https://steamcommunity.com
|
||||||
|
/// Steam Endpoint: `GET /mobileconf/multiajaxop`
|
||||||
|
fn send_multi_confirmation_ajax(
|
||||||
|
&self,
|
||||||
|
confs: &[Confirmation],
|
||||||
|
action: ConfirmationAction,
|
||||||
|
) -> Result<(), ConfirmerError> {
|
||||||
|
debug!("responding to bulk confirmations: send_multi_confirmation_ajax()");
|
||||||
|
if confs.is_empty() {
|
||||||
|
debug!("confs is empty, nothing to do.");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let operation = action.to_operation();
|
||||||
|
|
||||||
|
let cookies = self.build_cookie_jar();
|
||||||
|
let client = reqwest::blocking::ClientBuilder::new()
|
||||||
|
.cookie_store(true)
|
||||||
|
.build()?;
|
||||||
|
|
||||||
|
let time = steamapi::get_server_time()?.server_time();
|
||||||
|
let mut query_params = self.get_confirmation_query_params("conf", time);
|
||||||
|
query_params.push(("op", operation.into()));
|
||||||
|
for conf in confs.iter() {
|
||||||
|
query_params.push(("cid[]", Cow::Borrowed(&conf.id)));
|
||||||
|
query_params.push(("ck[]", Cow::Borrowed(&conf.nonce)));
|
||||||
|
}
|
||||||
|
let query_params = self.build_multi_conf_query_string(&query_params);
|
||||||
|
// despite being called query parameters, they will actually go in the body
|
||||||
|
debug!("query_params: {}", &query_params);
|
||||||
|
|
||||||
|
let resp = client
|
||||||
|
.post(
|
||||||
|
"https://steamcommunity.com/mobileconf/multiajaxop"
|
||||||
|
.parse::<Url>()
|
||||||
|
.unwrap(),
|
||||||
|
)
|
||||||
|
.header(USER_AGENT, "steamguard-cli")
|
||||||
|
.header(COOKIE, cookies.cookies(&STEAM_COOKIE_URL).unwrap())
|
||||||
|
.header(
|
||||||
|
CONTENT_TYPE,
|
||||||
|
"application/x-www-form-urlencoded; charset=UTF-8",
|
||||||
|
)
|
||||||
|
.body(query_params)
|
||||||
|
.send()?;
|
||||||
|
|
||||||
|
trace!("send_multi_confirmation_ajax() response: {:?}", &resp);
|
||||||
|
debug!(
|
||||||
|
"send_multi_confirmation_ajax() response status code: {}",
|
||||||
|
&resp.status()
|
||||||
|
);
|
||||||
|
|
||||||
|
let raw = resp.text()?;
|
||||||
|
debug!("send_multi_confirmation_ajax() response body: {:?}", &raw);
|
||||||
|
|
||||||
|
let mut deser = serde_json::Deserializer::from_str(raw.as_str());
|
||||||
|
let body: SendConfirmationResponse = serde_path_to_error::deserialize(&mut deser)?;
|
||||||
|
|
||||||
|
if body.needsauth.unwrap_or(false) {
|
||||||
|
return Err(ConfirmerError::InvalidTokens);
|
||||||
|
}
|
||||||
|
if !body.success {
|
||||||
|
return Err(anyhow!("Server responded with failure.").into());
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn accept_confirmations(&self, confs: &[Confirmation]) -> Result<(), ConfirmerError> {
|
||||||
|
self.send_multi_confirmation_ajax(confs, ConfirmationAction::Accept)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn deny_confirmations(&self, confs: &[Confirmation]) -> Result<(), ConfirmerError> {
|
||||||
|
self.send_multi_confirmation_ajax(confs, ConfirmationAction::Deny)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn build_multi_conf_query_string(&self, params: &[(&str, Cow<str>)]) -> String {
|
||||||
|
params
|
||||||
|
.iter()
|
||||||
|
.map(|(k, v)| format!("{}={}", k, v))
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join("&")
|
||||||
|
}
|
||||||
|
|
||||||
/// Steam Endpoint: `GET /mobileconf/details/:id`
|
/// Steam Endpoint: `GET /mobileconf/details/:id`
|
||||||
pub fn get_confirmation_details(&self, conf: &Confirmation) -> anyhow::Result<String> {
|
pub fn get_confirmation_details(&self, conf: &Confirmation) -> anyhow::Result<String> {
|
||||||
#[derive(Debug, Clone, Deserialize)]
|
#[derive(Debug, Clone, Deserialize)]
|
||||||
|
|
Loading…
Reference in a new issue