shockrah/freechat
shockrah/freechat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

User JWT's now have nbf field in claims set in seconds

Browse Source
This commit is contained in:
shockrah 2021-04-02 12:06:17 -07:00
parent 715f334619
commit c6a49a8437
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
json-api/src/auth.rs
View File

@ -25,6 +25,7 @@ lazy_static! {
struct Claim { struct Claim {
sub: db::UBigInt, // user id sub: db::UBigInt, // user id
exp: db::BigInt, // expiry date exp: db::BigInt, // expiry date
nbf: i64,
cookie: String, // unique cookie value cookie: String, // unique cookie value
} }
@ -32,14 +33,21 @@ impl Claim {
pub fn new(id: db::UBigInt) -> Claim { pub fn new(id: db::UBigInt) -> Claim {
// JWT's expire every 48 hours // JWT's expire every 48 hours
let now = (SystemTime::now() + Duration::from_secs(60 * 60 * 48)) let now = SystemTime::now();
let exp = (now + Duration::from_secs(60 * 60 * 48))
.duration_since(UNIX_EPOCH) .duration_since(UNIX_EPOCH)
.expect("System time fetch failed") .expect("System time conversion failed")
.as_millis() as i64; .as_secs() as i64;
let nbf = now
.duration_since(UNIX_EPOCH)
.expect("System time conversion failed")
.as_secs() as i64;
Claim { Claim {
sub: id, sub: id,
exp: now, exp,
nbf,
cookie: generate_cookie() cookie: generate_cookie()
} }
} }
@ -120,9 +128,8 @@ async fn valid_jwt(token: &str) -> AuthReason {
let now = SystemTime::now() let now = SystemTime::now()
.duration_since(UNIX_EPOCH) .duration_since(UNIX_EPOCH)
.expect("System time fetch failed") .expect("System time fetch failed")
.as_millis() as i64; .as_secs() as i64;
// subject used for querying speed NOT security
let active = now < decoded.claims.exp; let active = now < decoded.claims.exp;
if active { if active {
AuthReason::Good AuthReason::Good
@ -204,7 +211,7 @@ pub async fn wall_entry<'path, 'pool, 'params>(
} }
} }
pub async fn login_get_jwt(p: &Pool, response: &mut hyper::Response<hyper::Body>, params: HashMap<String, String>) { pub async fn login_get_jwt(response: &mut hyper::Response<hyper::Body>, params: HashMap<String, String>) {
// Login data has already been validated at this point // Login data has already been validated at this point
// Required data such as 'id' and 'secret' are there and validated // Required data such as 'id' and 'secret' are there and validated
use jsonwebtoken::{ use jsonwebtoken::{