Merge pull request #77 from dyc3/reorganize
Reorganize to make managing cookies easier
This commit is contained in:
commit
8a3408b405
12 changed files with 1321 additions and 1112 deletions
64
.vscode/launch.json
vendored
Normal file
64
.vscode/launch.json
vendored
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
{
|
||||||
|
// Use IntelliSense to learn about possible attributes.
|
||||||
|
// Hover to view descriptions of existing attributes.
|
||||||
|
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||||
|
"version": "0.2.0",
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"type": "lldb",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "Debug unit tests in library 'steamguard'",
|
||||||
|
"cargo": {
|
||||||
|
"args": [
|
||||||
|
"test",
|
||||||
|
"--no-run",
|
||||||
|
"--lib",
|
||||||
|
"--package=steamguard"
|
||||||
|
],
|
||||||
|
"filter": {
|
||||||
|
"name": "steamguard",
|
||||||
|
"kind": "lib"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"args": [],
|
||||||
|
"cwd": "${workspaceFolder}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "lldb",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "Debug executable 'steamguard-cli'",
|
||||||
|
"cargo": {
|
||||||
|
"args": [
|
||||||
|
"build",
|
||||||
|
"--bin=steamguard-cli",
|
||||||
|
"--package=steamguard-cli"
|
||||||
|
],
|
||||||
|
"filter": {
|
||||||
|
"name": "steamguard-cli",
|
||||||
|
"kind": "bin"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"args": [],
|
||||||
|
"cwd": "${workspaceFolder}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "lldb",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "Debug unit tests in executable 'steamguard-cli'",
|
||||||
|
"cargo": {
|
||||||
|
"args": [
|
||||||
|
"test",
|
||||||
|
"--no-run",
|
||||||
|
"--bin=steamguard-cli",
|
||||||
|
"--package=steamguard-cli"
|
||||||
|
],
|
||||||
|
"filter": {
|
||||||
|
"name": "steamguard-cli",
|
||||||
|
"kind": "bin"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"args": [],
|
||||||
|
"cwd": "${workspaceFolder}"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
7
Cargo.lock
generated
7
Cargo.lock
generated
|
@ -689,6 +689,12 @@ version = "0.1.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
|
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "maplit"
|
||||||
|
version = "1.0.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "markup5ever"
|
name = "markup5ever"
|
||||||
version = "0.10.1"
|
version = "0.10.1"
|
||||||
|
@ -1610,6 +1616,7 @@ dependencies = [
|
||||||
"hmac-sha1",
|
"hmac-sha1",
|
||||||
"lazy_static 1.4.0",
|
"lazy_static 1.4.0",
|
||||||
"log",
|
"log",
|
||||||
|
"maplit",
|
||||||
"rand 0.8.4",
|
"rand 0.8.4",
|
||||||
"regex",
|
"regex",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
|
|
3
rustfmt.toml
Normal file
3
rustfmt.toml
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
tab_spaces = 4
|
||||||
|
hard_tabs = true
|
||||||
|
normalize_comments = true
|
14
src/main.rs
14
src/main.rs
|
@ -8,7 +8,9 @@ use std::{
|
||||||
path::Path,
|
path::Path,
|
||||||
sync::{Arc, Mutex},
|
sync::{Arc, Mutex},
|
||||||
};
|
};
|
||||||
use steamguard::{steamapi, Confirmation, ConfirmationType, SteamGuardAccount};
|
use steamguard::{
|
||||||
|
steamapi, Confirmation, ConfirmationType, LoginError, SteamGuardAccount, UserLogin,
|
||||||
|
};
|
||||||
use termion::{
|
use termion::{
|
||||||
event::{Event, Key},
|
event::{Event, Key},
|
||||||
input::TermRead,
|
input::TermRead,
|
||||||
|
@ -390,7 +392,7 @@ fn do_login(account: &mut SteamGuardAccount) {
|
||||||
debug!("password is empty");
|
debug!("password is empty");
|
||||||
}
|
}
|
||||||
// TODO: reprompt if password is empty
|
// TODO: reprompt if password is empty
|
||||||
let mut login = steamapi::UserLogin::new(account.account_name.clone(), password);
|
let mut login = UserLogin::new(account.account_name.clone(), password);
|
||||||
let mut loops = 0;
|
let mut loops = 0;
|
||||||
loop {
|
loop {
|
||||||
match login.login() {
|
match login.login() {
|
||||||
|
@ -398,14 +400,16 @@ fn do_login(account: &mut SteamGuardAccount) {
|
||||||
account.session = Option::Some(s);
|
account.session = Option::Some(s);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
Err(steamapi::LoginError::Need2FA) => {
|
Err(LoginError::Need2FA) => {
|
||||||
|
debug!("generating 2fa code and retrying");
|
||||||
let server_time = steamapi::get_server_time();
|
let server_time = steamapi::get_server_time();
|
||||||
login.twofactor_code = account.generate_code(server_time);
|
login.twofactor_code = account.generate_code(server_time);
|
||||||
}
|
}
|
||||||
Err(steamapi::LoginError::NeedCaptcha { captcha_gid }) => {
|
Err(LoginError::NeedCaptcha { captcha_gid }) => {
|
||||||
|
debug!("need captcha to log in");
|
||||||
login.captcha_text = prompt_captcha_text(&captcha_gid);
|
login.captcha_text = prompt_captcha_text(&captcha_gid);
|
||||||
}
|
}
|
||||||
Err(steamapi::LoginError::NeedEmail) => {
|
Err(LoginError::NeedEmail) => {
|
||||||
println!("You should have received an email with a code.");
|
println!("You should have received an email with a code.");
|
||||||
print!("Enter code");
|
print!("Enter code");
|
||||||
login.email_code = prompt();
|
login.email_code = prompt();
|
||||||
|
|
|
@ -22,3 +22,4 @@ lazy_static = "1.4.0"
|
||||||
uuid = { version = "0.8", features = ["v4"] }
|
uuid = { version = "0.8", features = ["v4"] }
|
||||||
log = "0.4.14"
|
log = "0.4.14"
|
||||||
scraper = "0.12.0"
|
scraper = "0.12.0"
|
||||||
|
maplit = "1.0.2"
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
{"success":true,"requires_twofactor":false,"redirect_uri":"steammobile://mobileloginsucceeded","login_complete":true,"oauth":"{\"steamid\":\"78562647129469312\",\"account_name\":\"feuarus\",\"oauth_token\":\"fd2fdb3d0717bad2220d98c7ec61c7bd\",\"wgtoken\":\"72E7013D598A4F68C7E268F6FA3767D89D763732\",\"wgtoken_secure\":\"21061EA13C36D7C29812CAED900A215171AD13A2\",\"webcookie\":\"6298070A226E5DAD49938D78BCF36F7A7118FDD5\"}"}
|
|
@ -10,13 +10,17 @@ use reqwest::{
|
||||||
use scraper::{Html, Selector};
|
use scraper::{Html, Selector};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::{collections::HashMap, convert::TryInto, thread, time};
|
use std::{collections::HashMap, convert::TryInto, thread, time};
|
||||||
|
pub use userlogin::{LoginError, UserLogin};
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate lazy_static;
|
extern crate lazy_static;
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate anyhow;
|
extern crate anyhow;
|
||||||
|
#[macro_use]
|
||||||
|
extern crate maplit;
|
||||||
|
|
||||||
mod confirmation;
|
mod confirmation;
|
||||||
pub mod steamapi;
|
pub mod steamapi;
|
||||||
|
mod userlogin;
|
||||||
|
|
||||||
// const STEAMAPI_BASE: String = "https://api.steampowered.com";
|
// const STEAMAPI_BASE: String = "https://api.steampowered.com";
|
||||||
// const COMMUNITY_BASE: String = "https://steamcommunity.com";
|
// const COMMUNITY_BASE: String = "https://steamcommunity.com";
|
||||||
|
|
|
@ -1,36 +1,63 @@
|
||||||
use log::*;
|
use log::*;
|
||||||
use reqwest::{
|
use reqwest::{
|
||||||
|
blocking::RequestBuilder,
|
||||||
cookie::CookieStore,
|
cookie::CookieStore,
|
||||||
header::COOKIE,
|
header::COOKIE,
|
||||||
header::{SET_COOKIE, USER_AGENT},
|
header::{HeaderMap, HeaderName, HeaderValue, SET_COOKIE},
|
||||||
Url,
|
Url,
|
||||||
};
|
};
|
||||||
use rsa::{PublicKey, RsaPublicKey};
|
use serde::{Deserialize, Deserializer, Serialize};
|
||||||
use serde::{Deserialize, Serialize};
|
use std::iter::FromIterator;
|
||||||
use std::collections::HashMap;
|
use std::str::FromStr;
|
||||||
use std::time::{SystemTime, UNIX_EPOCH};
|
use std::time::{SystemTime, UNIX_EPOCH};
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
static ref STEAM_COOKIE_URL: Url = "https://steamcommunity.com".parse::<Url>().unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize)]
|
#[derive(Debug, Clone, Deserialize)]
|
||||||
struct LoginResponse {
|
pub struct LoginResponse {
|
||||||
success: bool,
|
pub success: bool,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
login_complete: bool,
|
pub login_complete: bool,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
captcha_needed: bool,
|
pub captcha_needed: bool,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
captcha_gid: String,
|
pub captcha_gid: String,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
emailsteamid: u64,
|
pub emailsteamid: u64,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
emailauth_needed: bool,
|
pub emailauth_needed: bool,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
requires_twofactor: bool,
|
pub requires_twofactor: bool,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
message: String,
|
pub message: String,
|
||||||
|
// #[serde(rename = "oauth")]
|
||||||
|
// oauth_raw: String,
|
||||||
|
#[serde(default, deserialize_with = "oauth_data_from_string")]
|
||||||
|
oauth: Option<OAuthData>,
|
||||||
transfer_urls: Option<Vec<String>>,
|
transfer_urls: Option<Vec<String>>,
|
||||||
transfer_parameters: Option<LoginTransferParameters>,
|
transfer_parameters: Option<LoginTransferParameters>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// For some reason, the `oauth` field in the login response is a string of JSON, not a JSON object.
|
||||||
|
/// Deserializes to `Option` because the `oauth` field is not always there.
|
||||||
|
fn oauth_data_from_string<'de, D>(deserializer: D) -> Result<Option<OAuthData>, D::Error>
|
||||||
|
where
|
||||||
|
D: Deserializer<'de>,
|
||||||
|
{
|
||||||
|
// for some reason, deserializing to &str doesn't work but this does.
|
||||||
|
let s: String = Deserialize::deserialize(deserializer)?;
|
||||||
|
let data: OAuthData = serde_json::from_str(s.as_str()).map_err(serde::de::Error::custom)?;
|
||||||
|
Ok(Some(data))
|
||||||
|
}
|
||||||
|
|
||||||
|
impl LoginResponse {
|
||||||
|
pub fn needs_transfer_login(&self) -> bool {
|
||||||
|
self.transfer_urls.is_some() || self.transfer_parameters.is_some()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
struct LoginTransferParameters {
|
struct LoginTransferParameters {
|
||||||
steamid: String,
|
steamid: String,
|
||||||
|
@ -41,295 +68,18 @@ struct LoginTransferParameters {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize)]
|
#[derive(Debug, Clone, Deserialize)]
|
||||||
struct RsaResponse {
|
pub struct RsaResponse {
|
||||||
success: bool,
|
pub success: bool,
|
||||||
publickey_exp: String,
|
pub publickey_exp: String,
|
||||||
publickey_mod: String,
|
pub publickey_mod: String,
|
||||||
timestamp: String,
|
pub timestamp: String,
|
||||||
token_gid: String,
|
pub token_gid: String,
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub enum LoginError {
|
|
||||||
BadRSA,
|
|
||||||
BadCredentials,
|
|
||||||
NeedCaptcha { captcha_gid: String },
|
|
||||||
Need2FA,
|
|
||||||
NeedEmail,
|
|
||||||
TooManyAttempts,
|
|
||||||
OtherFailure,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct UserLogin {
|
|
||||||
pub username: String,
|
|
||||||
pub password: String,
|
|
||||||
pub captcha_required: bool,
|
|
||||||
pub captcha_gid: String,
|
|
||||||
pub captcha_text: String,
|
|
||||||
pub twofactor_code: String,
|
|
||||||
pub email_code: String,
|
|
||||||
pub steam_id: u64,
|
|
||||||
|
|
||||||
cookies: reqwest::cookie::Jar,
|
|
||||||
client: reqwest::blocking::Client,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl UserLogin {
|
|
||||||
pub fn new(username: String, password: String) -> UserLogin {
|
|
||||||
return UserLogin {
|
|
||||||
username,
|
|
||||||
password,
|
|
||||||
captcha_required: false,
|
|
||||||
captcha_gid: String::from("-1"),
|
|
||||||
captcha_text: String::from(""),
|
|
||||||
twofactor_code: String::from(""),
|
|
||||||
email_code: String::from(""),
|
|
||||||
steam_id: 0,
|
|
||||||
cookies: reqwest::cookie::Jar::default(),
|
|
||||||
client: reqwest::blocking::ClientBuilder::new()
|
|
||||||
.cookie_store(true)
|
|
||||||
.build()
|
|
||||||
.unwrap(),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Updates the cookie jar with the session cookies by pinging steam servers.
|
|
||||||
fn update_session(&self) {
|
|
||||||
trace!("UserLogin::update_session");
|
|
||||||
let url = "https://steamcommunity.com".parse::<Url>().unwrap();
|
|
||||||
self.cookies
|
|
||||||
.add_cookie_str("mobileClientVersion=0 (2.1.3)", &url);
|
|
||||||
self.cookies.add_cookie_str("mobileClient=android", &url);
|
|
||||||
self.cookies.add_cookie_str("Steam_Language=english", &url);
|
|
||||||
|
|
||||||
let resp = self.client
|
|
||||||
.get("https://steamcommunity.com/login?oauth_client_id=DE45CD61&oauth_scope=read_profile%20write_profile%20read_client%20write_client".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, "mobileClientVersion=0 (2.1.3)")
|
|
||||||
// .header(COOKIE, "mobileClient=android")
|
|
||||||
// .header(COOKIE, "Steam_Language=english")
|
|
||||||
.header(COOKIE, self.cookies.cookies(&url).unwrap())
|
|
||||||
.send();
|
|
||||||
trace!("{:?}", resp);
|
|
||||||
|
|
||||||
trace!("cookies: {:?}", self.cookies);
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn login(&mut self) -> anyhow::Result<Session, LoginError> {
|
|
||||||
trace!("UserLogin::login");
|
|
||||||
if self.captcha_required && self.captcha_text.len() == 0 {
|
|
||||||
return Err(LoginError::NeedCaptcha {
|
|
||||||
captcha_gid: self.captcha_gid.clone(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
let url = "https://steamcommunity.com".parse::<Url>().unwrap();
|
|
||||||
if self.cookies.cookies(&url) == Option::None {
|
|
||||||
self.update_session()
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut params = HashMap::new();
|
|
||||||
params.insert(
|
|
||||||
"donotcache",
|
|
||||||
format!(
|
|
||||||
"{}",
|
|
||||||
SystemTime::now()
|
|
||||||
.duration_since(UNIX_EPOCH)
|
|
||||||
.unwrap()
|
|
||||||
.as_secs()
|
|
||||||
* 1000
|
|
||||||
),
|
|
||||||
);
|
|
||||||
params.insert("username", self.username.clone());
|
|
||||||
let resp = self
|
|
||||||
.client
|
|
||||||
.post("https://steamcommunity.com/login/getrsakey")
|
|
||||||
.form(¶ms)
|
|
||||||
.send()
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let encrypted_password: String;
|
|
||||||
let rsa_timestamp: String;
|
|
||||||
match resp.json::<RsaResponse>() {
|
|
||||||
Ok(rsa_resp) => {
|
|
||||||
rsa_timestamp = rsa_resp.timestamp.clone();
|
|
||||||
encrypted_password = encrypt_password(rsa_resp, &self.password);
|
|
||||||
}
|
|
||||||
Err(error) => {
|
|
||||||
error!("rsa error: {:?}", error);
|
|
||||||
return Err(LoginError::BadRSA);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
trace!("captchagid: {}", self.captcha_gid);
|
|
||||||
trace!("captcha_text: {}", self.captcha_text);
|
|
||||||
trace!("twofactorcode: {}", self.twofactor_code);
|
|
||||||
trace!("emailauth: {}", self.email_code);
|
|
||||||
let mut params = HashMap::new();
|
|
||||||
params.insert(
|
|
||||||
"donotcache",
|
|
||||||
format!(
|
|
||||||
"{}",
|
|
||||||
SystemTime::now()
|
|
||||||
.duration_since(UNIX_EPOCH)
|
|
||||||
.unwrap()
|
|
||||||
.as_secs()
|
|
||||||
* 1000
|
|
||||||
),
|
|
||||||
);
|
|
||||||
params.insert("username", self.username.clone());
|
|
||||||
params.insert("password", encrypted_password);
|
|
||||||
params.insert("twofactorcode", self.twofactor_code.clone());
|
|
||||||
params.insert("emailauth", self.email_code.clone());
|
|
||||||
params.insert("captchagid", self.captcha_gid.clone());
|
|
||||||
params.insert("captcha_text", self.captcha_text.clone());
|
|
||||||
params.insert("rsatimestamp", rsa_timestamp);
|
|
||||||
params.insert("remember_login", String::from("true"));
|
|
||||||
params.insert("oauth_client_id", String::from("DE45CD61"));
|
|
||||||
params.insert(
|
|
||||||
"oauth_scope",
|
|
||||||
String::from("read_profile write_profile read_client write_client"),
|
|
||||||
);
|
|
||||||
|
|
||||||
let login_resp: LoginResponse;
|
|
||||||
match self
|
|
||||||
.client
|
|
||||||
.post("https://steamcommunity.com/login/dologin")
|
|
||||||
.form(¶ms)
|
|
||||||
.send()
|
|
||||||
{
|
|
||||||
Ok(resp) => {
|
|
||||||
// https://stackoverflow.com/questions/49928648/rubys-mechanize-error-401-while-sending-a-post-request-steam-trade-offer-send
|
|
||||||
let text = resp.text().unwrap();
|
|
||||||
trace!("resp content: {}", text);
|
|
||||||
match serde_json::from_str(text.as_str()) {
|
|
||||||
Ok(lr) => {
|
|
||||||
info!("login resp: {:?}", lr);
|
|
||||||
login_resp = lr;
|
|
||||||
}
|
|
||||||
Err(error) => {
|
|
||||||
debug!("login response did not have normal schema");
|
|
||||||
error!("login parse error: {:?}", error);
|
|
||||||
return Err(LoginError::OtherFailure);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(error) => {
|
|
||||||
error!("login request error: {:?}", error);
|
|
||||||
return Err(LoginError::OtherFailure);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if login_resp.message.contains("too many login") {
|
|
||||||
return Err(LoginError::TooManyAttempts);
|
|
||||||
}
|
|
||||||
|
|
||||||
if login_resp.message.contains("Incorrect login") {
|
|
||||||
return Err(LoginError::BadCredentials);
|
|
||||||
}
|
|
||||||
|
|
||||||
if login_resp.captcha_needed {
|
|
||||||
self.captcha_gid = login_resp.captcha_gid.clone();
|
|
||||||
return Err(LoginError::NeedCaptcha {
|
|
||||||
captcha_gid: self.captcha_gid.clone(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if login_resp.emailauth_needed {
|
|
||||||
self.steam_id = login_resp.emailsteamid.clone();
|
|
||||||
return Err(LoginError::NeedEmail);
|
|
||||||
}
|
|
||||||
|
|
||||||
if login_resp.requires_twofactor {
|
|
||||||
return Err(LoginError::Need2FA);
|
|
||||||
}
|
|
||||||
|
|
||||||
if !login_resp.login_complete {
|
|
||||||
return Err(LoginError::BadCredentials);
|
|
||||||
}
|
|
||||||
|
|
||||||
// transfer login parameters? Not completely sure what this is for.
|
|
||||||
// i guess steam changed their authentication scheme slightly
|
|
||||||
let oauth;
|
|
||||||
match (login_resp.transfer_urls, login_resp.transfer_parameters) {
|
|
||||||
(Some(urls), Some(params)) => {
|
|
||||||
debug!("received transfer parameters, relaying data...");
|
|
||||||
for url in urls {
|
|
||||||
trace!("posting transfer to {}", url);
|
|
||||||
let result = self.client.post(url).json(¶ms).send();
|
|
||||||
trace!("result: {:?}", result);
|
|
||||||
match result {
|
|
||||||
Ok(resp) => {
|
|
||||||
debug!("result status: {}", resp.status());
|
|
||||||
self.save_cookies_from_response(&resp);
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
error!("failed to transfer parameters: {:?}", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
oauth = OAuthData {
|
|
||||||
oauth_token: params.auth,
|
|
||||||
steamid: params.steamid.parse().unwrap(),
|
|
||||||
wgtoken: params.token_secure.clone(), // guessing
|
|
||||||
wgtoken_secure: params.token_secure,
|
|
||||||
webcookie: params.webcookie,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
error!("did not receive transfer_urls and transfer_parameters");
|
|
||||||
return Err(LoginError::OtherFailure);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let url = "https://steamcommunity.com".parse::<Url>().unwrap();
|
|
||||||
let cookies = self.cookies.cookies(&url).unwrap();
|
|
||||||
let all_cookies = cookies.to_str().unwrap();
|
|
||||||
let mut session_id = String::from("");
|
|
||||||
for cookie in all_cookies
|
|
||||||
.split(";")
|
|
||||||
.map(|s| cookie::Cookie::parse(s).unwrap())
|
|
||||||
{
|
|
||||||
if cookie.name() == "sessionid" {
|
|
||||||
session_id = String::from(cookie.value());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
trace!("cookies {:?}", cookies);
|
|
||||||
let session = self.build_session(oauth, session_id);
|
|
||||||
|
|
||||||
return Ok(session);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn build_session(&self, data: OAuthData, session_id: String) -> Session {
|
|
||||||
return Session {
|
|
||||||
token: data.oauth_token,
|
|
||||||
steam_id: data.steamid,
|
|
||||||
steam_login: format!("{}%7C%7C{}", data.steamid, data.wgtoken),
|
|
||||||
steam_login_secure: format!("{}%7C%7C{}", data.steamid, data.wgtoken_secure),
|
|
||||||
session_id: session_id,
|
|
||||||
web_cookie: data.webcookie,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
fn save_cookies_from_response(&mut self, response: &reqwest::blocking::Response) {
|
|
||||||
let set_cookie_iter = response.headers().get_all(SET_COOKIE);
|
|
||||||
let url = "https://steamcommunity.com".parse::<Url>().unwrap();
|
|
||||||
|
|
||||||
for c in set_cookie_iter {
|
|
||||||
c.to_str()
|
|
||||||
.into_iter()
|
|
||||||
.for_each(|cookie_str| self.cookies.add_cookie_str(cookie_str, &url));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize)]
|
#[derive(Debug, Clone, Deserialize)]
|
||||||
struct OAuthData {
|
pub struct OAuthData {
|
||||||
oauth_token: String,
|
oauth_token: String,
|
||||||
steamid: u64,
|
steamid: String,
|
||||||
wgtoken: String,
|
wgtoken: String,
|
||||||
wgtoken_secure: String,
|
wgtoken_secure: String,
|
||||||
webcookie: String,
|
webcookie: String,
|
||||||
|
@ -364,33 +114,218 @@ pub fn get_server_time() -> i64 {
|
||||||
.unwrap();
|
.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn encrypt_password(rsa_resp: RsaResponse, password: &String) -> String {
|
/// Provides raw access to the Steam API. Handles cookies, some deserialization, etc. to make it easier.
|
||||||
let rsa_exponent = rsa::BigUint::parse_bytes(rsa_resp.publickey_exp.as_bytes(), 16).unwrap();
|
#[derive(Debug)]
|
||||||
let rsa_modulus = rsa::BigUint::parse_bytes(rsa_resp.publickey_mod.as_bytes(), 16).unwrap();
|
pub struct SteamApiClient {
|
||||||
let public_key = RsaPublicKey::new(rsa_modulus, rsa_exponent).unwrap();
|
cookies: reqwest::cookie::Jar,
|
||||||
#[cfg(test)]
|
client: reqwest::blocking::Client,
|
||||||
let mut rng = rand::rngs::mock::StepRng::new(2, 1);
|
pub session: Option<Session>,
|
||||||
#[cfg(not(test))]
|
}
|
||||||
let mut rng = rand::rngs::OsRng;
|
|
||||||
let padding = rsa::PaddingScheme::new_pkcs1v15_encrypt();
|
impl SteamApiClient {
|
||||||
let encrypted_password = base64::encode(
|
pub fn new() -> SteamApiClient {
|
||||||
public_key
|
SteamApiClient {
|
||||||
.encrypt(&mut rng, padding, password.as_bytes())
|
cookies: reqwest::cookie::Jar::default(),
|
||||||
|
client: reqwest::blocking::ClientBuilder::new()
|
||||||
|
.cookie_store(true)
|
||||||
|
.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")
|
||||||
|
.default_headers(HeaderMap::from_iter(hashmap! {
|
||||||
|
HeaderName::from_str("X-Requested-With").expect("could not build default request headers") => HeaderValue::from_str("com.valvesoftware.android.steam.community").expect("could not build default request headers")
|
||||||
|
}.into_iter()))
|
||||||
|
.build()
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
);
|
session: None,
|
||||||
return encrypted_password;
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn build_session(&self, data: &OAuthData) -> Session {
|
||||||
|
return Session {
|
||||||
|
token: data.oauth_token.clone(),
|
||||||
|
steam_id: data.steamid.parse().unwrap(),
|
||||||
|
steam_login: format!("{}%7C%7C{}", data.steamid, data.wgtoken),
|
||||||
|
steam_login_secure: format!("{}%7C%7C{}", data.steamid, data.wgtoken_secure),
|
||||||
|
session_id: self.extract_session_id().unwrap(),
|
||||||
|
web_cookie: data.webcookie.clone(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
fn extract_session_id(&self) -> Option<String> {
|
||||||
|
let cookies = self.cookies.cookies(&STEAM_COOKIE_URL).unwrap();
|
||||||
|
let all_cookies = cookies.to_str().unwrap();
|
||||||
|
for cookie in all_cookies
|
||||||
|
.split(";")
|
||||||
|
.map(|s| cookie::Cookie::parse(s).unwrap())
|
||||||
|
{
|
||||||
|
if cookie.name() == "sessionid" {
|
||||||
|
return Some(cookie.value().into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn save_cookies_from_response(&mut self, response: &reqwest::blocking::Response) {
|
||||||
|
let set_cookie_iter = response.headers().get_all(SET_COOKIE);
|
||||||
|
|
||||||
|
for c in set_cookie_iter {
|
||||||
|
c.to_str()
|
||||||
|
.into_iter()
|
||||||
|
.for_each(|cookie_str| self.cookies.add_cookie_str(cookie_str, &STEAM_COOKIE_URL));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn request<U: reqwest::IntoUrl>(&self, method: reqwest::Method, url: U) -> RequestBuilder {
|
||||||
|
self.cookies
|
||||||
|
.add_cookie_str("mobileClientVersion=0 (2.1.3)", &STEAM_COOKIE_URL);
|
||||||
|
self.cookies
|
||||||
|
.add_cookie_str("mobileClient=android", &STEAM_COOKIE_URL);
|
||||||
|
self.cookies
|
||||||
|
.add_cookie_str("Steam_Language=english", &STEAM_COOKIE_URL);
|
||||||
|
|
||||||
|
self.client
|
||||||
|
.request(method, url)
|
||||||
|
.header(COOKIE, self.cookies.cookies(&STEAM_COOKIE_URL).unwrap())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get<U: reqwest::IntoUrl>(&self, url: U) -> RequestBuilder {
|
||||||
|
self.request(reqwest::Method::GET, url)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn post<U: reqwest::IntoUrl>(&self, url: U) -> RequestBuilder {
|
||||||
|
self.request(reqwest::Method::POST, url)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Updates the cookie jar with the session cookies by pinging steam servers.
|
||||||
|
pub fn update_session(&mut self) -> anyhow::Result<()> {
|
||||||
|
trace!("SteamApiClient::update_session");
|
||||||
|
|
||||||
|
let resp = self
|
||||||
|
.get("https://steamcommunity.com/login?oauth_client_id=DE45CD61&oauth_scope=read_profile%20write_profile%20read_client%20write_client".parse::<Url>().unwrap())
|
||||||
|
.send()?;
|
||||||
|
self.save_cookies_from_response(&resp);
|
||||||
|
trace!("{:?}", resp);
|
||||||
|
|
||||||
|
trace!("cookies: {:?}", self.cookies);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Endpoint: POST /login/dologin
|
||||||
|
pub fn login(
|
||||||
|
&mut self,
|
||||||
|
username: String,
|
||||||
|
encrypted_password: String,
|
||||||
|
twofactor_code: String,
|
||||||
|
email_code: String,
|
||||||
|
captcha_gid: String,
|
||||||
|
captcha_text: String,
|
||||||
|
rsa_timestamp: String,
|
||||||
|
) -> anyhow::Result<LoginResponse> {
|
||||||
|
let params = hashmap! {
|
||||||
|
"donotcache" => format!(
|
||||||
|
"{}",
|
||||||
|
SystemTime::now()
|
||||||
|
.duration_since(UNIX_EPOCH)
|
||||||
|
.unwrap()
|
||||||
|
.as_secs()
|
||||||
|
* 1000
|
||||||
|
),
|
||||||
|
"username" => username,
|
||||||
|
"password" => encrypted_password,
|
||||||
|
"twofactorcode" => twofactor_code,
|
||||||
|
"emailauth" => email_code,
|
||||||
|
"captchagid" => captcha_gid,
|
||||||
|
"captcha_text" => captcha_text,
|
||||||
|
"rsatimestamp" => rsa_timestamp,
|
||||||
|
"remember_login" => "true".into(),
|
||||||
|
"oauth_client_id" => "DE45CD61".into(),
|
||||||
|
"oauth_scope" => "read_profile write_profile read_client write_client".into(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let resp = self
|
||||||
|
.post("https://steamcommunity.com/login/dologin")
|
||||||
|
.form(¶ms)
|
||||||
|
.send()?;
|
||||||
|
let text = resp.text()?;
|
||||||
|
trace!("raw login response: {}", text);
|
||||||
|
|
||||||
|
let login_resp: LoginResponse = serde_json::from_str(text.as_str())?;
|
||||||
|
|
||||||
|
if let Some(oauth) = &login_resp.oauth {
|
||||||
|
self.session = Some(self.build_session(&oauth));
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(login_resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A secondary step in the login flow. Does not seem to always be needed?
|
||||||
|
/// Endpoints: provided by `login()`
|
||||||
|
pub fn transfer_login(&mut self, login_resp: LoginResponse) -> anyhow::Result<OAuthData> {
|
||||||
|
match (login_resp.transfer_urls, login_resp.transfer_parameters) {
|
||||||
|
(Some(urls), Some(params)) => {
|
||||||
|
debug!("received transfer parameters, relaying data...");
|
||||||
|
for url in urls {
|
||||||
|
trace!("posting transfer to {}", url);
|
||||||
|
let resp = self.client.post(url).json(¶ms).send()?;
|
||||||
|
self.save_cookies_from_response(&resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
let oauth = OAuthData {
|
||||||
|
oauth_token: params.auth,
|
||||||
|
steamid: params.steamid.parse().unwrap(),
|
||||||
|
wgtoken: params.token_secure.clone(), // guessing
|
||||||
|
wgtoken_secure: params.token_secure,
|
||||||
|
webcookie: params.webcookie,
|
||||||
|
};
|
||||||
|
self.session = Some(self.build_session(&oauth));
|
||||||
|
return Ok(oauth);
|
||||||
|
}
|
||||||
|
(None, None) => {
|
||||||
|
bail!("did not receive transfer_urls and transfer_parameters");
|
||||||
|
}
|
||||||
|
(_, None) => {
|
||||||
|
bail!("did not receive transfer_parameters");
|
||||||
|
}
|
||||||
|
(None, _) => {
|
||||||
|
bail!("did not receive transfer_urls");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_encrypt_password() {
|
fn test_oauth_data_parse() {
|
||||||
let rsa_resp = RsaResponse{
|
// This example is from a login response that did not contain any transfer URLs.
|
||||||
success: true,
|
let oauth: OAuthData = serde_json::from_str("{\"steamid\":\"78562647129469312\",\"account_name\":\"feuarus\",\"oauth_token\":\"fd2fdb3d0717bcd2220d98c7ec61c7bd\",\"wgtoken\":\"72E7013D598A4F68C7E268F6FA3767D89D763732\",\"wgtoken_secure\":\"21061EA13C36D7C29812CAED900A215171AD13A2\",\"webcookie\":\"6298070A226E5DAD49938D78BCF36F7A7118FDD5\"}").unwrap();
|
||||||
publickey_exp: String::from("010001"),
|
|
||||||
publickey_mod: String::from("98f9088c1250b17fe19d2b2422d54a1eef0036875301731f11bd17900e215318eb6de1546727c0b7b61b86cefccdcb2f8108c813154d9a7d55631965eece810d4ab9d8a59c486bda778651b876176070598a93c2325c275cb9c17bdbcacf8edc9c18c0c5d59bc35703505ef8a09ed4c62b9f92a3fac5740ce25e490ab0e26d872140e4103d912d1e3958f844264211277ee08d2b4dd3ac58b030b25342bd5c949ae7794e46a8eab26d5a8deca683bfd381da6c305b19868b8c7cd321ce72c693310a6ebf2ecd43642518f825894602f6c239cf193cb4346ce64beac31e20ef88f934f2f776597734bb9eae1ebdf4a453973b6df9d5e90777bffe5db83dd1757b"),
|
assert_eq!(oauth.steamid, "78562647129469312");
|
||||||
timestamp: String::from("asdf"),
|
assert_eq!(oauth.oauth_token, "fd2fdb3d0717bcd2220d98c7ec61c7bd");
|
||||||
token_gid: String::from("asdf"),
|
assert_eq!(oauth.wgtoken, "72E7013D598A4F68C7E268F6FA3767D89D763732");
|
||||||
};
|
assert_eq!(
|
||||||
let result = encrypt_password(rsa_resp, &String::from("kelwleofpsm3n4ofc"));
|
oauth.wgtoken_secure,
|
||||||
assert_eq!(result.len(), 344);
|
"21061EA13C36D7C29812CAED900A215171AD13A2"
|
||||||
assert_eq!(result, "RUo/3IfbkVcJi1q1S5QlpKn1mEn3gNJoc/Z4VwxRV9DImV6veq/YISEuSrHB3885U5MYFLn1g94Y+cWRL6HGXoV+gOaVZe43m7O92RwiVz6OZQXMfAv3UC/jcqn/xkitnj+tNtmx55gCxmGbO2KbqQ0TQqAyqCOOw565B+Cwr2OOorpMZAViv9sKA/G3Q6yzscU6rhua179c8QjC1Hk3idUoSzpWfT4sHNBW/EREXZ3Dkjwu17xzpfwIUpnBVIlR8Vj3coHgUCpTsKVRA3T814v9BYPlvLYwmw5DW3ddx+2SyTY0P5uuog36TN2PqYS7ioF5eDe16gyfRR4Nzn/7wA==");
|
);
|
||||||
|
assert_eq!(oauth.webcookie, "6298070A226E5DAD49938D78BCF36F7A7118FDD5");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_login_response_parse() {
|
||||||
|
let result = serde_json::from_str::<LoginResponse>(include_str!(
|
||||||
|
"fixtures/api-responses/login-response1.json"
|
||||||
|
));
|
||||||
|
|
||||||
|
assert!(
|
||||||
|
matches!(result, Ok(_)),
|
||||||
|
"got error: {}",
|
||||||
|
result.unwrap_err()
|
||||||
|
);
|
||||||
|
let resp = result.unwrap();
|
||||||
|
|
||||||
|
let oauth = resp.oauth.unwrap();
|
||||||
|
assert_eq!(oauth.steamid, "78562647129469312");
|
||||||
|
assert_eq!(oauth.oauth_token, "fd2fdb3d0717bad2220d98c7ec61c7bd");
|
||||||
|
assert_eq!(oauth.wgtoken, "72E7013D598A4F68C7E268F6FA3767D89D763732");
|
||||||
|
assert_eq!(
|
||||||
|
oauth.wgtoken_secure,
|
||||||
|
"21061EA13C36D7C29812CAED900A215171AD13A2"
|
||||||
|
);
|
||||||
|
assert_eq!(oauth.webcookie, "6298070A226E5DAD49938D78BCF36F7A7118FDD5");
|
||||||
}
|
}
|
||||||
|
|
190
steamguard/src/userlogin.rs
Normal file
190
steamguard/src/userlogin.rs
Normal file
|
@ -0,0 +1,190 @@
|
||||||
|
use crate::steamapi::{LoginResponse, RsaResponse, Session, SteamApiClient};
|
||||||
|
use log::*;
|
||||||
|
use rsa::{PublicKey, RsaPublicKey};
|
||||||
|
use std::time::{SystemTime, UNIX_EPOCH};
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum LoginError {
|
||||||
|
BadRSA,
|
||||||
|
BadCredentials,
|
||||||
|
NeedCaptcha { captcha_gid: String },
|
||||||
|
Need2FA,
|
||||||
|
NeedEmail,
|
||||||
|
TooManyAttempts,
|
||||||
|
NetworkFailure(reqwest::Error),
|
||||||
|
OtherFailure(anyhow::Error),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::fmt::Display for LoginError {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
|
||||||
|
write!(f, "{:?}", self)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::error::Error for LoginError {}
|
||||||
|
|
||||||
|
impl From<reqwest::Error> for LoginError {
|
||||||
|
fn from(err: reqwest::Error) -> Self {
|
||||||
|
LoginError::NetworkFailure(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<anyhow::Error> for LoginError {
|
||||||
|
fn from(err: anyhow::Error) -> Self {
|
||||||
|
LoginError::OtherFailure(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handles the user login flow.
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct UserLogin {
|
||||||
|
pub username: String,
|
||||||
|
pub password: String,
|
||||||
|
pub captcha_required: bool,
|
||||||
|
pub captcha_gid: String,
|
||||||
|
pub captcha_text: String,
|
||||||
|
pub twofactor_code: String,
|
||||||
|
pub email_code: String,
|
||||||
|
pub steam_id: u64,
|
||||||
|
|
||||||
|
client: SteamApiClient,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl UserLogin {
|
||||||
|
pub fn new(username: String, password: String) -> UserLogin {
|
||||||
|
return UserLogin {
|
||||||
|
username,
|
||||||
|
password,
|
||||||
|
captcha_required: false,
|
||||||
|
captcha_gid: String::from("-1"),
|
||||||
|
captcha_text: String::from(""),
|
||||||
|
twofactor_code: String::from(""),
|
||||||
|
email_code: String::from(""),
|
||||||
|
steam_id: 0,
|
||||||
|
client: SteamApiClient::new(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn login(&mut self) -> anyhow::Result<Session, LoginError> {
|
||||||
|
trace!("UserLogin::login");
|
||||||
|
if self.captcha_required && self.captcha_text.len() == 0 {
|
||||||
|
return Err(LoginError::NeedCaptcha {
|
||||||
|
captcha_gid: self.captcha_gid.clone(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if self.client.session.is_none() {
|
||||||
|
self.client.update_session()?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let params = hashmap! {
|
||||||
|
"donotcache" => format!(
|
||||||
|
"{}",
|
||||||
|
SystemTime::now()
|
||||||
|
.duration_since(UNIX_EPOCH)
|
||||||
|
.unwrap()
|
||||||
|
.as_secs()
|
||||||
|
* 1000
|
||||||
|
),
|
||||||
|
"username" => self.username.clone(),
|
||||||
|
};
|
||||||
|
let resp = self
|
||||||
|
.client
|
||||||
|
.post("https://steamcommunity.com/login/getrsakey")
|
||||||
|
.form(¶ms)
|
||||||
|
.send()?;
|
||||||
|
|
||||||
|
let encrypted_password: String;
|
||||||
|
let rsa_timestamp: String;
|
||||||
|
match resp.json::<RsaResponse>() {
|
||||||
|
Ok(rsa_resp) => {
|
||||||
|
rsa_timestamp = rsa_resp.timestamp.clone();
|
||||||
|
encrypted_password = encrypt_password(rsa_resp, &self.password);
|
||||||
|
}
|
||||||
|
Err(error) => {
|
||||||
|
error!("rsa error: {:?}", error);
|
||||||
|
return Err(LoginError::BadRSA);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
trace!("captchagid: {}", self.captcha_gid);
|
||||||
|
trace!("captcha_text: {}", self.captcha_text);
|
||||||
|
trace!("twofactorcode: {}", self.twofactor_code);
|
||||||
|
trace!("emailauth: {}", self.email_code);
|
||||||
|
|
||||||
|
let login_resp: LoginResponse = self.client.login(
|
||||||
|
self.username.clone(),
|
||||||
|
encrypted_password,
|
||||||
|
self.twofactor_code.clone(),
|
||||||
|
self.email_code.clone(),
|
||||||
|
self.captcha_gid.clone(),
|
||||||
|
self.captcha_text.clone(),
|
||||||
|
rsa_timestamp,
|
||||||
|
)?;
|
||||||
|
|
||||||
|
if login_resp.message.contains("too many login") {
|
||||||
|
return Err(LoginError::TooManyAttempts);
|
||||||
|
}
|
||||||
|
|
||||||
|
if login_resp.message.contains("Incorrect login") {
|
||||||
|
return Err(LoginError::BadCredentials);
|
||||||
|
}
|
||||||
|
|
||||||
|
if login_resp.captcha_needed {
|
||||||
|
self.captcha_gid = login_resp.captcha_gid.clone();
|
||||||
|
return Err(LoginError::NeedCaptcha {
|
||||||
|
captcha_gid: self.captcha_gid.clone(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if login_resp.emailauth_needed {
|
||||||
|
self.steam_id = login_resp.emailsteamid.clone();
|
||||||
|
return Err(LoginError::NeedEmail);
|
||||||
|
}
|
||||||
|
|
||||||
|
if login_resp.requires_twofactor {
|
||||||
|
return Err(LoginError::Need2FA);
|
||||||
|
}
|
||||||
|
|
||||||
|
if !login_resp.login_complete {
|
||||||
|
return Err(LoginError::BadCredentials);
|
||||||
|
}
|
||||||
|
|
||||||
|
if login_resp.needs_transfer_login() {
|
||||||
|
self.client.transfer_login(login_resp)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(self.client.session.clone().unwrap());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn encrypt_password(rsa_resp: RsaResponse, password: &String) -> String {
|
||||||
|
let rsa_exponent = rsa::BigUint::parse_bytes(rsa_resp.publickey_exp.as_bytes(), 16).unwrap();
|
||||||
|
let rsa_modulus = rsa::BigUint::parse_bytes(rsa_resp.publickey_mod.as_bytes(), 16).unwrap();
|
||||||
|
let public_key = RsaPublicKey::new(rsa_modulus, rsa_exponent).unwrap();
|
||||||
|
#[cfg(test)]
|
||||||
|
let mut rng = rand::rngs::mock::StepRng::new(2, 1);
|
||||||
|
#[cfg(not(test))]
|
||||||
|
let mut rng = rand::rngs::OsRng;
|
||||||
|
let padding = rsa::PaddingScheme::new_pkcs1v15_encrypt();
|
||||||
|
let encrypted_password = base64::encode(
|
||||||
|
public_key
|
||||||
|
.encrypt(&mut rng, padding, password.as_bytes())
|
||||||
|
.unwrap(),
|
||||||
|
);
|
||||||
|
return encrypted_password;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_encrypt_password() {
|
||||||
|
let rsa_resp = RsaResponse{
|
||||||
|
success: true,
|
||||||
|
publickey_exp: String::from("010001"),
|
||||||
|
publickey_mod: String::from("98f9088c1250b17fe19d2b2422d54a1eef0036875301731f11bd17900e215318eb6de1546727c0b7b61b86cefccdcb2f8108c813154d9a7d55631965eece810d4ab9d8a59c486bda778651b876176070598a93c2325c275cb9c17bdbcacf8edc9c18c0c5d59bc35703505ef8a09ed4c62b9f92a3fac5740ce25e490ab0e26d872140e4103d912d1e3958f844264211277ee08d2b4dd3ac58b030b25342bd5c949ae7794e46a8eab26d5a8deca683bfd381da6c305b19868b8c7cd321ce72c693310a6ebf2ecd43642518f825894602f6c239cf193cb4346ce64beac31e20ef88f934f2f776597734bb9eae1ebdf4a453973b6df9d5e90777bffe5db83dd1757b"),
|
||||||
|
timestamp: String::from("asdf"),
|
||||||
|
token_gid: String::from("asdf"),
|
||||||
|
};
|
||||||
|
let result = encrypt_password(rsa_resp, &String::from("kelwleofpsm3n4ofc"));
|
||||||
|
assert_eq!(result.len(), 344);
|
||||||
|
assert_eq!(result, "RUo/3IfbkVcJi1q1S5QlpKn1mEn3gNJoc/Z4VwxRV9DImV6veq/YISEuSrHB3885U5MYFLn1g94Y+cWRL6HGXoV+gOaVZe43m7O92RwiVz6OZQXMfAv3UC/jcqn/xkitnj+tNtmx55gCxmGbO2KbqQ0TQqAyqCOOw565B+Cwr2OOorpMZAViv9sKA/G3Q6yzscU6rhua179c8QjC1Hk3idUoSzpWfT4sHNBW/EREXZ3Dkjwu17xzpfwIUpnBVIlR8Vj3coHgUCpTsKVRA3T814v9BYPlvLYwmw5DW3ddx+2SyTY0P5uuog36TN2PqYS7ioF5eDe16gyfRR4Nzn/7wA==");
|
||||||
|
}
|
Loading…
Reference in a new issue