remove CSRF tokens (SameSite support is good enough)

1 files changed, 1 insertions, 121 deletions

diff --git a/src/request.rs b/src/request.rs
index d89248c..8059e07 100644
--- a/src/request.rs
+++ b/src/request.rs
@@ -2,17 +2,14 @@
 
 use cookie::Cookie;
 use mime::Mime;
-use serde::{Deserialize, de::DeserializeOwned};
+use serde::de::DeserializeOwned;
 use hyper::{HeaderMap, body::Bytes, header, http::request::Parts};
 use time::Duration;
 use std::{collections::HashMap, sync::Arc};
-use rand::{Rng, distributions::Alphanumeric};
 use async_trait::async_trait;
 
 use crate::response::{SputnikHeaders, delete_cookie};
 
-const CSRF_COOKIE_NAME : &str = "csrf";
-
 /// Adds convenience methods to [`http::request::Parts`](Parts).
 pub trait SputnikParts {
     /// Parses the query string of the request into a given struct.
@@ -79,16 +76,6 @@ impl SputnikParts for Parts {
     }
 }
 
-/// A cookie-based CSRF token to be used with [`SputnikBody::into_form_csrf`].
-#[derive(Clone)]
-pub struct CsrfToken(String);
-
-impl std::fmt::Display for CsrfToken {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
 const FLASH_COOKIE_NAME: &str = "flash";
 
 /// Show the user a message after redirecting them.
@@ -150,75 +137,20 @@ impl Flash {
     }
 }
 
-impl CsrfToken {
-    /// Returns a CSRF token, either extracted from the `csrf` cookie or newly
-    /// generated if the cookie wasn't sent (in which case a set-cookie header is
-    /// appended to [`SputnikParts::response_headers`]).
-    ///
-    /// If there is no cookie, calling this method multiple times only generates
-    /// a new token on the first call, further calls return the previously
-    /// generated token.
-    pub fn from_request(req: &mut Parts) -> Self {
-        if let Some(token) = req.extensions.get::<CsrfToken>() {
-            return token.clone()
-        }
-        csrf_token_from_cookies(req)
-        .unwrap_or_else(|| {
-            let token: String = rand::thread_rng().sample_iter(
-                Alphanumeric
-                // must be HTML-safe because we embed it in CsrfToken::html_input
-            ).take(16).collect();
-            let mut c = Cookie::new(CSRF_COOKIE_NAME, token.clone());
-            c.set_secure(Some(true));
-            c.set_max_age(Some(Duration::hours(1)));
-
-            req.response_headers().set_cookie(c);
-            let token = CsrfToken(token);
-            req.extensions.insert(token.clone());
-            token
-        })
-    }
-
-    /// Returns a hidden HTML input to be embedded in forms that are received
-    /// with [`SputnikBody::into_form_csrf`].
-    pub fn html_input(&self) -> String {
-        format!("<input name=csrf type=hidden value=\"{}\">", self)
-    }
-}
-
 /// Adds deserialization methods to [`hyper::Body`].
 #[async_trait]
 pub trait SputnikBody {
     async fn into_bytes(self) -> Result<Bytes, BodyError>;
 
     /// Parses a `application/x-www-form-urlencoded` request body into a given struct.
-    ///
-    /// This does make you vulnerable to CSRF, so you normally want to use
-    /// [`SputnikBody::into_form_csrf()`] instead.
     async fn into_form<T: DeserializeOwned>(self) -> Result<T, FormError>;
 
-    /// Parses a `application/x-www-form-urlencoded` request body into a given struct.
-    /// Protects from CSRF by checking that the request body contains the same token retrieved from the cookies.
-    ///
-    /// The HTML form must embed a hidden input generated with [`CsrfToken::html_input`].
-    async fn into_form_csrf<T: DeserializeOwned>(self, req: &mut Parts) -> Result<T, CsrfProtectedFormError>;
-
     /// Attempts to deserialize the request body as JSON.
     #[cfg(feature = "json")]
     #[cfg_attr(docsrs, doc(cfg(feature = "json")))]
     async fn into_json<T: DeserializeOwned>(self) -> Result<T, JsonError>;
 }
 
-fn csrf_token_from_cookies(req: &mut Parts) -> Option<CsrfToken> {
-    req.cookies()
-        .get(CSRF_COOKIE_NAME)
-        .map(|cookie| {
-            let token = CsrfToken(cookie.value().to_string());
-            req.extensions.insert(token.clone());
-            token
-        })
-}
-
 #[async_trait]
 impl SputnikBody for hyper::Body {
     async fn into_bytes(self) -> Result<Bytes, BodyError> {
@@ -230,19 +162,6 @@ impl SputnikBody for hyper::Body {
         Ok(serde_urlencoded::from_bytes::<T>(&full_body)?)
     }
 
-    async fn into_form_csrf<T: DeserializeOwned>(self, req: &mut Parts) -> Result<T, CsrfProtectedFormError> {
-        let full_body = self.into_bytes().await?;
-        let csrf_data = serde_urlencoded::from_bytes::<CsrfData>(&full_body).map_err(|_| CsrfProtectedFormError::NoCsrf)?;
-        match csrf_token_from_cookies(req) {
-            Some(token) => if token.to_string() == csrf_data.csrf {
-                Ok(serde_urlencoded::from_bytes::<T>(&full_body)?)
-            } else {
-                Err(CsrfProtectedFormError::Mismatch)
-            }
-            None => Err(CsrfProtectedFormError::NoCookie)
-        }
-    }
-
     #[cfg(feature = "json")]
     #[cfg_attr(docsrs, doc(cfg(feature = "json")))]
     async fn into_json<T: DeserializeOwned>(self) -> Result<T, JsonError> {
@@ -251,11 +170,6 @@ impl SputnikBody for hyper::Body {
     }
 }
 
-#[derive(Deserialize)]
-struct CsrfData {
-    csrf: String,
-}
-
 #[derive(thiserror::Error, Debug)]
 #[error("query deserialize error: {0}")]
 pub struct QueryError(pub serde_urlencoded::de::Error);
@@ -289,38 +203,4 @@ pub enum JsonError {
 
     #[error("json deserialize error: {0}")]
     Deserialize(#[from] serde_json::Error),
-}
-
-#[derive(thiserror::Error, Debug)]
-pub enum CsrfProtectedFormError {
-    #[error("{0}")]
-    Body(#[from] BodyError),
-
-    #[error("form deserialize error: {0}")]
-    Deserialize(#[from] serde_urlencoded::de::Error),
-
-    #[error("no csrf token in form data")]
-    NoCsrf,
-
-    #[error("no csrf cookie")]
-    NoCookie,
-
-    #[error("csrf parameter doesn't match csrf cookie")]
-    Mismatch,
-}
-
-#[cfg(test)]
-mod tests {
-    use hyper::Request;
-
-    use super::*;
-
-    #[test]
-    fn test_csrf_token() {
-        let mut parts = Request::new(hyper::Body::empty()).into_parts().0;
-        let tok1 = CsrfToken::from_request(&mut parts);
-        let tok2 = CsrfToken::from_request(&mut parts);
-        assert_eq!(tok1.to_string(), tok2.to_string());
-        assert_eq!(parts.response_headers().len(), 1);
-    }
 }
\ No newline at end of file