Merge pull request #17 from wyhaya/master
Support generating and checking token from the current system time
This commit is contained in:
commit
2c75d046ec
20
src/lib.rs
20
src/lib.rs
|
@ -55,6 +55,7 @@ use core::fmt;
|
||||||
use {base64, image::Luma, qrcodegen};
|
use {base64, image::Luma, qrcodegen};
|
||||||
|
|
||||||
use hmac::Mac;
|
use hmac::Mac;
|
||||||
|
use std::time::{SystemTime, SystemTimeError, UNIX_EPOCH};
|
||||||
|
|
||||||
type HmacSha1 = hmac::Hmac<sha1::Sha1>;
|
type HmacSha1 = hmac::Hmac<sha1::Sha1>;
|
||||||
type HmacSha256 = hmac::Hmac<sha2::Sha256>;
|
type HmacSha256 = hmac::Hmac<sha2::Sha256>;
|
||||||
|
@ -103,6 +104,13 @@ impl Algorithm {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn system_time() -> Result<u64, SystemTimeError> {
|
||||||
|
let t = SystemTime::now()
|
||||||
|
.duration_since(UNIX_EPOCH)?
|
||||||
|
.as_secs();
|
||||||
|
Ok(t)
|
||||||
|
}
|
||||||
|
|
||||||
/// TOTP holds informations as to how to generate an auth code and validate it. Its [secret](struct.TOTP.html#structfield.secret) field is sensitive data, treat it accordingly
|
/// TOTP holds informations as to how to generate an auth code and validate it. Its [secret](struct.TOTP.html#structfield.secret) field is sensitive data, treat it accordingly
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
#[cfg_attr(feature = "serde_support", derive(Serialize, Deserialize))]
|
#[cfg_attr(feature = "serde_support", derive(Serialize, Deserialize))]
|
||||||
|
@ -169,6 +177,12 @@ impl<T: AsRef<[u8]>> TOTP<T> {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Generate a token from the current system time
|
||||||
|
pub fn generate_current(&self) -> Result<String, SystemTimeError> {
|
||||||
|
let t = system_time()?;
|
||||||
|
Ok(self.generate(t))
|
||||||
|
}
|
||||||
|
|
||||||
/// Will check if token is valid by current time, accounting [skew](struct.TOTP.html#structfield.skew)
|
/// Will check if token is valid by current time, accounting [skew](struct.TOTP.html#structfield.skew)
|
||||||
pub fn check(&self, token: &str, time: u64) -> bool {
|
pub fn check(&self, token: &str, time: u64) -> bool {
|
||||||
let basestep = time / self.step - (self.skew as u64);
|
let basestep = time / self.step - (self.skew as u64);
|
||||||
|
@ -182,6 +196,12 @@ impl<T: AsRef<[u8]>> TOTP<T> {
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Will check if token is valid by current system time, accounting [skew](struct.TOTP.html#structfield.skew)
|
||||||
|
pub fn check_current(&self, token: &str) -> Result<bool, SystemTimeError> {
|
||||||
|
let t = system_time()?;
|
||||||
|
Ok(self.check(token, t))
|
||||||
|
}
|
||||||
|
|
||||||
/// Will return the base32 representation of the secret, which might be useful when users want to manually add the secret to their authenticator
|
/// Will return the base32 representation of the secret, which might be useful when users want to manually add the secret to their authenticator
|
||||||
pub fn get_secret_base32(&self) -> String {
|
pub fn get_secret_base32(&self) -> String {
|
||||||
base32::encode(
|
base32::encode(
|
||||||
|
|
Loading…
Reference in New Issue