Commit 7b35ef1d92d5b106f246a76492c67d452aa3c0a7
2023-01-14T15:01:59
Merge pull request #49 from timvisee/fix-url Add missing period parameter in URL, simplify URL generation
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 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184
diff --git a/src/custom_providers.rs b/src/custom_providers.rs
index 1e88a0c..08ec2e8 100644
--- a/src/custom_providers.rs
+++ b/src/custom_providers.rs
@@ -52,6 +52,6 @@ mod test {
fn get_url_steam() {
let totp = TOTP::new_steam("TestSecretSuperSecret".into(), "constantoine".into());
let url = totp.get_url();
- assert_eq!(url.as_str(), "otpauth://steam/Steam:constantoine?issuer=Steam&secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=5&algorithm=SHA1");
+ assert_eq!(url.as_str(), "otpauth://steam/Steam:constantoine?secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=5&algorithm=SHA1&issuer=Steam");
}
-}
\ No newline at end of file
+}
diff --git a/src/lib.rs b/src/lib.rs
index b80ee32..4c21243 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -621,22 +621,26 @@ impl TOTP {
if self.algorithm == Algorithm::Steam {
host = "steam";
}
- let account_name: String = urlencoding::encode(self.account_name.as_str()).to_string();
- let mut label: String = format!("{}?", account_name);
- if self.issuer.is_some() {
- let issuer: String =
- urlencoding::encode(self.issuer.as_ref().unwrap().as_str()).to_string();
- label = format!("{0}:{1}?issuer={0}&", issuer, account_name);
+ let account_name = urlencoding::encode(self.account_name.as_str()).to_string();
+ let mut params = vec![format!("secret={}", self.get_secret_base32())];
+ if self.digits != 6 {
+ params.push(format!("digits={}", self.digits));
+ }
+ if self.algorithm != Algorithm::SHA1 {
+ params.push(format!("algorithm={}", self.algorithm));
+ }
+ let label = if let Some(issuer) = &self.issuer {
+ let issuer = urlencoding::encode(issuer);
+ params.push(format!("issuer={}", issuer));
+ format!("{}:{}", issuer, account_name)
+ } else {
+ account_name
+ };
+ if self.step != 30 {
+ params.push(format!("period={}", self.step));
}
- format!(
- "otpauth://{}/{}secret={}&digits={}&algorithm={}",
- host,
- label,
- self.get_secret_base32(),
- self.digits,
- self.algorithm,
- )
+ format!("otpauth://{}/{}?{}", host, label, params.join("&"))
}
#[cfg(feature = "qr")]
@@ -871,14 +875,17 @@ mod tests {
Algorithm::SHA1,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
None,
"constantoine@github.com".to_string(),
)
.unwrap();
let url = totp.get_url();
- assert_eq!(url.as_str(), "otpauth://totp/constantoine%40github.com?secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=6&algorithm=SHA1");
+ assert_eq!(
+ url.as_str(),
+ "otpauth://totp/constantoine%40github.com?secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ"
+ );
}
#[test]
@@ -888,14 +895,14 @@ mod tests {
Algorithm::SHA1,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github".to_string()),
"constantoine@github.com".to_string(),
)
.unwrap();
let url = totp.get_url();
- assert_eq!(url.as_str(), "otpauth://totp/Github:constantoine%40github.com?issuer=Github&secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=6&algorithm=SHA1");
+ assert_eq!(url.as_str(), "otpauth://totp/Github:constantoine%40github.com?secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&issuer=Github");
}
#[test]
@@ -905,14 +912,14 @@ mod tests {
Algorithm::SHA256,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github".to_string()),
"constantoine@github.com".to_string(),
)
.unwrap();
let url = totp.get_url();
- assert_eq!(url.as_str(), "otpauth://totp/Github:constantoine%40github.com?issuer=Github&secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=6&algorithm=SHA256");
+ assert_eq!(url.as_str(), "otpauth://totp/Github:constantoine%40github.com?secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&algorithm=SHA256&issuer=Github");
}
#[test]
@@ -922,14 +929,14 @@ mod tests {
Algorithm::SHA512,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github".to_string()),
"constantoine@github.com".to_string(),
)
.unwrap();
let url = totp.get_url();
- assert_eq!(url.as_str(), "otpauth://totp/Github:constantoine%40github.com?issuer=Github&secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=6&algorithm=SHA512");
+ assert_eq!(url.as_str(), "otpauth://totp/Github:constantoine%40github.com?secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&algorithm=SHA512&issuer=Github");
}
#[test]
@@ -1121,7 +1128,7 @@ mod tests {
Algorithm::SHA1,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github".to_string()),
"constantoine@github.com".to_string(),
@@ -1156,7 +1163,7 @@ mod tests {
Algorithm::SHA1,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github@".to_string()),
"constantoine@github.com".to_string(),
@@ -1174,7 +1181,7 @@ mod tests {
Algorithm::SHA1,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github".to_string()),
"constantoine".to_string(),
@@ -1193,7 +1200,7 @@ mod tests {
Algorithm::SHA1,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github".to_string()),
"constantoine".to_string(),
@@ -1261,7 +1268,7 @@ mod tests {
Algorithm::SHA1,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github".to_string()),
"constantoine@github.com".to_string(),
@@ -1276,7 +1283,7 @@ mod tests {
let hash_digest = Sha512::digest(data);
assert_eq!(
format!("{:x}", hash_digest).as_str(),
- "025809c9db9c2c918930e018549c90929a083ee757156737812bad40ded64312c1526c73d8f2f59d5c203b97141ddfc331b1192e234f4f43257f50a6d05e382f"
+ "fbb0804f1e4f4c689d22292c52b95f0783b01b4319973c0c50dd28af23dbbbe663dce4eb05a7959086d9092341cb9f103ec5a9af4a973867944e34c063145328"
);
}