Skip to content

fix: fix RequestExt.payload() for content-type with charset #255

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

Merged
merged 2 commits into from
Jan 26, 2021
Merged

fix: fix RequestExt.payload() for content-type with charset #255

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3ee51f
fix: fix RequestExt.payload() for content-type with charset
nmoutschen Aug 24, 2020
48738dc
fix: cargo fmt
nmoutschen Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 55 additions & 6 deletions lambda-http/src/ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,19 @@ impl RequestExt for http::Request<Body> {
self.headers()
.get(http::header::CONTENT_TYPE)
.map(|ct| match ct.to_str() {
Ok("application/x-www-form-urlencoded") => serde_urlencoded::from_bytes::<D>(self.body().as_ref())
.map_err(PayloadError::WwwFormUrlEncoded)
.map(Some),
Ok("application/json") => serde_json::from_slice::<D>(self.body().as_ref())
.map_err(PayloadError::Json)
.map(Some),
Ok(content_type) => {
if content_type.starts_with("application/x-www-form-urlencoded") {
return serde_urlencoded::from_bytes::<D>(self.body().as_ref())
.map_err(PayloadError::WwwFormUrlEncoded)
.map(Some);
} else if content_type.starts_with("application/json") {
return serde_json::from_slice::<D>(self.body().as_ref())
.map_err(PayloadError::Json)
.map(Some);
}

Ok(None)
}
_ => Ok(None),
})
.unwrap_or_else(|| Ok(None))
Expand Down Expand Up @@ -326,6 +333,48 @@ mod tests {
);
}

#[test]
fn requests_match_form_post_content_type_with_charset() {
#[derive(Deserialize, PartialEq, Debug)]
struct Payload {
foo: String,
baz: usize,
}
let request = http::Request::builder()
.header("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
.body(Body::from("foo=bar&baz=2"))
.expect("failed to build request");
let payload: Option<Payload> = request.payload().unwrap_or_default();
assert_eq!(
payload,
Some(Payload {
foo: "bar".into(),
baz: 2
})
);
}

#[test]
fn requests_match_json_content_type_with_charset() {
#[derive(Deserialize, PartialEq, Debug)]
struct Payload {
foo: String,
baz: usize,
}
let request = http::Request::builder()
.header("Content-Type", "application/json; charset=UTF-8")
.body(Body::from(r#"{"foo":"bar", "baz": 2}"#))
.expect("failed to build request");
let payload: Option<Payload> = request.payload().unwrap_or_default();
assert_eq!(
payload,
Some(Payload {
foo: "bar".into(),
baz: 2
})
);
}

#[test]
fn requests_omiting_content_types_do_not_support_parseable_payloads() {
#[derive(Deserialize, PartialEq, Debug)]
Expand Down