diff options
author | Tyler Murphy <tylermurphy534@gmail.com> | 2023-01-28 17:57:52 -0500 |
---|---|---|
committer | Tyler Murphy <tylermurphy534@gmail.com> | 2023-01-28 17:57:52 -0500 |
commit | 0fbecaba3dd4782e2b041fbc70c8651f4398b7bd (patch) | |
tree | 226d3c90dd7d7e322925bf088c01a300fe0d2df0 /src/types/extract.rs | |
parent | merge (diff) | |
download | xssbook-0fbecaba3dd4782e2b041fbc70c8651f4398b7bd.tar.gz xssbook-0fbecaba3dd4782e2b041fbc70c8651f4398b7bd.tar.bz2 xssbook-0fbecaba3dd4782e2b041fbc70c8651f4398b7bd.zip |
new rust, clippy
Diffstat (limited to 'src/types/extract.rs')
-rw-r--r-- | src/types/extract.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/types/extract.rs b/src/types/extract.rs index 7dbf386..b4a6cfc 100644 --- a/src/types/extract.rs +++ b/src/types/extract.rs @@ -4,7 +4,7 @@ use axum::{extract::{FromRequestParts, FromRequest, ConnectInfo}, async_trait, r use bytes::Bytes; use serde::de::DeserializeOwned; -use crate::{types::{user::User, response::{ResponseCode, Result}, session::Session}, console}; +use crate::{types::{user::User, http::{ResponseCode, Result}, session::Session}, console}; pub struct AuthorizedUser(pub User); @@ -31,7 +31,7 @@ impl<S> FromRequestParts<S> for AuthorizedUser where S: Send + Sync { return Err(ResponseCode::InternalServerError.text("Valid token but no valid user")) }; - Ok(AuthorizedUser(user)) + Ok(Self(user)) } } @@ -48,25 +48,25 @@ impl<S, B> FromRequest<S, B> for Log where async fn from_request(mut req: Request<B>, state: &S) -> Result<Self> { let Ok(ConnectInfo(info)) = req.extract_parts::<ConnectInfo<SocketAddr>>().await else { - return Ok(Log) + return Ok(Self) }; let method = req.method().clone(); - let path = req.extensions().get::<RouterURI>().unwrap().0; + let path = req.extensions().get::<RouterURI>().map_or("", |path| path.0); let uri = req.uri().clone(); let Ok(bytes) = Bytes::from_request(req, state).await else { console::log(info.ip(), method.clone(), uri.clone(), Some(path.to_string()), None).await; - return Ok(Log) + return Ok(Self) }; let Ok(body) = String::from_utf8(bytes.bytes().flatten().collect()) else { console::log(info.ip(), method.clone(), uri.clone(), Some(path.to_string()), None).await; - return Ok(Log) + return Ok(Self) }; console::log(info.ip(), method.clone(), uri.clone(), Some(path.to_string()), Some(body.to_string())).await; - Ok(Log) + Ok(Self) } } @@ -89,7 +89,7 @@ impl<T, S, B> FromRequest<S, B> for Json<T> where return Err(ResponseCode::InternalServerError.text("Failed to read connection info")); }; let method = req.method().clone(); - let path = req.extensions().get::<RouterURI>().unwrap().0; + let path = req.extensions().get::<RouterURI>().map_or("", |path| path.0); let uri = req.uri().clone(); let Ok(bytes) = Bytes::from_request(req, state).await else { @@ -111,7 +111,7 @@ impl<T, S, B> FromRequest<S, B> for Json<T> where return Err(ResponseCode::BadRequest.text(&msg)); } - Ok(Json(value)) + Ok(Self(value)) } } |