Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid exposure of type names by QueryRejection #1171

Merged
merged 6 commits into from Jul 18, 2022
Merged

Avoid exposure of type names by QueryRejection #1171

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c0e4ed
Remove type name from QueryRejection
simon-amadeus Jul 18, 2022
8436ad1
Remove unused generic type param
simon-amadeus Jul 18, 2022
44b57b6
Add fix to changelog
simon-amadeus Jul 18, 2022
20ba12c
Remove unnecessary usage of turbofish
simon-amadeus Jul 18, 2022
8f41daf
axum-extra: Remove unnecessary usage of turbofish
simon-amadeus Jul 18, 2022
a91d1cb
Reword changelog entry for clarity
simon-amadeus Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions axum/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

# Unreleased

- **fixed:** `QueryRejection` response exposes type names through public interface ([#1171])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This almost sounds like the fix was to expose internal types. Maybe this is more clear?

Suggested change
- **fixed:** `QueryRejection` response exposes type names through public interface ([#1171])
- **fixed:** Don't expose internal type names in `QueryRejection` responses ([#1171])

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

huh.. I guess you are right.

- **breaking:** Remove `extractor_middleware` which was previously deprecated.
Use `axum::middleware::from_extractor` instead ([#1077])
- **breaking:** Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}` ([#924])
Expand All @@ -29,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- **breaking:** Require middleware added with `Handler::layer` to have
`Infallible` as the error type ([#1152])

[#1171]: https://github.com/tokio-rs/axum/pull/1171
[#1077]: https://github.com/tokio-rs/axum/pull/1077
[#1088]: https://github.com/tokio-rs/axum/pull/1088
[#1102]: https://github.com/tokio-rs/axum/pull/1102
Expand Down
2 changes: 1 addition & 1 deletion axum/src/extract/query.rs
View file
Open in desktop
Expand Up @@ -59,7 +59,7 @@ where
async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
let query = req.uri().query().unwrap_or_default();
let value = serde_urlencoded::from_str(query)
.map_err(FailedToDeserializeQueryString::__private_new::<T, _>)?;
.map_err(FailedToDeserializeQueryString::__private_new::<_>)?;
jplatte marked this conversation as resolved.
Show resolved Hide resolved
Ok(Query(value))
}
}
Expand Down
2 changes: 1 addition & 1 deletion axum/src/extract/rejection.rs
View file
Open in desktop
Expand Up @@ -104,7 +104,7 @@ pub struct FailedToDeserializeQueryString {

impl FailedToDeserializeQueryString {
#[doc(hidden)]
pub fn __private_new<T, E>(error: E) -> Self
pub fn __private_new<E>(error: E) -> Self
where
E: Into<BoxError>,
{
Expand Down
4 changes: 2 additions & 2 deletions axum/src/form.rs
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@ where
if req.method() == Method::GET {
let query = req.uri().query().unwrap_or_default();
let value = serde_urlencoded::from_str(query)
.map_err(FailedToDeserializeQueryString::__private_new::<T, _>)?;
.map_err(FailedToDeserializeQueryString::__private_new::<_>)?;
jplatte marked this conversation as resolved.
Show resolved Hide resolved
Ok(Form(value))
} else {
if !has_content_type(req, &mime::APPLICATION_WWW_FORM_URLENCODED) {
Expand All @@ -78,7 +78,7 @@ where

let bytes = Bytes::from_request(req).await?;
let value = serde_urlencoded::from_bytes(&bytes)
.map_err(FailedToDeserializeQueryString::__private_new::<T, _>)?;
.map_err(FailedToDeserializeQueryString::__private_new::<_>)?;

Ok(Form(value))
}
Expand Down