Compare commits
10 commits
b24a7415f6
...
96a30c6150
Author | SHA1 | Date | |
---|---|---|---|
|
96a30c6150 | ||
|
dd153a617c | ||
|
28c7a797cf | ||
|
c2a72fee6c | ||
|
602acc6641 | ||
|
b4564b7d5e | ||
|
d30ba017c9 | ||
|
37ae7c76a6 | ||
|
ef72bd898c | ||
|
52044c95bb |
7 changed files with 229 additions and 837 deletions
1033
Cargo.lock
generated
1033
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
14
Cargo.toml
14
Cargo.toml
|
@ -4,7 +4,7 @@ members = ["steamguard"]
|
||||||
|
|
||||||
[package]
|
[package]
|
||||||
name = "steamguard-cli"
|
name = "steamguard-cli"
|
||||||
version = "0.13.0"
|
version = "0.14.0"
|
||||||
authors = ["dyc3 (Carson McManus) <carson.mcmanus1@gmail.com>"]
|
authors = ["dyc3 (Carson McManus) <carson.mcmanus1@gmail.com>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
description = "A command line utility to generate Steam 2FA codes and respond to confirmations."
|
description = "A command line utility to generate Steam 2FA codes and respond to confirmations."
|
||||||
|
@ -32,7 +32,7 @@ anyhow = "^1.0"
|
||||||
base64 = "0.22.1"
|
base64 = "0.22.1"
|
||||||
text_io = "0.1.8"
|
text_io = "0.1.8"
|
||||||
rpassword = "7.2.0"
|
rpassword = "7.2.0"
|
||||||
reqwest = { version = "0.11", default-features = false, features = [
|
reqwest = { version = "0.12", default-features = false, features = [
|
||||||
"blocking",
|
"blocking",
|
||||||
"json",
|
"json",
|
||||||
"cookies",
|
"cookies",
|
||||||
|
@ -47,16 +47,16 @@ clap = { version = "4.5.4", features = ["derive", "cargo", "env"] }
|
||||||
clap_complete = "4.5.2"
|
clap_complete = "4.5.2"
|
||||||
log = "0.4.19"
|
log = "0.4.19"
|
||||||
stderrlog = "0.6"
|
stderrlog = "0.6"
|
||||||
cookie = "0.14"
|
cookie = "0.18"
|
||||||
regex = "1"
|
regex = "1"
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.4.0"
|
||||||
uuid = { version = "0.8", features = ["v4"] }
|
uuid = { version = "1.8", features = ["v4"] }
|
||||||
steamguard = { version = "^0.13.0", path = "./steamguard" }
|
steamguard = { version = "^0.14.0", path = "./steamguard" }
|
||||||
dirs = "3.0.2"
|
dirs = "5.0.1"
|
||||||
aes = { version = "0.8.3", features = ["zeroize"] }
|
aes = { version = "0.8.3", features = ["zeroize"] }
|
||||||
thiserror = "1.0.61"
|
thiserror = "1.0.61"
|
||||||
crossterm = { version = "0.23.2", features = ["event-stream"] }
|
crossterm = { version = "0.23.2", features = ["event-stream"] }
|
||||||
qrcode = { version = "0.12.0", optional = true }
|
qrcode = { version = "0.14.0", optional = true }
|
||||||
gethostname = "0.4.3"
|
gethostname = "0.4.3"
|
||||||
secrecy = { version = "0.8", features = ["serde"] }
|
secrecy = { version = "0.8", features = ["serde"] }
|
||||||
zeroize = { version = "^1.6.0", features = ["std", "zeroize_derive"] }
|
zeroize = { version = "^1.6.0", features = ["std", "zeroize_derive"] }
|
||||||
|
|
3
PKGBUILD
3
PKGBUILD
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
_pkgname=steamguard-cli
|
_pkgname=steamguard-cli
|
||||||
pkgname=${_pkgname}-git
|
pkgname=${_pkgname}-git
|
||||||
pkgver=0.8.1.r1.fe0d6e9a
|
pkgver=0.14.0.r1.602acc66
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="A command line utility to generate Steam 2FA codes and respond to confirmations."
|
pkgdesc="A command line utility to generate Steam 2FA codes and respond to confirmations."
|
||||||
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
|
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
|
||||||
|
@ -12,6 +12,7 @@ license=('GPL3')
|
||||||
makedepends=('rust' 'cargo' 'git')
|
makedepends=('rust' 'cargo' 'git')
|
||||||
source=("git+https://github.com/dyc3/steamguard-cli.git")
|
source=("git+https://github.com/dyc3/steamguard-cli.git")
|
||||||
sha256sums=('SKIP')
|
sha256sums=('SKIP')
|
||||||
|
options=(!lto)
|
||||||
|
|
||||||
pkgver() {
|
pkgver() {
|
||||||
cd "${srcdir}/${_pkgname}"
|
cd "${srcdir}/${_pkgname}"
|
||||||
|
|
|
@ -193,6 +193,7 @@ impl SetupCommand {
|
||||||
"authenticator state: {} -- did not actually finalize",
|
"authenticator state: {} -- did not actually finalize",
|
||||||
status.state()
|
status.state()
|
||||||
);
|
);
|
||||||
|
debug!("full status: {:#?}", status);
|
||||||
manager.remove_account(&account_name);
|
manager.remove_account(&account_name);
|
||||||
manager.save()?;
|
manager.save()?;
|
||||||
bail!("Authenticator finalization was unsuccessful. You may have entered the wrong confirm code in the previous step. Try again.");
|
bail!("Authenticator finalization was unsuccessful. You may have entered the wrong confirm code in the previous step. Try again.");
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "steamguard"
|
name = "steamguard"
|
||||||
version = "0.13.0"
|
version = "0.14.0"
|
||||||
authors = ["Carson McManus <carson.mcmanus1@gmail.com>"]
|
authors = ["Carson McManus <carson.mcmanus1@gmail.com>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
description = "Library for generating 2fa codes for Steam and responding to mobile confirmations."
|
description = "Library for generating 2fa codes for Steam and responding to mobile confirmations."
|
||||||
|
@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
|
||||||
anyhow = "^1.0"
|
anyhow = "^1.0"
|
||||||
sha1 = "^0.10"
|
sha1 = "^0.10"
|
||||||
base64 = "^0.22.1"
|
base64 = "^0.22.1"
|
||||||
reqwest = { version = "0.11", default-features = false, features = [
|
reqwest = { version = "0.12", default-features = false, features = [
|
||||||
"blocking",
|
"blocking",
|
||||||
"json",
|
"json",
|
||||||
"cookies",
|
"cookies",
|
||||||
|
@ -24,12 +24,11 @@ serde = { version = "1.0", features = ["derive"] }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
rsa = "0.9.2"
|
rsa = "0.9.2"
|
||||||
rand = "0.8.4"
|
rand = "0.8.4"
|
||||||
cookie = "0.14"
|
cookie = "0.18"
|
||||||
regex = "1"
|
regex = "1"
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.4.0"
|
||||||
uuid = { version = "0.8", features = ["v4"] }
|
uuid = { version = "1.8", features = ["v4"] }
|
||||||
log = "0.4.19"
|
log = "0.4.19"
|
||||||
scraper = "0.12.0"
|
|
||||||
maplit = "1.0.2"
|
maplit = "1.0.2"
|
||||||
thiserror = "1.0.26"
|
thiserror = "1.0.26"
|
||||||
secrecy = { version = "0.8", features = ["serde"] }
|
secrecy = { version = "0.8", features = ["serde"] }
|
||||||
|
|
|
@ -137,10 +137,7 @@ where
|
||||||
let mut req = CTwoFactor_Status_Request::new();
|
let mut req = CTwoFactor_Status_Request::new();
|
||||||
req.set_steamid(account.steam_id);
|
req.set_steamid(account.steam_id);
|
||||||
|
|
||||||
let resp = self
|
let resp = self.client.query_status(req, self.tokens.access_token())?;
|
||||||
.client
|
|
||||||
.query_status(req, self.tokens.access_token())
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
Ok(resp.into_response_data())
|
Ok(resp.into_response_data())
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize)]
|
#[derive(Debug, Clone, Deserialize)]
|
||||||
|
#[allow(dead_code)]
|
||||||
pub struct OAuthData {
|
pub struct OAuthData {
|
||||||
pub oauth_token: String,
|
pub oauth_token: String,
|
||||||
pub steamid: String,
|
pub steamid: String,
|
||||||
|
|
Loading…
Reference in a new issue