hex/wstunnel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(http2): correctly extract host/authority from headers file

Browse source 
fix #230
This commit is contained in:
Σrebe - Romain GERARD 2024-02-15 20:31:04 +01:00
parent a07fd4911a
commit 3d23cf61e4
No known key found for this signature in database
GPG key ID: 7A42B4B97E0332F4
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/tunnel/transport/http2.rs
View file

@ -7,6 +7,7 @@ use http_body_util::{BodyExt, BodyStream, StreamBody};
use hyper::body::{Frame, Incoming}; use hyper::body::{Frame, Incoming};
use hyper::header::{AUTHORIZATION, CONTENT_TYPE, COOKIE}; use hyper::header::{AUTHORIZATION, CONTENT_TYPE, COOKIE};
use hyper::http::response::Parts; use hyper::http::response::Parts;
use hyper::http::HeaderName;
use hyper::Request; use hyper::Request;
use hyper_util::rt::{TokioExecutor, TokioIo, TokioTimer}; use hyper_util::rt::{TokioExecutor, TokioIo, TokioTimer};
use log::{debug, error, warn}; use log::{debug, error, warn};
@ -107,12 +108,27 @@ pub async fn connect(
Err(err) => Err(anyhow!("failed to get a connection to the server from the pool: {err:?}")), Err(err) => Err(anyhow!("failed to get a connection to the server from the pool: {err:?}")),
}?; }?;
// In http2 HOST header does not exist, it is explicitly set in the authority from the request uri
let (headers_file, authority) = if let Some(headers_file_path) = &client_cfg.http_headers_file {
let headers = headers_from_file(headers_file_path);
let host = headers
.iter()
.find(|(h, _)| h == HeaderName::from_static("HOST"))
.and_then(|(_, v)| v.to_str().ok())
.map(|v| v.to_string());
(Some(headers), host)
} else {
(None, None)
};
let mut req = Request::builder() let mut req = Request::builder()
.method("POST") .method("POST")
.uri(format!( .uri(format!(
"{}://{}/{}/events", "{}://{}/{}/events",
client_cfg.remote_addr.scheme(), client_cfg.remote_addr.scheme(),
client_cfg.http_header_host.to_str().unwrap(), authority.as_deref()
.unwrap_or(client_cfg.http_header_host.to_str().unwrap_or("")),
&client_cfg.http_upgrade_path_prefix &client_cfg.http_upgrade_path_prefix
)) ))
.header(COOKIE, tunnel_to_jwt_token(request_id, dest_addr)) .header(COOKIE, tunnel_to_jwt_token(request_id, dest_addr))
@ -130,8 +146,8 @@ pub async fn connect(
headers.append(AUTHORIZATION, auth.clone()); headers.append(AUTHORIZATION, auth.clone());
} }
if let Some(headers_file_path) = &client_cfg.http_headers_file { if let Some(headers_file) = headers_file {
for (k, v) in headers_from_file(headers_file_path) { for (k, v) in headers_file {
let _ = headers.remove(&k); let _ = headers.remove(&k);
headers.append(k, v); headers.append(k, v);
} }