konevsa/proxmox
1
0
Fork 0
forked from Proxmox/proxmox
Code Pull Requests Activity

tfa: Improve TOTP algorithm parsing

Browse Source 
It is very common for TOTP URIs to contain the algorithm in lowercase,
hence we convert to lowercase when doing From<&str> for Algorithm.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
This commit is contained in:
Maximiliano Sandoval 2023-06-09 17:52:25 +02:00 committed by Wolfgang Bumiller
parent 16d512b4d9
commit 84edb20eb8
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
proxmox-tfa/src/totp.rs
View File

@ -99,10 +99,10 @@ impl std::str::FromStr for Algorithm {
type Err = Error;
fn from_str(s: &str) -> Result<Self, Error> {
Ok(match s {
"SHA1" => Algorithm::Sha1,
"SHA256" => Algorithm::Sha256,
"SHA512" => Algorithm::Sha512,
Ok(match s.to_lowercase().as_str() {
"sha1" => Algorithm::Sha1,
"sha256" => Algorithm::Sha256,
"sha512" => Algorithm::Sha512,
_ => return Err(Error::UnsupportedAlgorithm(s.to_string())),
})
}
@ -640,3 +640,23 @@ fn test_otp() {
assert_eq!(parsed.issuer.as_deref(), Some("An Issuer"));
assert_eq!(parsed.account_name.as_deref(), Some("The Account Name"));
}
#[test]
fn test_algorithm_parsing() {
let secret = "AA";
let period = 30;
let digits = 6;
let issuer = "ISSUER";
let uri = format!("otpauth://totp/user%40hostname?secret={secret}&issuer={issuer}&algorithm=sha1&digits={digits}&period={period}");
let hotp: Totp = uri.parse().expect("failed to parse otp uri");
assert_eq!(hotp.algorithm, Algorithm::Sha1);
assert_eq!(hotp.period, period);
assert_eq!(hotp.digits, digits);
assert_eq!(hotp.issuer.as_deref(), Some(issuer));
assert_eq!(hotp.account_name.as_deref(), Some("user@hostname"));
assert_eq!(
&base32::encode(base32::Alphabet::RFC4648 { padding: false }, &hotp.secret()),
secret
)
}