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

change parse_shared_secret to not panic, add test for build_time_bytes

Browse source
This commit is contained in:
Carson McManus 2021-07-31 11:44:56 -04:00
parent 7c58e28d56
commit fcc56d6d73
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/lib.rs
View file

@ -55,18 +55,10 @@ fn build_time_bytes(mut time: i64) -> [u8; 8] {
return bytes return bytes
} }
pub fn parse_shared_secret(secret: String) -> [u8; 20] { pub fn parse_shared_secret(secret: String) -> anyhow::Result<[u8; 20]> {
if secret.len() == 0 { ensure!(secret.len() != 0, "unable to parse empty shared secret");
panic!("unable to parse empty shared secret") let result = base64::decode(secret)?.try_into();
} return Ok(result.unwrap());
match base64::decode(secret) {
Result::Ok(v) => {
return v.try_into().unwrap()
}
_ => {
panic!("unable to parse shared secret")
}
}
} }
fn generate_confirmation_hash_for_time(time: i64, tag: &str, identity_secret: &String) -> String { fn generate_confirmation_hash_for_time(time: i64, tag: &str, identity_secret: &String) -> String {
@ -100,7 +92,7 @@ impl SteamGuardAccount {
let steam_guard_code_translations: [u8; 26] = [50, 51, 52, 53, 54, 55, 56, 57, 66, 67, 68, 70, 71, 72, 74, 75, 77, 78, 80, 81, 82, 84, 86, 87, 88, 89]; let steam_guard_code_translations: [u8; 26] = [50, 51, 52, 53, 54, 55, 56, 57, 66, 67, 68, 70, 71, 72, 74, 75, 77, 78, 80, 81, 82, 84, 86, 87, 88, 89];
let time_bytes: [u8; 8] = build_time_bytes(time / 30i64); let time_bytes: [u8; 8] = build_time_bytes(time / 30i64);
let shared_secret: [u8; 20] = parse_shared_secret(self.shared_secret.clone()); let shared_secret: [u8; 20] = parse_shared_secret(self.shared_secret.clone()).unwrap();
let hashed_data = hmacsha1::hmac_sha1(&shared_secret, &time_bytes); let hashed_data = hmacsha1::hmac_sha1(&shared_secret, &time_bytes);
let mut code_array: [u8; 5] = [0; 5]; let mut code_array: [u8; 5] = [0; 5];
let b = (hashed_data[19] & 0xF) as usize; let b = (hashed_data[19] & 0xF) as usize;
@ -279,6 +271,13 @@ impl SteamGuardAccount {
mod tests { mod tests {
use super::*; use super::*;
#[test]
fn test_build_time_bytes() {
let t1 = build_time_bytes(1617591917i64);
let t2: [u8; 8] = [0, 0, 0, 0, 96, 106, 126, 109];
assert!(t1.iter().zip(t2.iter()).all(|(a,b)| a == b), "Arrays are not equal, got {:?}", t1);
}
#[test] #[test]
fn test_generate_code() { fn test_generate_code() {
let mut account = SteamGuardAccount::new(); let mut account = SteamGuardAccount::new();