mirror/lldap
1
0
Fork 0
mirror of https://github.com/nitnelave/lldap.git synced 2023-04-12 14:25:13 +00:00
Code Issues Projects Releases Wiki Activity

Change auth handlers to return an HttpResponse

Browse Source
This commit is contained in:
Valentin Tolmer 2021-05-20 17:46:36 +02:00
parent 6cb06b0e9f
commit 9f1feb3b11
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/infra/tcp_server.rs
View File

@ -46,13 +46,17 @@ async fn index(req: HttpRequest) -> actix_web::Result<NamedFile> {
Ok(NamedFile::open(path)?) Ok(NamedFile::open(path)?)
} }
fn error_to_http_response<T>(error: DomainError) -> ApiResult<T> { fn error_to_http_response(error: DomainError) -> HttpResponse {
ApiResult::Right(
match error { match error {
DomainError::AuthenticationError(_) => HttpResponse::Unauthorized(), DomainError::AuthenticationError(_) => HttpResponse::Unauthorized(),
DomainError::DatabaseError(_) => HttpResponse::InternalServerError(), DomainError::DatabaseError(_) => HttpResponse::InternalServerError(),
} }
.body(error.to_string()), .body(error.to_string())
}
fn error_to_api_response<T>(error: DomainError) -> ApiResult<T> {
ApiResult::Right(
error_to_http_response(error)
) )
} }
@ -70,7 +74,7 @@ where
.list_users(req) .list_users(req)
.await .await
.map(|res| ApiResult::Left(web::Json(res))) .map(|res| ApiResult::Left(web::Json(res)))
.unwrap_or_else(error_to_http_response) .unwrap_or_else(error_to_api_response)
} }
fn create_jwt(key: &Hmac<Sha512>, user: String, groups: HashSet<String>) -> SignedToken { fn create_jwt(key: &Hmac<Sha512>, user: String, groups: HashSet<String>) -> SignedToken {
@ -90,7 +94,7 @@ fn create_jwt(key: &Hmac<Sha512>, user: String, groups: HashSet<String>) -> Sign
async fn get_refresh<Backend>( async fn get_refresh<Backend>(
data: web::Data<AppState<Backend>>, data: web::Data<AppState<Backend>>,
request: HttpRequest, request: HttpRequest,
) -> ApiResult<String> ) -> HttpResponse
where where
Backend: TcpBackendHandler + 'static, Backend: TcpBackendHandler + 'static,
{ {
@ -98,11 +102,11 @@ where
let jwt_key = &data.jwt_key; let jwt_key = &data.jwt_key;
let (refresh_token, user) = match request.cookie("refresh_token") { let (refresh_token, user) = match request.cookie("refresh_token") {
None => { None => {
return ApiResult::Right(HttpResponse::Unauthorized().body("Missing refresh token")) return HttpResponse::Unauthorized().body("Missing refresh token")
} }
Some(t) => match t.value().split_once("+") { Some(t) => match t.value().split_once("+") {
None => { None => {
return ApiResult::Right(HttpResponse::Unauthorized().body("Invalid refresh token")) return HttpResponse::Unauthorized().body("Invalid refresh token")
} }
Some((t, u)) => (t.to_string(), u.to_string()), Some((t, u)) => (t.to_string(), u.to_string()),
}, },
@ -123,7 +127,6 @@ where
} }
.map(|groups| create_jwt(jwt_key, user.to_string(), groups)) .map(|groups| create_jwt(jwt_key, user.to_string(), groups))
.map(|token| { .map(|token| {
ApiResult::Right(
HttpResponse::Ok() HttpResponse::Ok()
.cookie( .cookie(
Cookie::build("token", token.as_str()) Cookie::build("token", token.as_str())
@ -133,8 +136,7 @@ where
.same_site(SameSite::Strict) .same_site(SameSite::Strict)
.finish(), .finish(),
) )
.body(token.as_str().to_owned()), .body(token.as_str().to_owned())
)
}) })
.unwrap_or_else(error_to_http_response) .unwrap_or_else(error_to_http_response)
} }
@ -142,7 +144,7 @@ where
async fn post_authorize<Backend>( async fn post_authorize<Backend>(
data: web::Data<AppState<Backend>>, data: web::Data<AppState<Backend>>,
request: web::Json<BindRequest>, request: web::Json<BindRequest>,
) -> ApiResult<String> ) -> HttpResponse
where where
Backend: TcpBackendHandler + 'static, Backend: TcpBackendHandler + 'static,
{ {
@ -163,7 +165,6 @@ where
.await .await
.map(|(groups, (refresh_token, max_age))| { .map(|(groups, (refresh_token, max_age))| {
let token = create_jwt(&data.jwt_key, request.name.clone(), groups); let token = create_jwt(&data.jwt_key, request.name.clone(), groups);
ApiResult::Right(
HttpResponse::Ok() HttpResponse::Ok()
.cookie( .cookie(
Cookie::build("token", token.as_str()) Cookie::build("token", token.as_str())
@ -181,8 +182,7 @@ where
.same_site(SameSite::Strict) .same_site(SameSite::Strict)
.finish(), .finish(),
) )
.body(token.as_str().to_owned()), .body(token.as_str().to_owned())
)
}) })
.unwrap_or_else(error_to_http_response) .unwrap_or_else(error_to_http_response)
} }