mirror of
https://github.com/tokio-rs/axum.git
synced 2026-08-29 00:00:18 +02:00
Only allow last extractor to mutate the request (#1272)
* Only allow last extractor to mutate the request * Change `FromRequest` and add `FromRequestParts` trait (#1275) * Add `Once`/`Mut` type parameter for `FromRequest` and `RequestParts` * 🪄 * split traits * `FromRequest` for tuples * Remove `BodyAlreadyExtracted` * don't need fully qualified path * don't export `Once` and `Mut` * remove temp tests * depend on axum again Co-authored-by: Jonas Platte <[email protected]> * Port `Handler` and most extractors (#1277) * Port `Handler` and most extractors * Put `M` inside `Handler` impls, not trait itself * comment out tuples for now * fix lints * Reorder arguments to `Handler` (#1281) I think `Request<B>, Arc<S>` is better since its consistent with `FromRequest` and `FromRequestParts`. * Port most things in axum-extra (#1282) * Port `#[derive(TypedPath)]` and `#[debug_handler]` (#1283) * port #[derive(TypedPath)] * wip: #[debug_handler] * fix #[debug_handler] * don't need itertools * also require `Send` * update expected error * support fully qualified `self` * Implement FromRequest[Parts] for tuples (#1286) * Port docs for axum and axum-core (#1285) * Port axum-extra (#1287) * Port axum-extra * Update axum-core/Cargo.toml Co-authored-by: Jonas Platte <[email protected]> * remove `impl FromRequest for Either*` Co-authored-by: Jonas Platte <[email protected]> * New FromRequest[Parts] trait cleanup (#1288) * Make private module truly private again * Simplify tuple FromRequest implementation * Port `#[derive(FromRequest)]` (#1289) * fix tests * fix docs * revert examples * fix docs link * fix intra docs links * Port examples (#1291) * Document wrapping other extractors (#1292) * axum-extra doesn't need to depend on axum-core (#1294) Missed this in https://github.com/tokio-rs/axum/pull/1287 * Add `FromRequest` changes to changelogs (#1293) * Update changelog * Remove default type for `S` in `Handler` * Clarify which types have default types for `S` * Apply suggestions from code review Co-authored-by: Jonas Platte <[email protected]> Co-authored-by: Jonas Platte <[email protected]> * remove unused import * Rename `Mut` and `Once` (#1296) * fix trybuild expected output Co-authored-by: Jonas Platte <[email protected]>
This commit is contained in:
co-authored by
Jonas Platte
parent
f1769e5134
commit
be624306f4
@@ -4,11 +4,12 @@
|
||||
|
||||
use axum::{
|
||||
async_trait,
|
||||
extract::{FromRequest, RequestParts},
|
||||
extract::FromRequestParts,
|
||||
response::{IntoResponse, IntoResponseParts, Response, ResponseParts},
|
||||
};
|
||||
use http::{
|
||||
header::{COOKIE, SET_COOKIE},
|
||||
request::Parts,
|
||||
HeaderMap,
|
||||
};
|
||||
use std::convert::Infallible;
|
||||
@@ -88,15 +89,14 @@ pub struct CookieJar {
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl<S, B> FromRequest<S, B> for CookieJar
|
||||
impl<S> FromRequestParts<S> for CookieJar
|
||||
where
|
||||
B: Send,
|
||||
S: Send + Sync,
|
||||
{
|
||||
type Rejection = Infallible;
|
||||
|
||||
async fn from_request(req: &mut RequestParts<S, B>) -> Result<Self, Self::Rejection> {
|
||||
Ok(Self::from_headers(req.headers()))
|
||||
async fn from_request_parts(parts: &mut Parts, _state: &S) -> Result<Self, Self::Rejection> {
|
||||
Ok(Self::from_headers(&parts.headers))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -115,7 +115,9 @@ impl CookieJar {
|
||||
/// The cookies in `headers` will be added to the jar.
|
||||
///
|
||||
/// This is inteded to be used in middleware and other places where it might be difficult to
|
||||
/// run extractors. Normally you should create `CookieJar`s through [`FromRequest`].
|
||||
/// run extractors. Normally you should create `CookieJar`s through [`FromRequestParts`].
|
||||
///
|
||||
/// [`FromRequestParts`]: axum::extract::FromRequestParts
|
||||
pub fn from_headers(headers: &HeaderMap) -> Self {
|
||||
let mut jar = cookie::CookieJar::new();
|
||||
for cookie in cookies_from_request(headers) {
|
||||
@@ -127,10 +129,12 @@ impl CookieJar {
|
||||
/// Create a new empty `CookieJar`.
|
||||
///
|
||||
/// This is inteded to be used in middleware and other places where it might be difficult to
|
||||
/// run extractors. Normally you should create `CookieJar`s through [`FromRequest`].
|
||||
/// run extractors. Normally you should create `CookieJar`s through [`FromRequestParts`].
|
||||
///
|
||||
/// If you need a jar that contains the headers from a request use `impl From<&HeaderMap> for
|
||||
/// CookieJar`.
|
||||
///
|
||||
/// [`FromRequestParts`]: axum::extract::FromRequestParts
|
||||
pub fn new() -> Self {
|
||||
Self::default()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user