TornadoCash/siwe-oidc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add expires_in for token response

Browse Source
This commit is contained in:
Simon Bihel 2022-01-19 12:50:40 +00:00
parent d3d3f0163c
commit 0a8e7332fc
No known key found for this signature in database
GPG Key ID: B7013150BEAA28FD
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/db/mod.rs
View File

@ -14,7 +14,7 @@ mod cf;
pub use cf::CFClient; pub use cf::CFClient;
const KV_CLIENT_PREFIX: &str = "clients"; const KV_CLIENT_PREFIX: &str = "clients";
const ENTRY_LIFETIME: usize = 30; pub const ENTRY_LIFETIME: usize = 30;
#[derive(Clone, Serialize, Deserialize)] #[derive(Clone, Serialize, Deserialize)]
pub struct CodeEntry { pub struct CodeEntry {

12
src/oidc.rs
View File

@ -21,7 +21,7 @@ use openidconnect::{
use rsa::{pkcs1::ToRsaPrivateKey, RsaPrivateKey}; use rsa::{pkcs1::ToRsaPrivateKey, RsaPrivateKey};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use siwe::eip4361::{Message, Version}; use siwe::eip4361::{Message, Version};
use std::str::FromStr; use std::{str::FromStr, time};
use thiserror::Error; use thiserror::Error;
use tracing::info; use tracing::info;
use urlencoding::decode; use urlencoding::decode;
@ -231,11 +231,15 @@ pub async fn token(
) )
.map_err(|e| anyhow!("{}", e))?; .map_err(|e| anyhow!("{}", e))?;
Ok(CoreTokenResponse::new( let mut response = CoreTokenResponse::new(
access_token, access_token,
CoreTokenType::Bearer, CoreTokenType::Bearer,
CoreIdTokenFields::new(Some(id_token), EmptyExtraTokenFields {}), CoreIdTokenFields::new(Some(id_token), EmptyExtraTokenFields {}),
)) );
response.set_expires_in(Some(&time::Duration::from_secs(
ENTRY_LIFETIME.try_into().unwrap(),
)));
Ok(response)
} }
#[derive(Deserialize)] #[derive(Deserialize)]
@ -461,7 +465,7 @@ pub async fn sign_in(
nonce: params.oidc_nonce.clone(), nonce: params.oidc_nonce.clone(),
exchange_count: 0, exchange_count: 0,
client_id: params.client_id.clone(), client_id: params.client_id.clone(),
auth_time: chrono::offset::Utc::now(), auth_time: Utc::now(),
}; };
let code = Uuid::new_v4(); let code = Uuid::new_v4();