Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 1 deletion crates/turborepo-microfrontends-proxy/src/headers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ pub(crate) fn is_websocket_upgrade<T>(req: &Request<T>) -> bool {

#[cfg(test)]
mod tests {
use hyper::{Method, header::HeaderValue};
use hyper::{
Method,
header::{HOST, HeaderValue},
};

use super::*;

Expand Down
60 changes: 56 additions & 4 deletions crates/turborepo-microfrontends-proxy/src/websocket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::{
};

use dashmap::DashMap;
use hyper::{Request, Response, StatusCode, body::Incoming, upgrade::Upgraded};
use hyper::{Request, Response, StatusCode, body::Incoming, header::HOST, upgrade::Upgraded};
use hyper_util::rt::TokioIo;
use tokio::sync::broadcast;
use tokio_tungstenite::{WebSocketStream, tungstenite::protocol::Role};
Expand Down Expand Up @@ -102,8 +102,8 @@ async fn forward_websocket(
Ok(response)
}

fn prepare_websocket_request(
req: &mut Request<Incoming>,
fn prepare_websocket_request<T>(
req: &mut Request<T>,
port: u16,
remote_addr: SocketAddr,
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
Expand All @@ -119,7 +119,7 @@ fn prepare_websocket_request(
let original_host = validated_host_header(req)?.to_string();

let headers = req.headers_mut();
headers.insert("Host", format!("localhost:{port}").parse()?);
headers.insert(HOST, format!("localhost:{port}").parse()?);
headers.insert("X-Forwarded-For", remote_addr.ip().to_string().parse()?);
headers.insert("X-Forwarded-Proto", "http".parse()?);
headers.insert("X-Forwarded-Host", original_host.parse()?);
Expand Down Expand Up @@ -410,6 +410,7 @@ fn cleanup_websocket_connection(
mod tests {
use std::sync::atomic::AtomicUsize;

use hyper::header::HOST;
use tokio::sync::broadcast;

use super::*;
Expand Down Expand Up @@ -524,4 +525,55 @@ mod tests {
assert_eq!(*ids.first().unwrap(), 0);
assert_eq!(*ids.last().unwrap(), 9);
}

#[test]
fn test_prepare_websocket_request_uses_validated_host_header() {
let remote_addr = "127.0.0.1:12345".parse().unwrap();
let mut req = Request::builder()
.uri("/ws?token=1")
.header(HOST, "localhost:3024")
.body(())
.unwrap();

prepare_websocket_request(&mut req, 3000, remote_addr).unwrap();

assert_eq!(req.uri().to_string(), "http://localhost:3000/ws?token=1");
assert_eq!(
req.headers().get(HOST).and_then(|host| host.to_str().ok()),
Some("localhost:3000")
);
assert_eq!(
req.headers()
.get("X-Forwarded-Host")
.and_then(|host| host.to_str().ok()),
Some("localhost:3024")
);
}

#[test]
fn test_prepare_websocket_request_rejects_invalid_host_header() {
let remote_addr = "127.0.0.1:12345".parse().unwrap();
let mut req = Request::builder()
.uri("http://localhost:3024/ws")
.header(HOST, "example.com:3024")
.body(())
.unwrap();

let err = prepare_websocket_request(&mut req, 3000, remote_addr).unwrap_err();

assert!(err.to_string().contains("Invalid host header"));
}

#[test]
fn test_prepare_websocket_request_requires_host_header() {
let remote_addr = "127.0.0.1:12345".parse().unwrap();
let mut req = Request::builder()
.uri("http://localhost:3024/ws")
.body(())
.unwrap();

let err = prepare_websocket_request(&mut req, 3000, remote_addr).unwrap_err();

assert!(err.to_string().contains("Missing Host header"));
}
}
Loading