tokio-rs/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2026-08-29 00:00:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add ExtensionsAlreadyExtracted to PathRejection (#619)

Browse Source 
* Add `ExtensionsAlreadyExtracted` to `PathRejection`

* format imports

* changelog
This commit is contained in:
David Pedersen
2021-12-12 23:51:18 +01:00
committed by GitHub
parent ecf3359980
commit c50b55384c
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
axum/src/extract/path/mod.rs
+18 -5
View File
@@ -3,6 +3,7 @@
mod de;
use super::rejection::ExtensionsAlreadyExtracted;
use crate::{
body::{boxed, Full},
extract::{rejection::*, FromRequest, RequestParts},
@@ -163,10 +164,11 @@ where
type Rejection = PathRejection;
async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
let params = match req
let ext = req
.extensions_mut()
.and_then(|ext| ext.get::<Option<UrlParams>>())
{
.ok_or_else::<Self::Rejection, _>(|| ExtensionsAlreadyExtracted::default().into())?;
let params = match ext.get::<Option<UrlParams>>() {
Some(Some(UrlParams(Ok(params)))) => Cow::Borrowed(params),
Some(Some(UrlParams(Err(InvalidUtf8InPathParam { key })))) => {
let err = PathDeserializationError {
@@ -401,10 +403,10 @@ impl std::error::Error for FailedToDeserializePathParams {}
#[cfg(test)]
mod tests {
use http::StatusCode;
use super::*;
use crate::{routing::get, test_helpers::*, Router};
use http::{Request, StatusCode};
use hyper::Body;
use std::collections::HashMap;
#[tokio::test]
@@ -508,4 +510,15 @@ mod tests {
let res = client.get("/foo").send().await;
assert_eq!(res.status(), StatusCode::OK);
}
#[tokio::test]
async fn when_extensions_are_missing() {
let app = Router::new().route("/:key", get(|_: Request<Body>, _: Path<String>| async {}));
let client = TestClient::new(app);
let res = client.get("/foo").send().await;
assert_eq!(res.status(), StatusCode::INTERNAL_SERVER_ERROR);
assert_eq!(res.text().await, "Extensions taken by other extractor");
}
}