Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

wasi-http: don't count rejected fields in `FieldMap` size (#14707)

Roman Volosatovs01ac44b33708
diff --git a/crates/wasi-http/src/field_map.rs b/crates/wasi-http/src/field_map.rs
index de33d8ffb9..37c214755d 100644
--- a/crates/wasi-http/src/field_map.rs
+++ b/crates/wasi-http/src/field_map.rs
@@ -223,9 +223,11 @@ impl FieldMap {
} else {
*size + val_size
};
- update_size(size, limit, new_size)?;
+ if new_size > limit {
+ return Err(FieldMapError::TotalSizeTooBig);
+ }
let already_present = map.try_append(key, value)?;
- self.size = new_size;
+ *size = new_size;
Ok(already_present)
}
@@ -362,6 +364,7 @@ mod tests {
use super::{FieldMap, FieldMapError, parse_header_value};
use crate::default_hooks;
use http::header::{CONTENT_LENGTH, CONTENT_TYPE};
+ use http::{HeaderName, HeaderValue};
#[test]
fn test_immutable() {
@@ -447,6 +450,21 @@ mod tests {
Ok(())
}
+ #[test]
+ fn append_raw_too_many_fields_keeps_size() {
+ let mut map = FieldMap::new_mutable(usize::MAX);
+ let mut i = 0;
+ let err = loop {
+ let name = HeaderName::try_from(format!("foo{i}")).unwrap();
+ match map.append_raw(name, HeaderValue::from_static("bar")) {
+ Ok(_) => i += 1,
+ Err(e) => break e,
+ }
+ };
+ assert_eq!(err, FieldMapError::TooManyFields);
+ assert_eq!(map.size, FieldMap::content_size(&map));
+ }
+
#[test]
fn content_length_rejects_non_digits() {
assert!(parse_header_value(&CONTENT_LENGTH, b"0".to_vec()).is_ok());