From 8b4228cba1083eb82412597506f43edcfffc43a5 Mon Sep 17 00:00:00 2001 From: Jacob Chang Date: Sat, 24 Jun 2017 14:15:45 +0800 Subject: [PATCH] Update dependencies (#33) * Update ring to 0.11.0 * Update chrono to 0.4 * Bump to version 2.0.2 --- Cargo.toml | 6 +++--- src/validation.rs | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2533854..b133526 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "jsonwebtoken" -version = "2.0.1" +version = "2.0.2" authors = ["Vincent Prouillet "] license = "MIT" readme = "README.md" @@ -14,7 +14,7 @@ error-chain = { version = "0.10", default-features = false } serde_json = "1.0" serde_derive = "1.0" serde = "1.0" -ring = { version = "0.9.4", features = ["rsa_signing", "dev_urandom_fallback"] } +ring = { version = "0.11.0", features = ["rsa_signing", "dev_urandom_fallback"] } base64 = "0.5" untrusted = "0.5" -chrono = "0.3" +chrono = "0.4" diff --git a/src/validation.rs b/src/validation.rs index 405a0e4..d3bd4c0 100644 --- a/src/validation.rs +++ b/src/validation.rs @@ -1,4 +1,4 @@ -use chrono::UTC; +use chrono::Utc; use serde::ser::Serialize; use serde_json::{Value, from_value, to_value}; use serde_json::map::Map; @@ -111,7 +111,7 @@ impl Default for Validation { pub fn validate(claims: &Map, options: &Validation) -> Result<()> { - let now = UTC::now().timestamp(); + let now = Utc::now().timestamp(); if let Some(iat) = claims.get("iat") { if options.validate_iat && from_value::(iat.clone())? > now + options.leeway { @@ -163,7 +163,7 @@ pub fn validate(claims: &Map, options: &Validation) -> Result<()> mod tests { use serde_json::{to_value}; use serde_json::map::Map; - use chrono::UTC; + use chrono::Utc; use super::{validate, Validation}; @@ -172,7 +172,7 @@ mod tests { #[test] fn iat_in_past_ok() { let mut claims = Map::new(); - claims.insert("iat".to_string(), to_value(UTC::now().timestamp() - 10000).unwrap()); + claims.insert("iat".to_string(), to_value(Utc::now().timestamp() - 10000).unwrap()); let res = validate(&claims, &Validation::default()); assert!(res.is_ok()); } @@ -180,7 +180,7 @@ mod tests { #[test] fn iat_in_future_fails() { let mut claims = Map::new(); - claims.insert("iat".to_string(), to_value(UTC::now().timestamp() + 100000).unwrap()); + claims.insert("iat".to_string(), to_value(Utc::now().timestamp() + 100000).unwrap()); let res = validate(&claims, &Validation::default()); assert!(res.is_err()); @@ -193,7 +193,7 @@ mod tests { #[test] fn iat_in_future_but_in_leeway_ok() { let mut claims = Map::new(); - claims.insert("iat".to_string(), to_value(UTC::now().timestamp() + 50).unwrap()); + claims.insert("iat".to_string(), to_value(Utc::now().timestamp() + 50).unwrap()); let validation = Validation { leeway: 1000 * 60, ..Default::default() @@ -205,7 +205,7 @@ mod tests { #[test] fn exp_in_future_ok() { let mut claims = Map::new(); - claims.insert("exp".to_string(), to_value(UTC::now().timestamp() + 10000).unwrap()); + claims.insert("exp".to_string(), to_value(Utc::now().timestamp() + 10000).unwrap()); let res = validate(&claims, &Validation::default()); assert!(res.is_ok()); } @@ -213,7 +213,7 @@ mod tests { #[test] fn exp_in_past_fails() { let mut claims = Map::new(); - claims.insert("exp".to_string(), to_value(UTC::now().timestamp() - 100000).unwrap()); + claims.insert("exp".to_string(), to_value(Utc::now().timestamp() - 100000).unwrap()); let res = validate(&claims, &Validation::default()); assert!(res.is_err()); @@ -226,7 +226,7 @@ mod tests { #[test] fn exp_in_past_but_in_leeway_ok() { let mut claims = Map::new(); - claims.insert("exp".to_string(), to_value(UTC::now().timestamp() - 500).unwrap()); + claims.insert("exp".to_string(), to_value(Utc::now().timestamp() - 500).unwrap()); let validation = Validation { leeway: 1000 * 60, ..Default::default() @@ -238,7 +238,7 @@ mod tests { #[test] fn nbf_in_past_ok() { let mut claims = Map::new(); - claims.insert("nbf".to_string(), to_value(UTC::now().timestamp() - 10000).unwrap()); + claims.insert("nbf".to_string(), to_value(Utc::now().timestamp() - 10000).unwrap()); let res = validate(&claims, &Validation::default()); assert!(res.is_ok()); } @@ -246,7 +246,7 @@ mod tests { #[test] fn nbf_in_future_fails() { let mut claims = Map::new(); - claims.insert("nbf".to_string(), to_value(UTC::now().timestamp() + 100000).unwrap()); + claims.insert("nbf".to_string(), to_value(Utc::now().timestamp() + 100000).unwrap()); let res = validate(&claims, &Validation::default()); assert!(res.is_err()); @@ -259,7 +259,7 @@ mod tests { #[test] fn nbf_in_future_but_in_leeway_ok() { let mut claims = Map::new(); - claims.insert("nbf".to_string(), to_value(UTC::now().timestamp() + 500).unwrap()); + claims.insert("nbf".to_string(), to_value(Utc::now().timestamp() + 500).unwrap()); let validation = Validation { leeway: 1000 * 60, ..Default::default()