chore: fix typo

This commit is contained in:
MedzikUser 2022-05-01 22:44:28 +02:00
parent 8bd4d6f107
commit d0872f1868
No known key found for this signature in database
GPG Key ID: A5FAC1E185C112DB
9 changed files with 14 additions and 14 deletions

View File

@ -29,7 +29,7 @@ pub async fn handle(
Err(err) => { Err(err) => {
return match err { return match err {
Error::UserNotFound => Err(ServerError::AuthError(AuthError::UserNotFound)), Error::UserNotFound => Err(ServerError::AuthError(AuthError::UserNotFound)),
_ => Err(ServerError::AuthError(AuthError::UnknowError( _ => Err(ServerError::AuthError(AuthError::UnknownError(
err.to_string(), err.to_string(),
))), ))),
} }

View File

@ -1,11 +1,9 @@
use axum::routing::get;
pub mod login; pub mod login;
pub mod register; pub mod register;
pub mod whoami; pub mod whoami;
pub fn app() -> axum::Router { pub fn app() -> axum::Router {
use axum::routing::post; use axum::routing::{get, post};
axum::Router::new() axum::Router::new()
.route("/login", post(login::handle)) .route("/login", post(login::handle))

View File

@ -48,7 +48,7 @@ pub async fn handle(
return Err(ServerError::AuthError(AuthError::UserAlreadyExists)); return Err(ServerError::AuthError(AuthError::UserAlreadyExists));
} }
return Err(ServerError::AuthError(AuthError::UnknowError( return Err(ServerError::AuthError(AuthError::UnknownError(
e.to_string(), e.to_string(),
))); )));
} }

View File

@ -24,7 +24,7 @@ pub async fn handle(
Err(err) => match err { Err(err) => match err {
Error::UserNotFound => return Err(ServerError::AuthError(AuthError::UserNotFound)), Error::UserNotFound => return Err(ServerError::AuthError(AuthError::UserNotFound)),
_ => { _ => {
return Err(ServerError::AuthError(AuthError::UnknowError( return Err(ServerError::AuthError(AuthError::UnknownError(
err.to_string(), err.to_string(),
))) )))
} }

View File

@ -1,5 +1,3 @@
use homedisk_types::errors::{FsError, ServerError};
pub mod list; pub mod list;
pub mod upload; pub mod upload;
@ -11,7 +9,9 @@ pub fn app() -> axum::Router {
.route("/upload", post(upload::handle)) .route("/upload", post(upload::handle))
} }
pub fn validate_path(path: &str) -> Result<(), ServerError> { pub fn validate_path(path: &str) -> Result<(), homedisk_types::errors::ServerError> {
use homedisk_types::errors::{FsError, ServerError};
// `path` cannot contain `..` // `path` cannot contain `..`
// to prevent attack attempts because by using a `..` you can access the previous folder // to prevent attack attempts because by using a `..` you can access the previous folder
if path.contains("..") { if path.contains("..") {

View File

@ -18,7 +18,7 @@ pub async fn find_user(db: Database, user_id: String) -> Result<User, ServerErro
homedisk_database::Error::UserNotFound => { homedisk_database::Error::UserNotFound => {
Err(ServerError::AuthError(AuthError::UserNotFound)) Err(ServerError::AuthError(AuthError::UserNotFound))
} }
_ => Err(ServerError::AuthError(AuthError::UnknowError( _ => Err(ServerError::AuthError(AuthError::UnknownError(
err.to_string(), err.to_string(),
))), ))),
}, },

View File

@ -48,7 +48,9 @@ impl User {
/// ///
/// let user = User::new("medzik", "whatever"); /// let user = User::new("medzik", "whatever");
/// ///
/// user.user_dir("/home/homedisk"); // will return `/home/homedisk/medzik` /// let dir = user.user_dir("/home/homedisk"); // will return `/home/homedisk/medzik`
///
/// assert_eq!(dir, "/home/homedisk/medzik")
/// ``` /// ```
pub fn user_dir(&self, storage: &str) -> String { pub fn user_dir(&self, storage: &str) -> String {
let path = format!( let path = format!(

View File

@ -23,6 +23,6 @@ pub enum Error {
#[error("invalid jwt token")] #[error("invalid jwt token")]
InvalidToken, InvalidToken,
#[error("unknow error")] #[error("unknown error")]
UnknowError(String), UnknownError(String),
} }

View File

@ -48,7 +48,7 @@ impl axum::response::IntoResponse for ServerError {
AuthError::PasswordTooShort => StatusCode::NOT_ACCEPTABLE, AuthError::PasswordTooShort => StatusCode::NOT_ACCEPTABLE,
AuthError::TokenGenerate => StatusCode::INTERNAL_SERVER_ERROR, AuthError::TokenGenerate => StatusCode::INTERNAL_SERVER_ERROR,
AuthError::InvalidToken => StatusCode::BAD_REQUEST, AuthError::InvalidToken => StatusCode::BAD_REQUEST,
AuthError::UnknowError(_) => StatusCode::INTERNAL_SERVER_ERROR, AuthError::UnknownError(_) => StatusCode::INTERNAL_SERVER_ERROR,
}, },
Self::FsError(ref err) => match err { Self::FsError(ref err) => match err {
FsError::FileAlreadyExists => StatusCode::BAD_REQUEST, FsError::FileAlreadyExists => StatusCode::BAD_REQUEST,