C0ffeeCode/rvault
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity

Auth: Add function to get AuthInfo for Request without using an Extractor

Browse source
This commit is contained in:
Laurenz 2025-06-10 17:43:46 -07:00
parent 1ac49dbb60
commit 47f8e01210
Signed by: C0ffeeCode
SSH key fingerprint: SHA256:prvFOyBjButRypyXm7X8lbbCkly2Dq1PF7e/mrsPVjw
1 changed files with 39 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/auth/auth_extractor.rs
View file

@ -1,9 +1,10 @@
use std::fmt::Debug; use crate::auth::token::{TokenDTO, get_roles_from_token, get_token_from_key};
use crate::storage::DbPool;
use axum::body::Body;
use axum::extract::FromRequestParts; use axum::extract::FromRequestParts;
use axum::http::request::Parts; use axum::http::request::Parts;
use axum::http::{header, StatusCode}; use axum::http::{HeaderMap, Request, StatusCode, header};
use crate::auth::token::{get_roles_from_token, get_token_from_key, TokenDTO}; use std::fmt::Debug;
use crate::storage::DbPool;
#[derive(Debug)] #[derive(Debug)]
pub struct AuthInfo { pub struct AuthInfo {
@ -11,27 +12,42 @@ pub struct AuthInfo {
roles: Vec<String>, roles: Vec<String>,
} }
impl<> FromRequestParts<DbPool> for AuthInfo impl FromRequestParts<DbPool> for AuthInfo {
{
type Rejection = StatusCode; type Rejection = StatusCode;
async fn from_request_parts(parts: &mut Parts, state: &DbPool) -> Result<Self, Self::Rejection> { async fn from_request_parts(
let auth_header = parts parts: &mut Parts,
.headers state: &DbPool,
.get(header::AUTHORIZATION) ) -> Result<Self, Self::Rejection> {
.and_then(|value| value.to_str().ok()); let header = &parts.headers;
match auth_header { inspect_with_header(state, &header).await
Some(auth_header) => { }
let token = get_token_from_key(auth_header, state).await; }
if token.is_err() {
return Err(StatusCode::UNAUTHORIZED); pub async fn inspect_req(state: &DbPool, req: &Request<Body>) -> Result<AuthInfo, StatusCode> {
} let header = req.headers();
let token = token.unwrap(); inspect_with_header(state, header).await
let roles = get_roles_from_token(&token, state).await; }
Ok(Self {token, roles})
} pub async fn inspect_with_header(
_ => Err(StatusCode::UNAUTHORIZED), state: &DbPool,
} header: &HeaderMap,
) -> Result<AuthInfo, StatusCode> {
let auth_header = header
.get(header::AUTHORIZATION)
.and_then(|value| value.to_str().ok());
match auth_header {
Some(auth_value) => {
let token = get_token_from_key(auth_value, state).await;
if token.is_err() {
return Err(StatusCode::UNAUTHORIZED);
}
let token = token.unwrap();
let roles = get_roles_from_token(&token, state).await;
Ok(AuthInfo { token, roles })
}
None => Err(StatusCode::UNAUTHORIZED),
} }
} }