A few suggestion fixes.
This commit is contained in:
parent
05b485b678
commit
493598c1ba
3 changed files with 11 additions and 3 deletions
|
@ -118,7 +118,7 @@ pub(crate) fn check_validator_time(
|
||||||
validator_time: &chrono::NaiveDateTime,
|
validator_time: &chrono::NaiveDateTime,
|
||||||
claims: &Claims,
|
claims: &Claims,
|
||||||
) -> Result<(), LemmyError> {
|
) -> Result<(), LemmyError> {
|
||||||
let user_validation_time = validator_time.timestamp_millis() / 1000;
|
let user_validation_time = validator_time.timestamp();
|
||||||
if user_validation_time > claims.iat {
|
if user_validation_time > claims.iat {
|
||||||
Err(ApiError::err("not_logged_in").into())
|
Err(ApiError::err("not_logged_in").into())
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
use crate::settings::structs::Settings;
|
use crate::settings::structs::Settings;
|
||||||
|
use chrono::Utc;
|
||||||
use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, TokenData, Validation};
|
use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, TokenData, Validation};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
@ -30,7 +31,7 @@ impl Claims {
|
||||||
let my_claims = Claims {
|
let my_claims = Claims {
|
||||||
sub: local_user_id,
|
sub: local_user_id,
|
||||||
iss: Settings::get().hostname(),
|
iss: Settings::get().hostname(),
|
||||||
iat: chrono::Utc::now().timestamp_millis() / 1000,
|
iat: Utc::now().timestamp(),
|
||||||
};
|
};
|
||||||
encode(
|
encode(
|
||||||
&Header::default(),
|
&Header::default(),
|
||||||
|
|
|
@ -13,6 +13,7 @@ use crate::{
|
||||||
};
|
};
|
||||||
use anyhow::{anyhow, Context};
|
use anyhow::{anyhow, Context};
|
||||||
use deser_hjson::from_str;
|
use deser_hjson::from_str;
|
||||||
|
use log::warn;
|
||||||
use merge::Merge;
|
use merge::Merge;
|
||||||
use std::{env, fs, io::Error, net::IpAddr, sync::RwLock};
|
use std::{env, fs, io::Error, net::IpAddr, sync::RwLock};
|
||||||
|
|
||||||
|
@ -24,7 +25,13 @@ static CONFIG_FILE: &str = "config/config.hjson";
|
||||||
lazy_static! {
|
lazy_static! {
|
||||||
static ref SETTINGS: RwLock<Settings> = RwLock::new(match Settings::init() {
|
static ref SETTINGS: RwLock<Settings> = RwLock::new(match Settings::init() {
|
||||||
Ok(c) => c,
|
Ok(c) => c,
|
||||||
Err(_) => Settings::default(),
|
Err(e) => {
|
||||||
|
warn!(
|
||||||
|
"Couldn't load settings file, using default settings.\n{}",
|
||||||
|
e
|
||||||
|
);
|
||||||
|
Settings::default()
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue