Fix for Host header to domain matching where host is authority with port (#163)

Signed-off-by: Dawid Nowak <nowakd@gmail.com>

Author: dawid-nowak

orion-configuration/src/config/network_filters/http_connection_manager.rs

@@ -29,6 +29,7 @@ use http_filters::{FilterOverride, HttpFilter};
 use route::{Action, RouteMatch};
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, str::FromStr, time::Duration};
+use tracing::info;
 
 use crate::config::{
     common::*,
@@ -219,7 +220,12 @@ impl MatchHost {
     pub fn eval_lpm_request<B>(&self, req: &http::Request<B>) -> Option<MatchHostScoreLPM> {
         if let Some(header_value) = req.headers().get(http::header::HOST) {
             let host = header_value.to_str().ok()?;
-            self.eval_lpm_host(host)
+            if let Ok(authority) = http::uri::Authority::from_str(host) {
+                self.eval_lpm_host(authority.host())
+            } else {
+                info!("Host header value is not a valid authority ..{host}");
+                self.eval_lpm_host(host)
+            }
         } else {
             self.eval_lpm_host(req.uri().host()?)
         }

orion-lib/src/listeners/http_connection_manager.rs

@@ -1259,11 +1259,12 @@ mod tests {
         assert_eq!(select_virtual_host(&request, &[vh1.clone(), vh2.clone(), vh3.clone()]), Some(&vh3));
 
         let request = Request::builder().header("host", "blah.domain3.com:8000").body(()).unwrap();
-        assert_eq!(select_virtual_host(&request, &[vh1.clone(), vh2.clone(), vh3.clone()]), None);
+        assert_eq!(select_virtual_host(&request, &[vh1.clone(), vh2.clone(), vh3.clone()]), Some(&vh3));
 
         let request = Request::builder().header("host", "domain2.com:8000").body(()).unwrap();
-        assert_eq!(select_virtual_host(&request, &[vh1.clone(), vh2.clone(), vh3.clone()]), None);
+        assert_eq!(select_virtual_host(&request, &[vh1.clone(), vh2.clone(), vh3.clone()]), Some(&vh2));
 
+        // in theory this is an invalid domain...
         let domains2 = vec!["domain2.com:8000"].into_iter().flat_map(MatchHost::try_from).collect();
         let vh2 = VirtualHost { domains: domains2, ..Default::default() };
         let request = Request::builder().header("host", "domain2.com").body(()).unwrap();