berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

clarify comments for invalid json mime type

This commit is contained in:
Rob Ede 2023-11-19 11:07:53 +00:00
parent f7849d5e99
commit 925250370a
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
actix-web/src/types/json.rs
View File

@ -334,11 +334,13 @@ impl<T: DeserializeOwned> JsonBody<T> {
|| mime.suffix() == Some(mime::JSON) || mime.suffix() == Some(mime::JSON)
|| ctype_fn.map_or(false, |predicate| predicate(mime)) || ctype_fn.map_or(false, |predicate| predicate(mime))
} }
(_, _) => {
// if `ctype_required` is false, assume payload is // if content-type is expected but not parsable as mime type, bail
// json even when content-type header is missing (true, _) => false,
!ctype_required
} // if content-type validation is disabled, assume payload is JSON
// even when content-type header is missing or invalid mime type
(false, _) => true,
}; };
if !can_parse_json { if !can_parse_json {
@ -744,7 +746,7 @@ mod tests {
.to_http_parts(); .to_http_parts();
let s = Json::<MyObject>::from_request(&req, &mut pl).await; let s = Json::<MyObject>::from_request(&req, &mut pl).await;
assert!(s.is_ok()) assert!(s.is_ok());
} }
#[actix_rt::test] #[actix_rt::test]