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

Merge branch 'main' into separate-nesting-opaque-services

Browse Source
This commit is contained in:
David Pedersen
2022-06-30 00:30:22 +02:00
parent bbf1852c56 a4c820420d
commit 7ed35d2b5f
6 changed files with 118 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
axum/CHANGELOG.md
+6
View File
@@ -22,10 +22,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
`/foo.js` ([#1086])
- **fixed:** Routes like `/foo` and `/*rest` are no longer considered
overlapping. `/foo` will take priority ([#1086])
- **breaking:** Remove trailing slash redirects. Previously if you added a route
for `/foo`, axum would redirect calls to `/foo/` to `/foo` (or vice versa for
`/foo/`). That is no longer supported and such requests will now be sent to
the fallback. Consider using `axum_extra::routing::RouterExt::route_with_tsr`
if you want the old behavior ([#1119])
[#1077]: https://github.com/tokio-rs/axum/pull/1077
[#1086]: https://github.com/tokio-rs/axum/pull/1086
[#1102]: https://github.com/tokio-rs/axum/pull/1102
[#1119]: https://github.com/tokio-rs/axum/pull/1119
[#924]: https://github.com/tokio-rs/axum/pull/924
# 0.5.10 (28. June, 2022)
axum/src/routing/mod.rs
+10 -50
View File
@@ -4,12 +4,12 @@ use self::{future::RouteFuture, not_found::NotFound};
use crate::{
body::{boxed, Body, Bytes, HttpBody},
extract::connect_info::IntoMakeServiceWithConnectInfo,
response::{IntoResponse, Redirect, Response},
response::Response,
routing::strip_prefix::StripPrefix,
util::try_downcast,
BoxError,
};
use http::{Request, Uri};
use http::Request;
use matchit::MatchError;
use std::{
borrow::Cow,
@@ -484,47 +484,18 @@ where
match self.node.at(&path) {
Ok(match_) => self.call_route(match_, req),
Err(err) => {
let mut fallback = match &self.fallback {
Fallback::Default(inner) => inner.clone(),
Fallback::Custom(inner) => inner.clone(),
};
let new_uri = match err {
MatchError::MissingTrailingSlash => {
replace_path(req.uri(), &format!("{}/", &path))
}
MatchError::ExtraTrailingSlash => {
replace_path(req.uri(), path.strip_suffix('/').unwrap())
}
MatchError::NotFound => None,
};
if let Some(new_uri) = new_uri {
RouteFuture::from_response(
Redirect::permanent(&new_uri.to_string()).into_response(),
)
} else {
fallback.call(req)
}
}
Err(
MatchError::NotFound
| MatchError::ExtraTrailingSlash
| MatchError::MissingTrailingSlash,
) => match &self.fallback {
Fallback::Default(inner) => inner.clone().call(req),
Fallback::Custom(inner) => inner.clone().call(req),
},
}
}
}
fn replace_path(uri: &Uri, new_path: &str) -> Option<Uri> {
let mut new_path_and_query = new_path.to_owned();
if let Some(query) = uri.query() {
new_path_and_query.push('?');
new_path_and_query.push_str(query);
}
let mut parts = uri.clone().into_parts();
parts.path_and_query = Some(new_path_and_query.parse().unwrap());
Uri::from_parts(parts).ok()
}
/// Wrapper around `matchit::Router` that supports merging two `Router`s.
#[derive(Clone, Default)]
struct Node {
@@ -630,14 +601,3 @@ fn traits() {
use crate::test_helpers::*;
assert_send::<Router<()>>();
}
// https://github.com/tokio-rs/axum/issues/1122
#[test]
fn test_replace_trailing_slash() {
let uri = "api.ipify.org:80".parse::<Uri>().unwrap();
assert!(uri.scheme().is_none());
assert_eq!(uri.authority(), Some(&"api.ipify.org:80".parse().unwrap()));
assert!(uri.path_and_query().is_none());
replace_path(&uri, "/foo");
}
axum/src/routing/route.rs
-10
View File
@@ -112,16 +112,6 @@ impl<B, E> RouteFuture<B, E> {
}
}
pub(super) fn from_response(response: Response) -> Self {
Self {
kind: RouteFutureKind::Response {
response: Some(response),
},
strip_body: false,
allow_header: None,
}
}
pub(crate) fn strip_body(mut self, strip_body: bool) -> Self {
self.strip_body = strip_body;
self
axum/src/routing/tests/mod.rs
+7 -38
View File
@@ -315,33 +315,26 @@ async fn middleware_applies_to_routes_above() {
}
#[tokio::test]
async fn with_trailing_slash() {
async fn not_found_for_extra_trailing_slash() {
let app = Router::new().route("/foo", get(|| async {}));
let client = TestClient::new(app);
let res = client.get("/foo/").send().await;
assert_eq!(res.status(), StatusCode::PERMANENT_REDIRECT);
assert_eq!(res.headers().get("location").unwrap(), "/foo");
assert_eq!(res.status(), StatusCode::NOT_FOUND);
let res = client.get("/foo/?bar=baz").send().await;
assert_eq!(res.status(), StatusCode::PERMANENT_REDIRECT);
assert_eq!(res.headers().get("location").unwrap(), "/foo?bar=baz");
let res = client.get("/foo").send().await;
assert_eq!(res.status(), StatusCode::OK);
}
#[tokio::test]
async fn without_trailing_slash() {
async fn not_found_for_missing_trailing_slash() {
let app = Router::new().route("/foo/", get(|| async {}));
let client = TestClient::new(app);
let res = client.get("/foo").send().await;
assert_eq!(res.status(), StatusCode::PERMANENT_REDIRECT);
assert_eq!(res.headers().get("location").unwrap(), "/foo/");
let res = client.get("/foo?bar=baz").send().await;
assert_eq!(res.status(), StatusCode::PERMANENT_REDIRECT);
assert_eq!(res.headers().get("location").unwrap(), "/foo/?bar=baz");
assert_eq!(res.status(), StatusCode::NOT_FOUND);
}
#[tokio::test]
@@ -361,31 +354,7 @@ async fn with_and_without_trailing_slash() {
assert_eq!(res.text().await, "without tsr");
}
// for https://github.com/tokio-rs/axum/issues/681
#[tokio::test]
async fn with_trailing_slash_post() {
let app = Router::new().route("/foo", post(|| async {}));
let client = TestClient::new(app);
// `TestClient` automatically follows redirects
let res = client.post("/foo/").send().await;
assert_eq!(res.status(), StatusCode::PERMANENT_REDIRECT);
assert_eq!(res.headers().get("location").unwrap(), "/foo");
}
// for https://github.com/tokio-rs/axum/issues/681
#[tokio::test]
async fn without_trailing_slash_post() {
let app = Router::new().route("/foo/", post(|| async {}));
let client = TestClient::new(app);
let res = client.post("/foo").send().await;
assert_eq!(res.status(), StatusCode::PERMANENT_REDIRECT);
assert_eq!(res.headers().get("location").unwrap(), "/foo/");
}
// for https://github.com/tokio-rs/axum/issues/420
#[tokio::test]
async fn wildcard_doesnt_match_just_trailing_slash() {
let app = Router::new().route(