mirror of
https://github.com/actix/actix-web.git
synced 2024-11-13 04:11:09 +00:00
fix: content type required flag (#3168)
* fix: content type required flag * clarify comments for invalid json mime type * remove pr reference --------- Co-authored-by: Rob Ede <robjtede@icloud.com>
This commit is contained in:
parent
e50bceb914
commit
9d1f75d349
2 changed files with 36 additions and 8 deletions
|
@ -6,6 +6,10 @@
|
|||
|
||||
- Updated `zstd` dependency to `0.13`.
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fix validation of `Json` extractor when `JsonConfig::validate_content_type()` is set to false.
|
||||
|
||||
## 4.4.0
|
||||
|
||||
### Added
|
||||
|
|
|
@ -328,14 +328,19 @@ impl<T: DeserializeOwned> JsonBody<T> {
|
|||
ctype_required: bool,
|
||||
) -> Self {
|
||||
// check content-type
|
||||
let can_parse_json = if let Ok(Some(mime)) = req.mime_type() {
|
||||
mime.subtype() == mime::JSON
|
||||
|| mime.suffix() == Some(mime::JSON)
|
||||
|| ctype_fn.map_or(false, |predicate| predicate(mime))
|
||||
} else {
|
||||
// if `ctype_required` is false, assume payload is
|
||||
// json even when content-type header is missing
|
||||
!ctype_required
|
||||
let can_parse_json = match (ctype_required, req.mime_type()) {
|
||||
(true, Ok(Some(mime))) => {
|
||||
mime.subtype() == mime::JSON
|
||||
|| mime.suffix() == Some(mime::JSON)
|
||||
|| ctype_fn.map_or(false, |predicate| predicate(mime))
|
||||
}
|
||||
|
||||
// if content-type is expected but not parsable as mime type, bail
|
||||
(true, _) => false,
|
||||
|
||||
// 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 {
|
||||
|
@ -725,6 +730,25 @@ mod tests {
|
|||
assert!(s.is_ok())
|
||||
}
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn test_json_ignoring_content_type() {
|
||||
let (req, mut pl) = TestRequest::default()
|
||||
.insert_header((
|
||||
header::CONTENT_LENGTH,
|
||||
header::HeaderValue::from_static("16"),
|
||||
))
|
||||
.insert_header((
|
||||
header::CONTENT_TYPE,
|
||||
header::HeaderValue::from_static("invalid/value"),
|
||||
))
|
||||
.set_payload(Bytes::from_static(b"{\"name\": \"test\"}"))
|
||||
.app_data(JsonConfig::default().content_type_required(false))
|
||||
.to_http_parts();
|
||||
|
||||
let s = Json::<MyObject>::from_request(&req, &mut pl).await;
|
||||
assert!(s.is_ok());
|
||||
}
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn test_with_config_in_data_wrapper() {
|
||||
let (req, mut pl) = TestRequest::default()
|
||||
|
|
Loading…
Reference in a new issue