wip

lychee-bin/Cargo.toml

@@ -55,6 +55,7 @@ tokio = { version = "1.41.0", features = ["full"] }
 tokio-stream = "0.1.16"
 toml = "0.8.19"
 url = "2.5.2"
+http-serde = "2.1.1"
 
 [dev-dependencies]
 assert_cmd = "2.0.16"

lychee-bin/src/options.rs

@@ -5,6 +5,7 @@ use anyhow::{anyhow, Context, Error, Result};
 use clap::builder::PossibleValuesParser;
 use clap::{arg, builder::TypedValueParser, Parser};
 use const_format::{concatcp, formatcp};
+use http::HeaderMap;
 use lychee_lib::{
     Base, BasicAuthSelector, Input, StatusCodeExcluder, StatusCodeSelector, DEFAULT_MAX_REDIRECTS,
     DEFAULT_MAX_RETRIES, DEFAULT_RETRY_WAIT_TIME_SECS, DEFAULT_TIMEOUT_SECS, DEFAULT_USER_AGENT,
@@ -195,7 +196,6 @@ impl LycheeOptions {
         } else {
             Some(self.config.exclude_path.clone())
         };
-        let headers = parse_headers(&self.config.header)?;
         self.raw_inputs
             .iter()
             .map(|s| {
@@ -204,7 +204,7 @@ impl LycheeOptions {
                     None,
                     self.config.glob_ignore_case,
                     excluded.clone(),
-                    headers.clone(),
+                    self.config.header.clone(),
                 )
             })
             .collect::<Result<_, _>>()
@@ -399,10 +399,13 @@ Example: --fallback-extensions html,htm,php,asp,aspx,jsp,cgi"
     )]
     pub(crate) fallback_extensions: Vec<String>,
 
-    /// Custom request header
-    #[arg(long)]
-    #[serde(default)]
-    pub(crate) header: Vec<String>,
+    /// Set custom header for requests
+    #[clap(
+        long = "header",
+        value_parser = parse_header,
+        number_of_values = 1
+    )]
+    pub header: Vec<HeaderMap>,
 
     /// A List of accepted status codes for valid links
     #[arg(

lychee-bin/src/parse.rs

@@ -1,5 +1,6 @@
 use anyhow::{anyhow, Context, Result};
 use headers::{HeaderMap, HeaderName};
+use http::HeaderValue;
 use lychee_lib::{remap::Remaps, Base};
 use std::time::Duration;
 
@@ -20,14 +21,25 @@ pub(crate) const fn parse_duration_secs(secs: usize) -> Duration {
     Duration::from_secs(secs as u64)
 }
 
-/// Parse HTTP headers into a `HeaderMap`
-pub(crate) fn parse_headers<T: AsRef<str>>(headers: &[T]) -> Result<HeaderMap> {
-    let mut out = HeaderMap::new();
-    for header in headers {
-        let (key, val) = read_header(header.as_ref())?;
-        out.insert(HeaderName::from_bytes(key.as_bytes())?, val.parse()?);
+/// Parse a header given in a string format into a `HeaderMap`
+///
+/// Headers are expected to be in format "key:value".
+fn parse_header(header: &str) -> Result<HeaderMap, String> {
+    let header: Vec<&str> = header.split(':').collect();
+    if header.len() != 2 {
+        return Err("Wrong header format (see --help for format)".to_string());
     }
-    Ok(out)
+
+    let (header_name, header_value) = (header[0], header[1]);
+
+    let hn = HeaderName::from_lowercase(header_name.trim().to_lowercase().as_bytes())
+        .map_err(|e| e.to_string())?;
+
+    let hv = HeaderValue::from_str(header_value.trim()).map_err(|e| e.to_string())?;
+
+    let mut map = HeaderMap::new();
+    map.insert(hn, hv);
+    Ok(map)
 }
 
 /// Parse URI remaps