Report invalid header names on start

Author: johansmitsnl

src/proxy.rs

@@ -6,15 +6,15 @@ use axum::{
         ws::{Message as MsgAxm, WebSocket, WebSocketUpgrade},
         Request, State,
     },
-    http::{HeaderName, Response, Uri},
+    http::{Response, Uri},
     routing::{any, get, Router},
     RequestExt,
 };
 use bytes::BytesMut;
 use futures_util::{sink::SinkExt, stream::StreamExt, TryStreamExt};
 use hyper::{header::HOST, HeaderMap};
 use reqwest::header::HeaderValue;
-use std::{collections::HashMap, str::FromStr, sync::Arc};
+use std::sync::Arc;
 use tokio_tungstenite::{
     connect_async,
     tungstenite::{protocol::CloseFrame, Message as MsgTng},
@@ -35,7 +35,7 @@ pub(crate) struct ProxyHandlerHttp {
     /// The URL of the backend to which requests are to be proxied.
     backend: Uri,
     /// The headers to inject with the request
-    request_headers: HashMap<String, String>,
+    request_headers: HeaderMap,
     /// An optional rewrite path to be used as the listening URI prefix, but which will be
     /// stripped before being sent to the proxy backend.
     rewrite: Option<String>,
@@ -107,7 +107,7 @@ impl ProxyHandlerHttp {
     pub fn new(
         client: reqwest::Client,
         backend: Uri,
-        request_headers: HashMap<String, String>,
+        request_headers: HeaderMap,
         rewrite: Option<String>,
     ) -> Arc<Self> {
         Arc::new(Self {
@@ -146,12 +146,9 @@ impl ProxyHandlerHttp {
 
         let mut headers = req.headers().clone();
         for (header_name, header_value) in state.request_headers.clone() {
-            headers.insert(
-                HeaderName::from_str(&header_name).context("Error building the header key")?,
-                header_value
-                    .parse()
-                    .context("Error building the header value")?,
-            );
+            if let Some(name) = header_name {
+                headers.insert(name, header_value);
+            }
         }
 
         let mut outbound_req = state

src/serve/mod.rs

@@ -16,6 +16,7 @@ use axum::response::{IntoResponse, Response};
 use axum::routing::{get, get_service, Router};
 use axum_server::Handle;
 use futures_util::FutureExt;
+use hyper::HeaderMap;
 use proxy::{ProxyBuilder, ProxyClientOptions};
 use std::collections::{BTreeSet, HashMap};
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
@@ -364,10 +365,20 @@ fn router(state: Arc<State>, cfg: Arc<RtcServe>) -> Result<Router> {
     // Build proxies
 
     for proxy in &cfg.proxies {
+        let mut request_headers = HeaderMap::new();
+        for (key, value) in &proxy.request_headers {
+            let name = HeaderName::from_bytes(key.as_bytes())
+                .with_context(|| format!("invalid header {:?}", key))?;
+            let value: HeaderValue = value
+                .parse()
+                .with_context(|| format!("invalid header value {:?} for header {}", value, name))?;
+            request_headers.insert(name, value);
+        }
+
         builder = builder.register_proxy(
             proxy.ws,
             &proxy.backend,
-            &proxy.request_headers,
+            &request_headers,
             proxy.rewrite.clone(),
             ProxyClientOptions {
                 insecure: proxy.insecure,

src/serve/proxy.rs

@@ -4,6 +4,7 @@ use anyhow::Context;
 use axum::http::Uri;
 use axum::Router;
 use console::Emoji;
+use hyper::HeaderMap;
 use reqwest::Client;
 use std::collections::hash_map::Entry;
 use std::collections::HashMap;
@@ -30,7 +31,7 @@ impl ProxyBuilder {
         mut self,
         ws: bool,
         backend: &Uri,
-        request_headers: &HashMap<String, String>,
+        request_headers: &HeaderMap,
         rewrite: Option<String>,
         opts: ProxyClientOptions,
     ) -> anyhow::Result<Self> {
@@ -57,7 +58,7 @@ impl ProxyBuilder {
                 &backend,
                 &request_headers
                     .iter()
-                    .map(|(header_name, header_value)| format!("{header_name}={header_value}"))
+                    .map(|(header_name, header_value)| format!("{header_name}={header_value:?}"))
                     .collect::<Vec<String>>()
                     .join(";"),
                 if no_sys_proxy {