Switch to tower-cookies

Cargo.toml

@@ -51,6 +51,7 @@ tracing-subscriber = "0.2"
 url = "2.2"
 walkdir = "2.3"
 async-trait = "0.1.73"
+tower-cookies = "0.9.0"
 
 [features]
 default = ["bundled-windows"]

src/authentication.rs

@@ -1,4 +1,3 @@
-use std::convert::Infallible;
 use std::sync::Arc;
 
 use crate::db::SqliteStore;
@@ -7,9 +6,10 @@ use crate::RustyShare;
 use async_trait::async_trait;
 use axum::extract::{FromRef, FromRequestParts};
 use axum::response::Response;
-use headers::{Cookie, HeaderMapExt};
 use http::request::Parts;
+use http::StatusCode;
 use http::Uri;
+use tower_cookies::Cookies;
 
 pub enum Authentication {
     User(i32, String),
@@ -19,12 +19,12 @@ pub enum Authentication {
 fn check_session(
     store: &Option<SqliteStore>,
     uri: &Uri,
-    cookie: Option<Cookie>,
+    cookies: &Cookies,
 ) -> Result<(i32, String), Response> {
     let r = if let Some(store) = store {
         let redirect = || response::login_redirect(uri, false);
-        let cookie = cookie.ok_or_else(redirect)?;
-        let session_id = cookie.get("sid").ok_or_else(redirect)?;
+        let cookie = cookies.get("sid").ok_or_else(redirect)?;
+        let session_id = cookie.value();
         let session_id = hex::decode(session_id).map_err(|e| {
             tracing::error!("{}", e);
             redirect()
@@ -48,13 +48,13 @@ where
     Arc<RustyShare>: FromRef<S>,
     S: Send + Sync,
 {
-    type Rejection = Infallible;
+    type Rejection = (StatusCode, &'static str);
 
     async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
         let rusty_share = Arc::<RustyShare>::from_ref(state);
         let store = &rusty_share.store;
-        let cookie = parts.headers.typed_get::<Cookie>();
-        let authentication = match check_session(store, &parts.uri, cookie) {
+        let cookies = Cookies::from_request_parts(parts, state).await?;
+        let authentication = match check_session(store, &parts.uri, &cookies) {
             Ok((user_id, name)) => Authentication::User(user_id, name),
             Err(response) => Authentication::Error(response),
         };

src/main.rs

@@ -27,6 +27,7 @@ use tokio::io::AsyncWriteExt;
 use tokio::runtime::Runtime;
 use tokio::sync::mpsc;
 use tokio::task;
+use tower_cookies::CookieManagerLayer;
 use tower_http::services::ServeFile;
 use tower_http::trace::{DefaultOnResponse, TraceLayer};
 use tracing::Level;
@@ -634,6 +635,7 @@ async fn run() -> Result<(), Error> {
                         .put(upload),
                 )
                 .with_state(state)
+                .layer(CookieManagerLayer::new())
                 .layer(
                     TraceLayer::new_for_http()
                         .on_response(DefaultOnResponse::new().level(Level::INFO)),