Serve and check cookies on login route

This commit is contained in:
selfhoster selfhoster 2023-08-22 19:29:40 +02:00
commit c73f132421
6 changed files with 46 additions and 11 deletions

View file

@ -1,13 +1,19 @@
use axum::{
extract::{FromRequest, Form, Json, Query, State},
extract::{FromRequest, Form, Json, State},
http::{self, Request, StatusCode},
response::{IntoResponse, Response},
RequestExt,
};
use axum_typed_multipart::{TryFromMultipart, TypedMultipart};
use snafu::prelude::*;
use tower_cookies::{Cookies, Cookie};
use yunohost_api::{Username, Password};
use crate::state::RoutableAppState;
use crate::{
error::*,
routes::COOKIE_NAME,
state::RoutableAppState,
};
#[derive(Debug, TryFromMultipart, Deserialize)]
pub struct LoginForm {
@ -55,10 +61,28 @@ where
}
#[debug_handler]
pub async fn route(state: State<RoutableAppState>, form: LoginForm) -> String {
if state.check_login(&form.username, &form.password).await.unwrap() {
format!("Welcome {}", &form.username)
pub async fn route(cookies: Cookies, state: State<RoutableAppState>, form: LoginForm) -> Result<String, Error> {
trace!("ROUTE: /login/");
if let Some(session_cookie) = cookies.get(COOKIE_NAME) {
trace!("User claims to have valid {} session: {}", COOKIE_NAME, &session_cookie);
if let Some(username) = state.sessions.verify_cookie(session_cookie.value()).await.context(SessionSnafu)? {
debug!("User claims were verified. They are identified as {}", &username);
return Ok(format!("Welcome back, {}! You were already logged in.", username));
}
debug!("User claims for a {} session were unfounded. Performing login again.", COOKIE_NAME);
}
debug!("Performing login attempt for user {}", &form.username);
// No cookie, or cookie is invalid. Perform login.
if state.check_login(&form.username, &form.password).await.unwrap() {
debug!("Login was successful for user {}. Saving cookie now.", &form.username);
let (cookie_name, cookie_value) = state.sessions.make_session(COOKIE_NAME, &form.username).await;
cookies.add(Cookie::new(cookie_name, cookie_value));
Ok(format!("Welcome {}", &form.username))
} else {
format!("Invalid login for {}", &form.username)
debug!("Login failed for user {}", &form.username);
Ok(format!("Invalid login for {}", &form.username))
}
}

View file

@ -1,19 +1,22 @@
use axum::{
extract::State,
routing::{get, post},
Router,
};
use tower_cookies::CookieManagerLayer;
use crate::state::RoutableAppState;
mod index;
mod login;
pub const COOKIE_NAME: &'static str = "yunohost.ssowat";
/// Build a router for the application, in a specific subpath eg `/yunohost/sso/`
pub fn router(subpath: Option<String>, state: RoutableAppState) -> Router {
let app = Router::new()
.route("/", get(index::route))
.route("/login/", post(login::route))
.layer(CookieManagerLayer::new())
.with_state(state);
if let Some(p) = subpath {
Router::new()