matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-11-23 11:02:35 +03:00
Code Activity

Refactor token generation a bit

Browse Source
This commit is contained in:
Quentin Gliech
2021-09-23 14:24:44 +02:00
parent 29126e336e
commit a9f1f8bb71
6 changed files with 61 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/core/src/handlers/oauth2/authorization.rs
View File

@@ -62,7 +62,7 @@ use crate::{
SessionInfo,
},
templates::{FormPostContext, Templates},
tokens,
tokens::{AccessToken, RefreshToken},
};
#[derive(Deserialize)]
@@ -428,8 +428,8 @@ async fn step(
let (access_token, refresh_token) = {
let mut rng = thread_rng();
(
tokens::generate(&mut rng, tokens::TokenType::AccessToken),
tokens::generate(&mut rng, tokens::TokenType::RefreshToken),
AccessToken.generate(&mut rng),
RefreshToken.generate(&mut rng),
)
};

4
crates/core/src/handlers/oauth2/introspection.rs
View File

@@ -26,7 +26,7 @@ use crate::{
database::connection,
},
storage::oauth2::{access_token::lookup_access_token, refresh_token::lookup_refresh_token},
tokens,
tokens::{self, TokenType},
};
pub fn filter(
@@ -70,7 +70,7 @@ async fn introspect(
}
let token = &params.token;
let token_type = tokens::check(token).wrap_error()?;
let token_type = TokenType::check(token).wrap_error()?;
if let Some(hint) = params.token_type_hint {
if token_type != hint {
info!("Token type hint did not match");

10
crates/core/src/handlers/oauth2/token.rs
View File

@@ -50,7 +50,7 @@ use crate::{
authorization_code::{consume_code, lookup_code},
refresh_token::{add_refresh_token, lookup_refresh_token, replace_refresh_token},
},
tokens,
tokens::{AccessToken, RefreshToken},
};
#[skip_serializing_none]
@@ -164,8 +164,8 @@ async fn authorization_code_grant(
let (access_token, refresh_token) = {
let mut rng = thread_rng();
(
tokens::generate(&mut rng, tokens::TokenType::AccessToken),
tokens::generate(&mut rng, tokens::TokenType::RefreshToken),
AccessToken.generate(&mut rng),
RefreshToken.generate(&mut rng),
)
};
@@ -234,8 +234,8 @@ async fn refresh_token_grant(
let (access_token, refresh_token) = {
let mut rng = thread_rng();
(
tokens::generate(&mut rng, tokens::TokenType::AccessToken),
tokens::generate(&mut rng, tokens::TokenType::RefreshToken),
AccessToken.generate(&mut rng),
RefreshToken.generate(&mut rng),
)
};

2
crates/core/src/handlers/oauth2/userinfo.rs
View File

@@ -18,7 +18,7 @@ use warp::{Filter, Rejection, Reply};
use crate::{
config::OAuth2Config,
filters::authenticate::{recover_unauthorized, authentication},
filters::authenticate::{authentication, recover_unauthorized},
storage::oauth2::access_token::OAuth2AccessTokenLookup,
};