michael/totp-rs
michael
/
totp-rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Decode account name before splitting issuer and account name parts

This commit is contained in:
timvisee 2023-01-14 13:07:27 +01:00
parent dedf24b93b
commit 1a64130ee9
No known key found for this signature in database
GPG Key ID: B8DB720BC383E172
1 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/lib.rs
View File

@ -525,16 +525,15 @@ impl TOTP {
}
let path = url.path().trim_start_matches('/');
let path = urlencoding::decode(path)
.map_err(|_| TotpUrlError::AccountNameDecoding(path.to_string()))?
.to_string();
if path.contains(':') {
let parts = path.split_once(':').unwrap();
issuer = Some(
urlencoding::decode(parts.0.to_owned().as_str())
.map_err(|_| TotpUrlError::IssuerDecoding(parts.0.to_owned()))?
.to_string(),
);
account_name = parts.1.trim_start_matches(':').to_owned();
issuer = Some(parts.0.to_owned());
account_name = parts.1.to_owned();
} else {
account_name = path.to_owned();
account_name = path;
}
account_name = urlencoding::decode(account_name.as_str())
@ -1167,6 +1166,44 @@ mod tests {
assert_eq!(totp.issuer.as_ref().unwrap(), "Github@");
}
#[test]
#[cfg(feature = "otpauth")]
fn from_url_account_name_issuer() {
let totp = TOTP::from_url("otpauth://totp/Github:constantoine?issuer=Github&secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=6&algorithm=SHA1").unwrap();
let totp_bis = TOTP::new(
Algorithm::SHA1,
6,
1,
1,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github".to_string()),
"constantoine".to_string(),
)
.unwrap();
assert_eq!(totp.get_url(), totp_bis.get_url());
assert_eq!(totp.account_name, "constantoine");
assert_eq!(totp.issuer.as_ref().unwrap(), "Github");
}
#[test]
#[cfg(feature = "otpauth")]
fn from_url_account_name_issuer_encoded() {
let totp = TOTP::from_url("otpauth://totp/Github%3Aconstantoine?issuer=Github&secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=6&algorithm=SHA1").unwrap();
let totp_bis = TOTP::new(
Algorithm::SHA1,
6,
1,
1,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github".to_string()),
"constantoine".to_string(),
)
.unwrap();
assert_eq!(totp.get_url(), totp_bis.get_url());
assert_eq!(totp.account_name, "constantoine");
assert_eq!(totp.issuer.as_ref().unwrap(), "Github");
}
#[test]
#[cfg(feature = "otpauth")]
fn from_url_query_issuer() {