Commit 9f6894a1659a47565b8465f81fc7ebe16f1941b2
2023-01-14T14:39:18
Merge pull request #50 from timvisee/fix-accountname-trim-issuer Decode account name before splitting issuer and account name parts
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
diff --git a/src/lib.rs b/src/lib.rs
index d770291..b80ee32 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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())
@@ -1169,6 +1168,44 @@ mod tests {
#[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() {
let totp = TOTP::from_url("otpauth://totp/GitHub:test?issuer=GitHub&secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=8&period=60&algorithm=SHA256").unwrap();
assert_eq!(