Skip to content

wasi-http: Make the host header forbidden #7905

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
elliottt merged 2 commits into from
Feb 9, 2024
Merged

wasi-http: Make the host header forbidden #7905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f281f15
Add the host header to the set of forbidden headers
elliottt Feb 9, 2024
e7a8a6f
Test that the host header is forbidden
elliottt Feb 9, 2024
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
5 changes: 5 additions & 0 deletions crates/test-programs/src/bin/api_proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ impl bindings::exports::wasi::http::incoming_handler::Guest for T {
"append of forbidden header succeeded"
);

assert!(
!req_hdrs.has(&"host".to_owned()),
"forbidden host header present in incoming request"
);

let hdrs = bindings::wasi::http::types::Headers::new();
let resp = bindings::wasi::http::types::OutgoingResponse::new(hdrs);
let body = resp.body().expect("outgoing response");
Expand Down
5 changes: 5 additions & 0 deletions crates/test-programs/src/bin/http_outbound_request_invalid_header.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ fn main() {
Err(HeaderError::Forbidden)
));

assert!(matches!(
hdrs.append(&"Host".to_owned(), &b"example.com".to_vec()),
Err(HeaderError::Forbidden)
));

assert!(matches!(
hdrs.append(
&"custom-forbidden-header".to_owned(),
Expand Down
3 changes: 2 additions & 1 deletion crates/wasi-http/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ pub trait WasiHttpView: Send {

/// Returns `true` when the header is forbidden according to this [`WasiHttpView`] implementation.
pub(crate) fn is_forbidden_header(view: &mut dyn WasiHttpView, name: &HeaderName) -> bool {
static FORBIDDEN_HEADERS: [HeaderName; 9] = [
static FORBIDDEN_HEADERS: [HeaderName; 10] = [
hyper::header::CONNECTION,
HeaderName::from_static("keep-alive"),
hyper::header::PROXY_AUTHENTICATE,
Expand All @@ -86,6 +86,7 @@ pub(crate) fn is_forbidden_header(view: &mut dyn WasiHttpView, name: &HeaderName
hyper::header::TE,
hyper::header::TRANSFER_ENCODING,
hyper::header::UPGRADE,
hyper::header::HOST,
HeaderName::from_static("http2-settings"),
];

Expand Down