matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-09 04:22:45 +03:00
Code Activity

Remove usages of Utc::now() in time claims

Browse Source
This commit is contained in:
Quentin Gliech
2022-10-24 09:16:40 +02:00
parent f1aa42fae4
commit 44d09b68e7
1 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
crates/jose/src/claims.rs
View File

@@ -150,51 +150,32 @@ impl<T, V> Claim<T, V> {
#[derive(Debug, Clone)]
pub struct TimeOptions {
when: Option<chrono::DateTime<chrono::Utc>>,
when: chrono::DateTime<chrono::Utc>,
leeway: chrono::Duration,
}
impl Default for TimeOptions {
fn default() -> Self {
Self {
when: None,
leeway: chrono::Duration::minutes(5),
}
}
}
impl TimeOptions {
#[must_use]
pub fn new(when: chrono::DateTime<chrono::Utc>) -> Self {
Self {
when: Some(when),
..Self::default()
when,
leeway: chrono::Duration::minutes(5),
}
}
#[must_use]
pub fn freeze(mut self) -> Self {
self.when = Some(chrono::Utc::now());
self
}
#[must_use]
pub fn leeway(mut self, leeway: chrono::Duration) -> Self {
self.leeway = leeway;
self
}
fn when(&self) -> chrono::DateTime<chrono::Utc> {
self.when.unwrap_or_else(chrono::Utc::now)
}
}
#[derive(Debug, Clone, Default)]
#[derive(Debug, Clone)]
pub struct TimeNotAfter(TimeOptions);
impl Validator<Timestamp> for TimeNotAfter {
fn validate(&self, value: &Timestamp) -> Result<(), anyhow::Error> {
if self.0.when() <= value.0 + self.0.leeway {
if self.0.when <= value.0 + self.0.leeway {
Ok(())
} else {
Err(anyhow::anyhow!("current time is too far away"))
@@ -214,12 +195,12 @@ impl From<&TimeOptions> for TimeNotAfter {
}
}
#[derive(Debug, Clone, Default)]
#[derive(Debug, Clone)]
pub struct TimeNotBefore(TimeOptions);
impl Validator<Timestamp> for TimeNotBefore {
fn validate(&self, value: &Timestamp) -> Result<(), anyhow::Error> {
if self.0.when() >= value.0 - self.0.leeway {
if self.0.when >= value.0 - self.0.leeway {
Ok(())
} else {
Err(anyhow::anyhow!("current time is too far before"))