Performance improvements on data types .

Cargo.lock

@@ -2478,6 +2478,7 @@ dependencies = [
  "bytes",
  "encoding_rs",
  "futures-core",
+ "futures-util",
  "h2",
  "http",
  "http-body",
@@ -2499,12 +2500,14 @@ dependencies = [
  "sync_wrapper",
  "tokio",
  "tokio-native-tls",
+ "tokio-util",
  "tower",
  "tower-http",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
+ "wasm-streams",
  "web-sys",
 ]
 
@@ -3499,6 +3502,19 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "wasm-streams"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.77"

Cargo.toml

@@ -26,7 +26,7 @@ futures = "0.3.31"
 notify = "8.2.0"
 axum = { version = "0.8.4" }
 axum-server = { version = "0.7.2", features = ["tls-openssl"] }
-reqwest = { version = "0.12.23", features = ["json", "native-tls-alpn"] }
+reqwest = { version = "0.12.23", features = ["json", "native-tls-alpn", "stream"] }
 #reqwest = { version = "0.12.15", features = ["json", "rustls-tls"] }
 #reqwest = { version = "0.12.15", default-features = false, features = ["rustls-tls", "json"] }
 

README.md

@@ -4,8 +4,12 @@
 
 # Aralez (Արալեզ),
 
-### **Reverse proxy and service mesh built on top of Cloudflare's Pingora**
+### **Reverse proxy built on top of Cloudflare's Pingora**
 
+Aralez is a high-performance Rust reverse proxy with zero-configuration automatic protocol handling, TLS, and upstream management,
+featuring Consul and Kubernetes integration for dynamic pod discovery and health-checked routing, acting as a lightweight ingress-style proxy.
+
+---
 What Aralez means ?
 **Aralez = Արալեզ** <ins>.Named after the legendary Armenian guardian spirit, winged dog-like creature, that descend upon fallen heroes to lick their wounds and resurrect them.</ins>.
 
@@ -187,7 +191,10 @@ provider: "file"
 sticky_sessions: false
 to_https: false
 rate_limit: 10
-headers:
+server_headers:
+  - "X-Forwarded-Proto:https"
+  - "X-Forwarded-Port:443"
+client_headers:
   - "Access-Control-Allow-Origin:*"
   - "Access-Control-Allow-Methods:POST, GET, OPTIONS"
   - "Access-Control-Max-Age:86400"
@@ -199,7 +206,10 @@ myhost.mydomain.com:
     "/":
       rate_limit: 20
       to_https: false
-      headers:
+      server_headers:
+        - "X-Something-Else:Foobar"
+        - "X-Another-Header:Hohohohoho"
+      client_headers:
         - "X-Some-Thing:Yaaaaaaaaaaaaaaa"
         - "X-Proxy-From:Hopaaaaaaaaaaaar"
       servers:
@@ -207,7 +217,7 @@ myhost.mydomain.com:
         - "127.0.0.2:8000"
     "/foo":
       to_https: true
-      headers:
+      client_headers:
         - "X-Another-Header:Hohohohoho"
       servers:
         - "127.0.0.4:8443"
@@ -222,6 +232,8 @@ myhost.mydomain.com:
 
 - Sticky sessions are disabled globally. This setting applies to all upstreams. If enabled all requests will be 301 redirected to HTTPS.
 - HTTP to HTTPS redirect disabled globally, but can be overridden by `to_https` setting per upstream.
+- All upstreams will receive custom headers : `X-Forwarded-Proto:https` and `X-Forwarded-Port:443`
+- Additionally, myhost.mydomain.com with path `/` will receive custom headers : `X-Another-Header:Hohohohoho` and `X-Something-Else:Foobar`
 - Requests to each hosted domains will be limited to 10 requests per second per virtualhost.
     - Requests limits are calculated per requester ip plus requested virtualhost.
     - If the requester exceeds the limit it will receive `429 Too Many Requests` error.
@@ -340,20 +352,33 @@ curl  -u username:password -H 'Host: myip.mydomain.com' http://127.0.0.1:6193/
 - Sticky session support.
 - HTTP2 ready.
 
-📊 Why Choose Aralez? – Feature Comparison
+### 🧩 Summary Table: Feature Comparison
 
-| Feature                    | **Aralez**                                                           | **Nginx**                | **HAProxy**             | **Traefik**     |
-|----------------------------|----------------------------------------------------------------------|--------------------------|-------------------------|-----------------|
-| **Hot Reload**             | ✅ Yes (live, API/file)                                               | ⚠️ Reloads config        | ⚠️ Reloads config       | ✅ Yes (dynamic) |
-| **JWT Auth**               | ✅ Built-in                                                           | ❌ External scripts       | ❌ External Lua or agent | ⚠️ With plugins |
-| **WebSocket Support**      | ✅ Automatic                                                          | ⚠️ Manual config         | ✅ Yes                   | ✅ Yes           |
-| **gRPC Support**           | ✅ Automatic (no config)                                              | ⚠️ Manual + HTTP/2 + TLS | ⚠️ Complex setup        | ✅ Native        |
-| **TLS Termination**        | ✅ Built-in (OpenSSL)                                                 | ✅ Yes                    | ✅ Yes                   | ✅ Yes           |
-| **TLS Upstream Detection** | ✅ Automatic                                                          | ❌                        | ❌                       | ❌               |
-| **HTTP/2 Support**         | ✅ Automatic                                                          | ⚠️ Requires extra config | ⚠️ Requires build flags | ✅ Native        |
-| **Sticky Sessions**        | ✅ Cookie-based                                                       | ⚠️ In plus version only  | ✅                       | ✅               |
-| **Prometheus Metrics**     | ✅ [Built in](https://github.com/sadoyan/aralez/blob/main/METRICS.md) | ⚠️ With Lua or exporter  | ⚠️ With external script | ✅ Native        |
-| **Built With**             | 🦀 Rust                                                              | C                        | C                       | Go              |
+| Feature / Proxy                  |    **Aralez**     |          **Nginx**          |    **HAProxy**    |           **Traefik**            |    **Caddy**    |    **Envoy**    |
+|----------------------------------|:-----------------:|:---------------------------:|:-----------------:|:--------------------------------:|:---------------:|:---------------:|
+| **Hot Reload (Zero Downtime)**   |  ✅ **Automatic**  | ⚙️ Manual (graceful reload) |     ⚙️ Manual     |           ✅ Automatic            |   ✅ Automatic   |   ✅ Automatic   |
+| **Auto Cert Reload (from disk)** |  ✅ **Automatic**  |            ❌ No             |       ❌ No        | ✅ Automatic (Let's Encrypt only) |   ✅ Automatic   |    ⚙️ Manual    |
+| **Auth: Basic / API Key / JWT**  |  ✅ **Built-in**   |        ⚙️ Basic only        |   ⚙️ Basic only   |          ✅ Config-based          | ✅ Config-based  | ✅ Config-based  |
+| **TLS / HTTP2 Termination**      |  ✅ **Automatic**  |      ⚙️ Manual config       | ⚙️ Manual config  |           ✅ Automatic            |   ✅ Automatic   |   ✅ Automatic   |
+| **Built-in A+ TLS Grades**       |  ✅ **Automatic**  |      ⚙️ Manual tuning       |     ⚙️ Manual     |            ⚙️ Manual             |   ✅ Automatic   |    ⚙️ Manual    |
+| **gRPC Proxy**                   | ✅ **Zero-Config** |       ⚙️ Manual setup       |     ⚙️ Manual     |         ⚙️ Needs config          | ⚙️ Needs config | ⚙️ Needs config |
+| **SSL Proxy**                    | ✅ **Zero-Config** |          ⚙️ Manual          |     ⚙️ Manual     |           ✅ Automatic            |   ✅ Automatic   |   ✅ Automatic   |
+| **HTTP/2 Proxy**                 | ✅ **Zero-Config** |      ⚙️ Manual enable       | ⚙️ Manual enable  |           ✅ Automatic            |   ✅ Automatic   |   ✅ Automatic   |
+| **WebSocket Proxy**              | ✅ **Zero-Config** |      ⚙️ Manual upgrade      | ⚙️ Manual upgrade |           ✅ Automatic            |   ✅ Automatic   |   ✅ Automatic   |
+| **Sticky Sessions**              |  ✅ **Built-in**   |       ⚙️ Config-based       |  ⚙️ Config-based  |           ✅ Automatic            |   ⚙️ Limited    | ✅ Config-based  |
+| **Prometheus Metrics**           |  ✅ **Built-in**   |    ⚙️ External exporter     |    ✅ Built-in     |            ✅ Built-in            |   ✅ Built-in    |   ✅ Built-in    |
+| **Consul Integration**           |     ✅ **Yes**     |            ❌ No             |  ⚙️ Via DNS only  |              ✅ Yes               |      ❌ No       |      ✅ Yes      |
+| **Kubernetes Integration**       |     ✅ **Yes**     |   ⚙️ Needs ingress setup    |    ⚙️ External    |              ✅ Yes               |   ⚙️ Limited    |      ✅ Yes      |
+| **Request Limiter**              |     ✅ **Yes**     |       ✅ Config-based        |  ✅ Config-based   |          ✅ Config-based          | ✅ Config-based  | ✅ Config-based  |
+| **Serve Static Files**           |     ✅ **Yes**     |            ✅ Yes            |     ⚙️ Basic      |           ✅ Automatic            |   ✅ Automatic   |      ❌ No       |
+| **Upstream Health Checks**       |  ✅ **Automatic**  |      ⚙️ Manual config       | ⚙️ Manual config  |           ✅ Automatic            |   ✅ Automatic   |   ✅ Automatic   |
+| **Built With**                   |    🦀 **Rust**    |              C              |         C         |                Go                |       Go        |       C++       |
+
+---
+
+✅ **Automatic / Zero-Config** – Works immediately, no setup required  
+⚙️ **Manual / Config-based** – Requires explicit configuration or modules  
+❌ **No** – Not supported
 
 ## 💡 Simple benchmark by [Oha](https://github.com/hatoo/oha)
 

etc/upstreams.yaml

@@ -3,11 +3,13 @@ provider: "file" # "file" "consul" "kubernetes"
 sticky_sessions: false
 to_https: false
 rate_limit: 100
-headers:
+server_headers:
+  - "X-Forwarded-Proto:https"
+  - "X-Forwarded-Port:443"
+client_headers:
   - "Access-Control-Allow-Origin:*"
   - "Access-Control-Allow-Methods:POST, GET, OPTIONS"
   - "Access-Control-Max-Age:86400"
-  - "Strict-Transport-Security:max-age=31536000; includeSubDomains; preload"
 #authorization:
 #  type: "jwt"
 #  creds: "910517d9-f9a1-48de-8826-dbadacbd84af-cb6f830e-ab16-47ec-9d8f-0090de732774"
@@ -21,38 +23,38 @@ consul:
     - "http://192.168.1.200:8500"
     - "http://192.168.1.201:8500"
   services: # hostname: The hostname to access the proxy server, upstream : The real service name in Consul database.
-    - hostname: "vt-webapi-service"
-      upstream: "vt-webapi-service-health"
+    - hostname: "webapi-service"
+      upstream: "webapi-service-health"
       path: "/one"
-      headers:
+      client_headers:
         - "X-Some-Thing:Yaaaaaaaaaaaaaaa"
         - "X-Proxy-From:Aralez"
       rate_limit: 1
       to_https: false
-    - hostname: "vt-webapi-service"
-      upstream: "vt-webapi-service-health"
+    - hostname: "webapi-service"
+      upstream: "webapi-service-health"
       path: "/"
   token: "8e2db809-845b-45e1-8b47-2c8356a09da0-a4370955-18c2-4d6e-a8f8-ffcc0b47be81" # Consul server access token, If Consul auth is enabled
 kubernetes:
   servers:
     - "192.168.1.55:443" #For testing only, overrides with KUBERNETES_SERVICE_HOST : KUBERNETES_SERVICE_PORT_HTTPS env variables.
   services:
-    - hostname: "vt-webapi-service"
+    - hostname: "webapi-service"
       path: "/"
-      upstream: "vt-webapi-service"
-    - hostname: "vt-webapi-service"
+      upstream: "webapi-service"
+    - hostname: "webapi-service"
       upstream: "vt-console-service"
       path: "/one"
-      headers:
+      client_headers:
         - "X-Some-Thing:Yaaaaaaaaaaaaaaa"
         - "X-Proxy-From:Aralez"
       rate_limit: 100
       to_https: false
-    - hostname: "vt-webapi-service"
+    - hostname: "webapi-service"
       upstream: "vt-rambulik-service"
       path: "/two"
-    - hostname: "vt-websocket-service"
-      upstream: "vt-websocket-service"
+    - hostname: "websocket-service"
+      upstream: "websocket-service"
       path: "/"
   tokenpath: "/path/to/kubetoken.txt" #If not set, will default to /var/run/secrets/kubernetes.io/serviceaccount/token
 upstreams:
@@ -61,7 +63,7 @@ upstreams:
       "/":
         rate_limit: 200
         to_https: false
-        headers:
+        client_headers:
           - "X-Proxy-From:Aralez"
         servers:
           - "127.0.0.1:8000"
@@ -71,7 +73,10 @@ upstreams:
           - "127.0.0.5:8000"
       "/ping":
         to_https: false
-        headers:
+        server_headers:
+          - "X-Forwarded-Proto:https"
+          - "X-Forwarded-Port:443"
+        client_headers:
           - "X-Some-Thing:Yaaaaaaaaaaaaaaa"
           - "X-Proxy-From:Aralez"
         servers:
@@ -84,7 +89,7 @@ upstreams:
     paths:
       "/":
         to_https: false
-        headers:
+        client_headers:
           - "X-Some-Thing:Yaaaaaaaaaaaaaaa"
         servers:
           - "192.168.1.1:8000"

src/utils.rs

@@ -1,11 +1,10 @@
 pub mod auth;
-pub mod consul;
 pub mod discovery;
 pub mod dnsclient;
 mod filewatch;
 pub mod healthcheck;
+pub mod httpclient;
 pub mod jwt;
-pub mod kuber;
 pub mod kuberconsul;
 pub mod metrics;
 pub mod parceyaml;
@@ -13,3 +12,4 @@ pub mod state;
 pub mod structs;
 pub mod tls;
 pub mod tools;
+// pub mod watchksecret;

src/utils/auth.rs

@@ -40,16 +40,6 @@ impl AuthValidator for JwtAuth<'_> {
         if let Some(tok) = get_query_param(session, "araleztoken") {
             return check_jwt(tok.as_str(), jwtsecret);
         }
-
-        // if let Some(header) = session.get_header("authorization") {
-        //     let h = header.to_str().ok().unwrap().split(" ").collect::<Vec<_>>();
-        //     match h.len() {
-        //         n => {
-        //             return check_jwt(h[n - 1], jwtsecret);
-        //         }
-        //     }
-        // }
-
         if let Some(auth_header) = session.get_header("authorization") {
             if let Ok(header_str) = auth_header.to_str() {
                 if let Some((scheme, token)) = header_str.split_once(' ') {

src/utils/consul.rs

@@ -1,119 +0,0 @@
-use crate::utils::kuberconsul::{list_to_upstreams, match_path};
-use crate::utils::parceyaml::build_headers;
-use crate::utils::structs::{Configuration, InnerMap, ServiceMapping, UpstreamsDashMap};
-use crate::utils::tools::{clone_dashmap_into, compare_dashmaps, print_upstreams};
-use dashmap::DashMap;
-use futures::channel::mpsc::Sender;
-use futures::SinkExt;
-use pingora::prelude::sleep;
-use rand::Rng;
-use reqwest::header::{HeaderMap, HeaderValue};
-use reqwest::Client;
-use serde::Deserialize;
-use std::collections::HashMap;
-use std::env;
-use std::sync::atomic::AtomicUsize;
-use std::sync::Arc;
-use std::time::Duration;
-
-#[derive(Debug, Deserialize)]
-struct Service {
-    #[serde(rename = "ServiceTaggedAddresses")]
-    tagged_addresses: HashMap<String, TaggedAddress>,
-}
-
-#[derive(Debug, Deserialize)]
-struct TaggedAddress {
-    #[serde(rename = "Address")]
-    address: String,
-    #[serde(rename = "Port")]
-    port: u16,
-}
-
-pub async fn start(mut toreturn: Sender<Configuration>, config: Arc<Configuration>) {
-    let prev_upstreams = UpstreamsDashMap::new();
-    loop {
-        if let Some(consul) = config.consul.clone() {
-            let servers = consul.servers.unwrap_or(vec![format!(
-                "{}:{}",
-                env::var("CONSUL_SERVICE_HOST").unwrap_or("0.0.0.0".to_string()),
-                env::var("CONSUL_SERVICE_PORT").unwrap_or("0".to_string())
-            )]);
-            let end = servers.len() - 1;
-            let upstreams = UpstreamsDashMap::new();
-            let mut num = 0;
-            if end > 0 {
-                num = rand::rng().random_range(0..end);
-            }
-            let consul_data = servers.get(num).unwrap().to_string();
-            let ss = consul_data + "/v1/catalog/service/";
-            if let Some(ref svc) = consul.services {
-                for i in svc {
-                    let header_list = DashMap::new();
-                    let mut hl = Vec::new();
-                    build_headers(&i.headers, config.as_ref(), &mut hl);
-                    if hl.len() > 0 {
-                        header_list.insert(i.path.clone().unwrap_or("/".to_string()), hl);
-                        config.headers.insert(i.hostname.clone(), header_list);
-                    }
-                    let pref: String = ss.clone() + &i.upstream;
-                    let list = get_by_http(pref, consul.token.clone(), &i).await;
-                    list_to_upstreams(list, &upstreams, &i);
-                }
-            }
-            if !compare_dashmaps(&upstreams, &prev_upstreams) {
-                let mut tosend: Configuration = Configuration {
-                    upstreams: Default::default(),
-                    headers: Default::default(),
-                    consul: None,
-                    kubernetes: None,
-                    typecfg: "".to_string(),
-                    extraparams: config.extraparams.clone(),
-                };
-
-                clone_dashmap_into(&upstreams, &prev_upstreams);
-                clone_dashmap_into(&upstreams, &tosend.upstreams);
-                tosend.headers = config.headers.clone();
-                tosend.extraparams.authentication = config.extraparams.authentication.clone();
-                tosend.typecfg = config.typecfg.clone();
-                tosend.consul = config.consul.clone();
-                print_upstreams(&tosend.upstreams);
-                toreturn.send(tosend).await.unwrap();
-            }
-        }
-        sleep(Duration::from_secs(5)).await;
-    }
-}
-
-async fn get_by_http(url: String, token: Option<String>, conf: &ServiceMapping) -> Option<DashMap<String, (Vec<InnerMap>, AtomicUsize)>> {
-    let client = Client::builder().timeout(Duration::from_secs(2)).danger_accept_invalid_certs(true).build().ok()?;
-    let mut headers = HeaderMap::new();
-    if let Some(token) = token {
-        headers.insert("X-Consul-Token", HeaderValue::from_str(&token).unwrap());
-    }
-    let to = Duration::from_secs(1);
-    let resp = client.get(url).timeout(to).send().await.ok()?;
-    if !resp.status().is_success() {
-        eprintln!("Consul API returned status: {}", resp.status());
-        return None;
-    }
-    let mut inner_vec = Vec::new();
-    let upstreams: DashMap<String, (Vec<InnerMap>, AtomicUsize)> = DashMap::new();
-    let endpoints: Vec<Service> = resp.json().await.ok()?;
-    for subsets in endpoints {
-        let addr = subsets.tagged_addresses.get("lan_ipv4").unwrap().address.clone();
-        let prt = subsets.tagged_addresses.get("lan_ipv4").unwrap().port.clone();
-        let to_add = InnerMap {
-            address: addr,
-            port: prt,
-            is_ssl: false,
-            is_http2: false,
-            to_https: conf.to_https.unwrap_or(false),
-            rate_limit: conf.rate_limit,
-            healthcheck: None,
-        };
-        inner_vec.push(to_add);
-    }
-    match_path(&conf, &upstreams, inner_vec.clone());
-    Some(upstreams)
-}

src/utils/discovery.rs

@@ -1,6 +1,6 @@
 use crate::utils::filewatch;
+use crate::utils::kuberconsul::{ConsulDiscovery, KubernetesDiscovery, ServiceDiscovery};
 use crate::utils::structs::Configuration;
-use crate::utils::{consul, kuber};
 use crate::web::webserver;
 use async_trait::async_trait;
 use futures::channel::mpsc::Sender;
@@ -51,13 +51,13 @@ impl Discovery for FromFileProvider {
 #[async_trait]
 impl Discovery for ConsulProvider {
     async fn start(&self, tx: Sender<Configuration>) {
-        tokio::spawn(consul::start(tx.clone(), self.config.clone()));
+        tokio::spawn(ConsulDiscovery.fetch_upstreams(self.config.clone(), tx));
     }
 }
 
 #[async_trait]
 impl Discovery for KubernetesProvider {
     async fn start(&self, tx: Sender<Configuration>) {
-        tokio::spawn(kuber::start(tx.clone(), self.config.clone()));
+        tokio::spawn(KubernetesDiscovery.fetch_upstreams(self.config.clone(), tx));
     }
 }

src/utils/healthcheck.rs

@@ -46,7 +46,7 @@ async fn build_upstreams(fullist: &UpstreamsDashMap, method: &str, client: &Clie
             let mut innervec = Vec::new();
 
             for (_, upstream) in path_entry.value().0.iter().enumerate() {
-                let tls = detect_tls(upstream.address.as_str(), &upstream.port, &client).await;
+                let tls = detect_tls(&upstream.address.to_string(), &upstream.port, &client).await;
                 let is_h2 = matches!(tls.1, Some(Version::HTTP_2));
 
                 let link = if tls.0 {
@@ -71,23 +71,13 @@ async fn build_upstreams(fullist: &UpstreamsDashMap, method: &str, client: &Clie
                         if resp.1 {
                             scheme.is_http2 = is_h2; // could be adjusted further
                         }
-                        innervec.push(scheme);
+                        innervec.push(Arc::from(scheme));
                     } else {
                         warn!("Dead Upstream : {}", link);
                     }
                 } else {
-                    innervec.push(scheme);
+                    innervec.push(Arc::from(scheme));
                 }
-
-                // let resp = http_request(&link, method, "", &client).await;
-                // if resp.0 {
-                //     if resp.1 {
-                //         scheme.is_http2 = is_h2; // could be adjusted further
-                //     }
-                //     innervec.push(scheme);
-                // } else {
-                //     warn!("Dead Upstream : {}", link);
-                // }
             }
             inner.insert(path.clone(), (innervec, AtomicUsize::new(0)));
         }

src/utils/httpclient.rs

@@ -0,0 +1,78 @@
+use crate::utils::kuberconsul::{match_path, ConsulService, KubeEndpoints};
+use crate::utils::structs::{InnerMap, ServiceMapping};
+use axum::http::{HeaderMap, HeaderValue};
+use dashmap::DashMap;
+use reqwest::Client;
+use std::sync::atomic::AtomicUsize;
+use std::sync::Arc;
+use std::time::Duration;
+
+pub async fn for_consul(url: String, token: Option<String>, conf: &ServiceMapping) -> Option<DashMap<String, (Vec<Arc<InnerMap>>, AtomicUsize)>> {
+    let client = Client::builder().timeout(Duration::from_secs(2)).danger_accept_invalid_certs(true).build().ok()?;
+    let mut headers = HeaderMap::new();
+    if let Some(token) = token {
+        headers.insert("X-Consul-Token", HeaderValue::from_str(&token).unwrap());
+    }
+    let to = Duration::from_secs(1);
+    let resp = client.get(url).timeout(to).send().await.ok()?;
+    if !resp.status().is_success() {
+        eprintln!("Consul API returned status: {}", resp.status());
+        return None;
+    }
+    let mut inner_vec = Vec::new();
+    let upstreams: DashMap<String, (Vec<Arc<InnerMap>>, AtomicUsize)> = DashMap::new();
+    let endpoints: Vec<ConsulService> = resp.json().await.ok()?;
+    for subsets in endpoints {
+        // let addr = subsets.tagged_addresses.get("lan_ipv4").unwrap().address.clone();
+        // let prt = subsets.tagged_addresses.get("lan_ipv4").unwrap().port.clone();
+        let addr = subsets.tagged_addresses.get("lan_ipv4").unwrap().address.clone().parse().unwrap();
+        let prt = subsets.tagged_addresses.get("lan_ipv4").unwrap().port.clone();
+        let to_add = Arc::from(InnerMap {
+            address: addr,
+            port: prt,
+            is_ssl: false,
+            is_http2: false,
+            to_https: conf.to_https.unwrap_or(false),
+            rate_limit: conf.rate_limit,
+            healthcheck: None,
+        });
+        inner_vec.push(to_add);
+    }
+    match_path(&conf, &upstreams, inner_vec.clone());
+    Some(upstreams)
+}
+
+pub async fn for_kuber(url: &str, token: &str, conf: &ServiceMapping) -> Option<DashMap<String, (Vec<Arc<InnerMap>>, AtomicUsize)>> {
+    let to = Duration::from_secs(10);
+    let client = Client::builder().timeout(Duration::from_secs(10)).danger_accept_invalid_certs(true).build().ok()?;
+    let resp = client.get(url).timeout(to).bearer_auth(token).send().await.ok()?;
+    if !resp.status().is_success() {
+        eprintln!("Kubernetes API returned status: {}", resp.status());
+        return None;
+    }
+    let endpoints: KubeEndpoints = resp.json().await.ok()?;
+    let upstreams: DashMap<String, (Vec<Arc<InnerMap>>, AtomicUsize)> = DashMap::new();
+    if let Some(subsets) = endpoints.subsets {
+        for subset in subsets {
+            if let (Some(addresses), Some(ports)) = (subset.addresses, subset.ports) {
+                let mut inner_vec = Vec::new();
+                for addr in addresses {
+                    for port in &ports {
+                        let to_add = Arc::from(InnerMap {
+                            address: addr.ip.parse().unwrap(),
+                            port: port.port.clone(),
+                            is_ssl: false,
+                            is_http2: false,
+                            to_https: conf.to_https.unwrap_or(false),
+                            rate_limit: conf.rate_limit,
+                            healthcheck: None,
+                        });
+                        inner_vec.push(to_add);
+                    }
+                }
+                match_path(&conf, &upstreams, inner_vec.clone());
+            }
+        }
+    }
+    Some(upstreams)
+}

src/utils/kuber.rs

@@ -1,133 +0,0 @@
-use crate::utils::kuberconsul::{list_to_upstreams, match_path};
-use crate::utils::parceyaml::build_headers;
-use crate::utils::structs::{Configuration, InnerMap, ServiceMapping, UpstreamsDashMap};
-use crate::utils::tools::{clone_dashmap_into, compare_dashmaps, print_upstreams};
-use dashmap::DashMap;
-use futures::channel::mpsc::Sender;
-use futures::SinkExt;
-use pingora::prelude::sleep;
-use rand::Rng;
-use reqwest::Client;
-use std::env;
-use std::sync::atomic::AtomicUsize;
-use std::sync::Arc;
-use std::time::Duration;
-use tokio::fs::File;
-use tokio::io::AsyncReadExt;
-
-#[derive(Debug, serde::Deserialize)]
-struct Endpoints {
-    subsets: Option<Vec<Subset>>,
-}
-
-#[derive(Debug, serde::Deserialize)]
-struct Subset {
-    addresses: Option<Vec<Address>>,
-    ports: Option<Vec<Port>>,
-}
-
-#[derive(Debug, serde::Deserialize)]
-struct Address {
-    ip: String,
-}
-
-#[derive(Debug, serde::Deserialize)]
-struct Port {
-    port: u16,
-}
-
-pub async fn start(mut toreturn: Sender<Configuration>, config: Arc<Configuration>) {
-    let prev_upstreams = UpstreamsDashMap::new();
-    loop {
-        if let Some(kuber) = config.kubernetes.clone() {
-            let upstreams = UpstreamsDashMap::new();
-            let path = kuber.tokenpath.unwrap_or("/var/run/secrets/kubernetes.io/serviceaccount/token".to_string());
-            let token = read_token(path.as_str()).await;
-            let servers = kuber.servers.unwrap_or(vec![format!(
-                "{}:{}",
-                env::var("KUBERNETES_SERVICE_HOST").unwrap_or("0.0.0.0".to_string()),
-                env::var("KUBERNETES_SERVICE_PORT_HTTPS").unwrap_or("0".to_string())
-            )]);
-            let end = servers.len() - 1;
-            let mut num = 0;
-            if end > 0 {
-                num = rand::rng().random_range(0..end);
-            }
-
-            let server = servers.get(num).unwrap().to_string();
-            if let Some(svc) = kuber.services {
-                for i in svc {
-                    let header_list = DashMap::new();
-
-                    let mut hl = Vec::new();
-                    build_headers(&i.headers, config.as_ref(), &mut hl);
-                    if hl.len() > 0 {
-                        header_list.insert(i.path.clone().unwrap_or("/".to_string()), hl);
-                        config.headers.insert(i.hostname.clone(), header_list);
-                    }
-                    let url = format!("https://{}/api/v1/namespaces/staging/endpoints/{}", server, i.hostname);
-                    let list = get_by_http(&*url, &*token, &i).await;
-                    list_to_upstreams(list, &upstreams, &i);
-                }
-            }
-
-            if !compare_dashmaps(&upstreams, &prev_upstreams) {
-                let tosend: Configuration = Configuration {
-                    upstreams: Default::default(),
-                    headers: config.headers.clone(),
-                    consul: config.consul.clone(),
-                    kubernetes: config.kubernetes.clone(),
-                    typecfg: config.typecfg.clone(),
-                    extraparams: config.extraparams.clone(),
-                };
-                clone_dashmap_into(&upstreams, &prev_upstreams);
-                clone_dashmap_into(&upstreams, &tosend.upstreams);
-                print_upstreams(&tosend.upstreams);
-                toreturn.send(tosend).await.unwrap();
-            }
-        }
-        sleep(Duration::from_secs(5)).await;
-    }
-}
-
-pub async fn get_by_http(url: &str, token: &str, conf: &ServiceMapping) -> Option<DashMap<String, (Vec<InnerMap>, AtomicUsize)>> {
-    let client = Client::builder().timeout(Duration::from_secs(2)).danger_accept_invalid_certs(true).build().ok()?;
-    let to = Duration::from_secs(1);
-    let resp = client.get(url).timeout(to).bearer_auth(token).send().await.ok()?;
-    if !resp.status().is_success() {
-        eprintln!("Kubernetes API returned status: {}", resp.status());
-        return None;
-    }
-    let endpoints: Endpoints = resp.json().await.ok()?;
-    let upstreams: DashMap<String, (Vec<InnerMap>, AtomicUsize)> = DashMap::new();
-    if let Some(subsets) = endpoints.subsets {
-        for subset in subsets {
-            if let (Some(addresses), Some(ports)) = (subset.addresses, subset.ports) {
-                let mut inner_vec = Vec::new();
-                for addr in addresses {
-                    for port in &ports {
-                        let to_add = InnerMap {
-                            address: addr.ip.clone(),
-                            port: port.port.clone(),
-                            is_ssl: false,
-                            is_http2: false,
-                            to_https: conf.to_https.unwrap_or(false),
-                            rate_limit: conf.rate_limit,
-                            healthcheck: None,
-                        };
-                        inner_vec.push(to_add);
-                    }
-                }
-                match_path(&conf, &upstreams, inner_vec.clone());
-            }
-        }
-    }
-    Some(upstreams)
-}
-
-async fn read_token(path: &str) -> String {
-    let mut file = File::open(path).await.unwrap();
-    let mut contents = String::new();
-    file.read_to_string(&mut contents).await.unwrap();
-    contents.trim().to_string()
-}

src/utils/kuberconsul.rs

@@ -1,8 +1,58 @@
-use crate::utils::structs::{InnerMap, ServiceMapping, UpstreamsDashMap};
+use crate::utils::httpclient;
+use crate::utils::parceyaml::build_headers;
+use crate::utils::structs::{Configuration, InnerMap, ServiceMapping, UpstreamsDashMap};
+use crate::utils::tools::{clone_dashmap_into, compare_dashmaps, print_upstreams};
+use async_trait::async_trait;
 use dashmap::DashMap;
+use futures::channel::mpsc::Sender;
+use futures::SinkExt;
+use pingora::prelude::sleep;
+use rand::Rng;
+use serde::Deserialize;
+use std::collections::HashMap;
+use std::env;
+use std::fs;
+use std::path::Path;
 use std::sync::atomic::AtomicUsize;
+use std::sync::Arc;
+use std::time::Duration;
+use tokio::fs::File;
+use tokio::io::AsyncReadExt;
 
-pub fn list_to_upstreams(lt: Option<DashMap<String, (Vec<InnerMap>, AtomicUsize)>>, upstreams: &UpstreamsDashMap, i: &ServiceMapping) {
+#[derive(Debug, serde::Deserialize)]
+pub struct KubeEndpoints {
+    pub subsets: Option<Vec<KubeSubset>>,
+}
+#[derive(Debug, serde::Deserialize)]
+pub struct KubeSubset {
+    pub addresses: Option<Vec<KubeAddress>>,
+    pub ports: Option<Vec<KubePort>>,
+}
+
+#[derive(Debug, serde::Deserialize)]
+pub struct KubeAddress {
+    pub ip: String,
+}
+
+#[derive(Debug, serde::Deserialize)]
+pub struct KubePort {
+    pub port: u16,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct ConsulService {
+    #[serde(rename = "ServiceTaggedAddresses")]
+    pub tagged_addresses: HashMap<String, ConsulTaggedAddress>,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct ConsulTaggedAddress {
+    #[serde(rename = "Address")]
+    pub address: String,
+    #[serde(rename = "Port")]
+    pub port: u16,
+}
+pub fn list_to_upstreams(lt: Option<DashMap<String, (Vec<Arc<InnerMap>>, AtomicUsize)>>, upstreams: &UpstreamsDashMap, i: &ServiceMapping) {
     if let Some(list) = lt {
         match upstreams.get(&i.hostname.clone()) {
             Some(upstr) => {
@@ -17,7 +67,7 @@ pub fn list_to_upstreams(lt: Option<DashMap<String, (Vec<InnerMap>, AtomicUsize)
     }
 }
 
-pub fn match_path(conf: &ServiceMapping, upstreams: &DashMap<String, (Vec<InnerMap>, AtomicUsize)>, values: Vec<InnerMap>) {
+pub fn match_path(conf: &ServiceMapping, upstreams: &DashMap<String, (Vec<Arc<InnerMap>>, AtomicUsize)>, values: Vec<Arc<InnerMap>>) {
     match conf.path {
         Some(ref p) => {
             upstreams.insert(p.to_string(), (values, AtomicUsize::new(0)));
@@ -27,3 +77,150 @@ pub fn match_path(conf: &ServiceMapping, upstreams: &DashMap<String, (Vec<InnerM
         }
     }
 }
+
+async fn read_token(path: &str) -> String {
+    let mut file = File::open(path).await.unwrap();
+    let mut contents = String::new();
+    file.read_to_string(&mut contents).await.unwrap();
+    contents.trim().to_string()
+}
+#[async_trait]
+pub trait ServiceDiscovery {
+    async fn fetch_upstreams(&self, config: Arc<Configuration>, toreturn: Sender<Configuration>);
+}
+
+pub struct KubernetesDiscovery;
+pub struct ConsulDiscovery;
+
+#[async_trait]
+impl ServiceDiscovery for KubernetesDiscovery {
+    async fn fetch_upstreams(&self, config: Arc<Configuration>, mut toreturn: Sender<Configuration>) {
+        let prev_upstreams = UpstreamsDashMap::new();
+
+        if let Some(kuber) = config.kubernetes.clone() {
+            let servers = kuber.servers.unwrap_or(vec![format!(
+                "{}:{}",
+                env::var("KUBERNETES_SERVICE_HOST").unwrap_or("0.0.0.0".to_string()),
+                env::var("KUBERNETES_SERVICE_PORT_HTTPS").unwrap_or("0".to_string())
+            )]);
+
+            let end = servers.len().saturating_sub(1);
+            let num = if end > 0 { rand::rng().random_range(0..end) } else { 0 };
+            let server = servers.get(num).unwrap().to_string();
+            let path = kuber.tokenpath.unwrap_or("/var/run/secrets/kubernetes.io/serviceaccount/token".to_string());
+            let namespace = get_current_namespace().unwrap_or_else(|| "default".to_string());
+            let token = read_token(path.as_str()).await;
+            loop {
+                let upstreams = UpstreamsDashMap::new();
+                if let Some(kuber) = config.kubernetes.clone() {
+                    if let Some(svc) = kuber.services {
+                        for i in svc {
+                            let header_list: DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>> = DashMap::new();
+                            let mut hl = Vec::new();
+                            build_headers(&i.client_headers, config.as_ref(), &mut hl);
+                            if !hl.is_empty() {
+                                match i.path.clone() {
+                                    Some(path) => {
+                                        header_list.insert(Arc::from(path.as_str()), hl);
+                                    }
+                                    None => {
+                                        header_list.insert(Arc::from("/"), hl);
+                                    }
+                                }
+
+                                // header_list.insert(Arc::from(path.as_str()), hl);
+                                // header_list.insert(Arc::from(i.path).unwrap_or(Arc::from("/")).as_str(), hl);
+                                config.client_headers.insert(i.hostname.clone(), header_list);
+                            }
+                            let url = format!("https://{}/api/v1/namespaces/{}/endpoints/{}", server, namespace, i.hostname);
+                            let list = httpclient::for_kuber(&*url, &*token, &i).await;
+                            list_to_upstreams(list, &upstreams, &i);
+                        }
+                    }
+                    if let Some(lt) = clone_compare(&upstreams, &prev_upstreams, &config).await {
+                        toreturn.send(lt).await.unwrap();
+                    }
+                }
+                sleep(Duration::from_secs(5)).await;
+            }
+        }
+    }
+}
+
+fn get_current_namespace() -> Option<String> {
+    let ns_path = "/var/run/secrets/kubernetes.io/serviceaccount/namespace";
+    if Path::new(ns_path).exists() {
+        if let Ok(contents) = fs::read_to_string(ns_path) {
+            return Some(contents.trim().to_string());
+        }
+    }
+    std::env::var("POD_NAMESPACE").ok()
+}
+
+#[async_trait]
+impl ServiceDiscovery for ConsulDiscovery {
+    async fn fetch_upstreams(&self, config: Arc<Configuration>, mut toreturn: Sender<Configuration>) {
+        let prev_upstreams = UpstreamsDashMap::new();
+        loop {
+            let upstreams = UpstreamsDashMap::new();
+
+            if let Some(consul) = config.consul.clone() {
+                let servers = consul.servers.unwrap_or(vec![format!(
+                    "{}:{}",
+                    env::var("CONSUL_SERVICE_HOST").unwrap_or("0.0.0.0".to_string()),
+                    env::var("CONSUL_SERVICE_PORT").unwrap_or("0".to_string())
+                )]);
+                let end = servers.len().saturating_sub(1);
+                let num = if end > 0 { rand::rng().random_range(0..end) } else { 0 };
+                let consul_data = servers.get(num).unwrap().to_string();
+                let ss = consul_data + "/v1/catalog/service/";
+
+                if let Some(svc) = consul.services {
+                    for i in svc {
+                        let header_list = DashMap::new();
+                        let mut hl = Vec::new();
+                        build_headers(&i.client_headers, config.as_ref(), &mut hl);
+                        if !hl.is_empty() {
+                            match i.path.clone() {
+                                Some(path) => {
+                                    header_list.insert(Arc::from(path.as_str()), hl);
+                                }
+                                None => {
+                                    header_list.insert(Arc::from("/"), hl);
+                                }
+                            }
+                            // header_list.insert(i.path.clone().unwrap_or("/".to_string()), hl);
+                            config.client_headers.insert(i.hostname.clone(), header_list);
+                        }
+
+                        let pref = ss.clone() + &i.upstream;
+                        let list = httpclient::for_consul(pref, consul.token.clone(), &i).await;
+                        list_to_upstreams(list, &upstreams, &i);
+                    }
+                }
+            }
+            if let Some(lt) = clone_compare(&upstreams, &prev_upstreams, &config).await {
+                toreturn.send(lt).await.unwrap();
+            }
+            sleep(Duration::from_secs(5)).await;
+        }
+    }
+}
+async fn clone_compare(upstreams: &UpstreamsDashMap, prev_upstreams: &UpstreamsDashMap, config: &Arc<Configuration>) -> Option<Configuration> {
+    if !compare_dashmaps(&upstreams, &prev_upstreams) {
+        let tosend: Configuration = Configuration {
+            upstreams: Default::default(),
+            client_headers: config.client_headers.clone(),
+            server_headers: config.server_headers.clone(),
+            consul: config.consul.clone(),
+            kubernetes: config.kubernetes.clone(),
+            typecfg: config.typecfg.clone(),
+            extraparams: config.extraparams.clone(),
+        };
+        clone_dashmap_into(&upstreams, &prev_upstreams);
+        clone_dashmap_into(&upstreams, &tosend.upstreams);
+        print_upstreams(&tosend.upstreams);
+        return Some(tosend);
+    };
+    None
+}

src/utils/parceyaml.rs

@@ -6,7 +6,7 @@ use dashmap::DashMap;
 use log::{error, info, warn};
 use std::collections::HashMap;
 use std::sync::atomic::AtomicUsize;
-// use std::sync::mpsc::{channel, Receiver, Sender};
+use std::sync::Arc;
 use std::{env, fs};
 // use tokio::sync::oneshot::{Receiver, Sender};
 
@@ -67,18 +67,32 @@ pub async fn load_configuration(d: &str, kind: &str) -> Option<Configuration> {
 }
 
 async fn populate_headers_and_auth(config: &mut Configuration, parsed: &Config) {
-    if let Some(headers) = &parsed.headers {
-        let mut hl = Vec::new();
+    let mut ch: Vec<(Arc<str>, Arc<str>)> = Vec::new();
+    ch.push((Arc::from("Server"), Arc::from("Aralez")));
+    // println!("{:?}", &parsed.client_headers);
+    if let Some(headers) = &parsed.client_headers {
         for header in headers {
             if let Some((key, val)) = header.split_once(':') {
-                hl.push((key.trim().to_string(), val.trim().to_string()));
+                ch.push((Arc::from(key), Arc::from(val)));
             }
         }
-
-        let global_headers = DashMap::new();
-        global_headers.insert("/".to_string(), hl);
-        config.headers.insert("GLOBAL_HEADERS".to_string(), global_headers);
     }
+    let global_headers: DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>> = DashMap::new();
+    global_headers.insert(Arc::from("/"), ch);
+    config.client_headers.insert("GLOBAL_CLIENT_HEADERS".to_string(), global_headers);
+
+    let mut sh: Vec<(Arc<str>, Arc<str>)> = Vec::new();
+    sh.push((Arc::from("X-Proxy-Server"), Arc::from("Aralez")));
+    if let Some(headers) = &parsed.server_headers {
+        for header in headers {
+            if let Some((key, val)) = header.split_once(':') {
+                sh.push((Arc::from(key.trim()), Arc::from(val.trim())));
+            }
+        }
+    }
+    let server_global_headers: DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>> = DashMap::new();
+    server_global_headers.insert(Arc::from("/"), sh);
+    config.server_headers.insert("GLOBAL_SERVER_HEADERS".to_string(), server_global_headers);
 
     config.extraparams.sticky_sessions = parsed.sticky_sessions;
     config.extraparams.to_https = parsed.to_https;
@@ -102,35 +116,40 @@ async fn populate_file_upstreams(config: &mut Configuration, parsed: &Config) {
     if let Some(upstreams) = &parsed.upstreams {
         for (hostname, host_config) in upstreams {
             let path_map = DashMap::new();
-            let header_list = DashMap::new();
+            let client_header_list = DashMap::new();
+            let server_header_list = DashMap::new();
             for (path, path_config) in &host_config.paths {
                 if let Some(rate) = &path_config.rate_limit {
                     info!("Applied Rate Limit for {} : {} request per second", hostname, rate);
                 }
 
-                let mut hl: Vec<(String, String)> = Vec::new();
-                build_headers(&path_config.headers, config, &mut hl);
-                header_list.insert(path.clone(), hl);
+                let mut hl: Vec<(Arc<str>, Arc<str>)> = Vec::new();
+                let mut sl: Vec<(Arc<str>, Arc<str>)> = Vec::new();
+                build_headers(&path_config.client_headers, config, &mut hl);
+                build_headers(&path_config.server_headers, config, &mut sl);
+                client_header_list.insert(Arc::from(path.as_str()), hl);
+                server_header_list.insert(Arc::from(path.as_str()), sl);
 
                 let mut server_list = Vec::new();
                 for server in &path_config.servers {
                     if let Some((ip, port_str)) = server.split_once(':') {
                         if let Ok(port) = port_str.parse::<u16>() {
-                            server_list.push(InnerMap {
-                                address: ip.trim().to_string(),
+                            server_list.push(Arc::from(InnerMap {
+                                address: ip.trim().parse().unwrap(),
                                 port,
                                 is_ssl: true,
                                 is_http2: false,
                                 to_https: path_config.to_https.unwrap_or(false),
                                 rate_limit: path_config.rate_limit,
                                 healthcheck: path_config.healthcheck,
-                            });
+                            }));
                         }
                     }
                 }
                 path_map.insert(path.clone(), (server_list, AtomicUsize::new(0)));
             }
-            config.headers.insert(hostname.clone(), header_list);
+            config.client_headers.insert(hostname.clone(), client_header_list);
+            config.server_headers.insert(hostname.clone(), server_header_list);
             imtdashmap.insert(hostname.clone(), path_map);
         }
 
@@ -218,19 +237,19 @@ fn log_builder(conf: &AppConfig) {
     env_logger::builder().init();
 }
 
-pub fn build_headers(path_config: &Option<Vec<String>>, config: &Configuration, hl: &mut Vec<(String, String)>) {
+pub fn build_headers(path_config: &Option<Vec<String>>, _config: &Configuration, hl: &mut Vec<(Arc<str>, Arc<str>)>) {
     if let Some(headers) = &path_config {
         for header in headers {
             if let Some((key, val)) = header.split_once(':') {
-                hl.push((key.trim().to_string(), val.trim().to_string()));
-            }
-        }
-        if let Some(push) = config.headers.get("GLOBAL_HEADERS") {
-            for k in push.iter() {
-                for x in k.value() {
-                    hl.push(x.to_owned());
-                }
+                hl.push((Arc::from(key.trim()), Arc::from(val.trim())));
             }
         }
+        // if let Some(push) = config.client_headers.get("GLOBAL_HEADERS") {
+        //     for k in push.iter() {
+        //         for x in k.value() {
+        //             hl.push(x.to_owned());
+        //         }
+        //     }
+        // }
     }
 }

src/utils/structs.rs

@@ -2,11 +2,12 @@ use dashmap::DashMap;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::sync::atomic::AtomicUsize;
+pub type UpstreamsDashMap = DashMap<String, DashMap<String, (Vec<Arc<InnerMap>>, AtomicUsize)>>;
+use std::net::IpAddr;
+use std::sync::Arc;
 
-pub type UpstreamsDashMap = DashMap<String, DashMap<String, (Vec<InnerMap>, AtomicUsize)>>;
-
-pub type UpstreamsIdMap = DashMap<String, InnerMap>;
-pub type Headers = DashMap<String, DashMap<String, Vec<(String, String)>>>;
+pub type UpstreamsIdMap = DashMap<String, Arc<InnerMap>>;
+pub type Headers = DashMap<String, DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>>>;
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize)]
 pub struct ServiceMapping {
@@ -15,7 +16,8 @@ pub struct ServiceMapping {
     pub path: Option<String>,
     pub to_https: Option<bool>,
     pub rate_limit: Option<isize>,
-    pub headers: Option<Vec<String>>,
+    pub client_headers: Option<Vec<String>>,
+    pub server_headers: Option<Vec<String>>,
 }
 
 // pub type Services = DashMap<String, Vec<(String, Option<String>)>>;
@@ -50,7 +52,9 @@ pub struct Config {
     #[serde(default)]
     pub globals: Option<HashMap<String, Vec<String>>>,
     #[serde(default)]
-    pub headers: Option<Vec<String>>,
+    pub client_headers: Option<Vec<String>>,
+    #[serde(default)]
+    pub server_headers: Option<Vec<String>>,
     #[serde(default)]
     pub authorization: Option<HashMap<String, String>>,
     #[serde(default)]
@@ -71,14 +75,16 @@ pub struct HostConfig {
 pub struct PathConfig {
     pub servers: Vec<String>,
     pub to_https: Option<bool>,
-    pub headers: Option<Vec<String>>,
+    pub client_headers: Option<Vec<String>>,
+    pub server_headers: Option<Vec<String>>,
     pub rate_limit: Option<isize>,
     pub healthcheck: Option<bool>,
 }
 #[derive(Debug, Default)]
 pub struct Configuration {
     pub upstreams: UpstreamsDashMap,
-    pub headers: Headers,
+    pub client_headers: Headers,
+    pub server_headers: Headers,
     pub consul: Option<Consul>,
     pub kubernetes: Option<Kubernetes>,
     pub typecfg: String,
@@ -111,7 +117,7 @@ pub struct AppConfig {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct InnerMap {
-    pub address: String,
+    pub address: IpAddr,
     pub port: u16,
     pub is_ssl: bool,
     pub is_http2: bool,
@@ -124,7 +130,7 @@ pub struct InnerMap {
 impl InnerMap {
     pub fn new() -> Self {
         Self {
-            address: Default::default(),
+            address: "127.0.0.1".parse().unwrap(),
             port: Default::default(),
             is_ssl: Default::default(),
             is_http2: Default::default(),

src/utils/tools.rs

@@ -15,6 +15,7 @@ use std::os::unix::fs::MetadataExt;
 use std::str::FromStr;
 use std::sync::atomic::AtomicUsize;
 use std::sync::mpsc::{channel, Sender};
+use std::sync::Arc;
 use std::time::{Duration, Instant};
 use std::{fs, process, thread, time};
 
@@ -132,7 +133,7 @@ pub fn compare_dashmaps(map1: &UpstreamsDashMap, map2: &UpstreamsDashMap) -> boo
     true
 }
 
-pub fn merge_headers(target: &DashMap<String, Vec<(String, String)>>, source: &DashMap<String, Vec<(String, String)>>) {
+pub fn merge_headers(target: &DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>>, source: &DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>>) {
     for entry in source.iter() {
         let global_key = entry.key().clone();
         let global_values = entry.value().clone();
@@ -159,7 +160,7 @@ pub fn clone_idmap_into(original: &UpstreamsDashMap, cloned: &UpstreamsIdMap) {
                 let hex_hash = base16ct::lower::encode_string(&hash);
                 let hh = hex_hash[0..50].to_string();
                 let to_add = InnerMap {
-                    address: hh.clone(),
+                    address: "127.0.0.1".parse().unwrap(),
                     port: 0,
                     is_ssl: false,
                     is_http2: false,
@@ -167,8 +168,8 @@ pub fn clone_idmap_into(original: &UpstreamsDashMap, cloned: &UpstreamsIdMap) {
                     rate_limit: None,
                     healthcheck: None,
                 };
-                cloned.insert(id, to_add);
-                cloned.insert(hh, x.to_owned());
+                cloned.insert(id, Arc::from(to_add));
+                cloned.insert(hh, Arc::from(x.to_owned()));
             }
             new_inner_map.insert(path.clone(), new_vec);
         }

src/web/bgservice.rs

@@ -85,22 +85,38 @@ impl BackgroundService for LB {
                             new.authentication = ss.extraparams.authentication.clone();
                             new.rate_limit = ss.extraparams.rate_limit;
                             self.extraparams.store(Arc::new(new));
-                            self.headers.clear();
+                            self.client_headers.clear();
+                            self.server_headers.clear();
 
                             for entry in ss.upstreams.iter() {
                                 let global_key = entry.key().clone();
-                                let global_values = DashMap::new();
-                                let mut target_entry = ss.headers.entry(global_key).or_insert_with(DashMap::new);
-                                target_entry.extend(global_values);
-                                self.headers.insert(target_entry.key().to_owned(), target_entry.value().to_owned());
+                                let client_global_values = DashMap::new();
+                                let server_global_values = DashMap::new();
+
+                                let mut client_target_entry = ss.client_headers.entry(global_key.clone()).or_insert_with(DashMap::new);
+                                client_target_entry.extend(client_global_values);
+                                let mut server_target_entry = ss.server_headers.entry(global_key).or_insert_with(DashMap::new);
+                                server_target_entry.extend(server_global_values);
+                                self.server_headers.insert(server_target_entry.key().to_owned(), server_target_entry.value().to_owned());
                             }
 
-                            for path in ss.headers.iter() {
+                            for path in ss.client_headers.iter() {
                                 let path_key = path.key().clone();
                                 let path_headers = path.value().clone();
-                                self.headers.insert(path_key.clone(), path_headers);
-                                if let Some(global_headers) = ss.headers.get("GLOBAL_HEADERS") {
-                                    if let Some(existing_headers) = self.headers.get_mut(&path_key) {
+                                self.client_headers.insert(path_key.clone(), path_headers);
+                                if let Some(global_headers) = ss.client_headers.get("GLOBAL_CLIENT_HEADERS") {
+                                    if let Some(existing_headers) = self.client_headers.get_mut(&path_key) {
+                                        merge_headers(&existing_headers, &global_headers);
+                                    }
+                                }
+                            }
+
+                            for path in ss.server_headers.iter() {
+                                let path_key = path.key().clone();
+                                let path_headers = path.value().clone();
+                                self.server_headers.insert(path_key.clone(), path_headers);
+                                if let Some(global_headers) = ss.server_headers.get("GLOBAL_SERVER_HEADERS") {
+                                    if let Some(existing_headers) = self.server_headers.get_mut(&path_key) {
                                         merge_headers(&existing_headers, &global_headers);
                                     }
                                 }

src/web/gethosts.rs

@@ -2,76 +2,101 @@ use crate::utils::structs::InnerMap;
 use crate::web::proxyhttp::LB;
 use async_trait::async_trait;
 use std::sync::atomic::Ordering;
+use std::sync::Arc;
+
+#[derive(Debug, Clone)]
+pub struct GetHostsReturHeaders {
+    pub client_headers: Option<Vec<(Arc<str>, Arc<str>)>>,
+    pub server_headers: Option<Vec<(Arc<str>, Arc<str>)>>,
+}
 
 #[async_trait]
 pub trait GetHost {
-    fn get_host(&self, peer: &str, path: &str, backend_id: Option<&str>) -> Option<InnerMap>;
-    fn get_header(&self, peer: &str, path: &str) -> Option<Vec<(String, String)>>;
+    // fn get_host<'a>(&self, peer: &str, path: &str, backend_id: Option<&str>) -> Option<&'a InnerMap>;
+
+    fn get_host(&self, peer: &str, path: &str, backend_id: Option<&str>) -> Option<Arc<InnerMap>>;
+
+    fn get_header(&self, peer: &str, path: &str) -> Option<GetHostsReturHeaders>;
 }
 #[async_trait]
 impl GetHost for LB {
-    fn get_host(&self, peer: &str, path: &str, backend_id: Option<&str>) -> Option<InnerMap> {
+    fn get_host(&self, peer: &str, path: &str, backend_id: Option<&str>) -> Option<Arc<InnerMap>> {
         if let Some(b) = backend_id {
             if let Some(bb) = self.ump_byid.get(b) {
-                // println!("BIB :===> {:?}", Some(bb.value()));
                 return Some(bb.value().clone());
             }
         }
-
         let host_entry = self.ump_upst.get(peer)?;
-        let mut current_path = path.to_string();
-        let mut best_match: Option<InnerMap> = None;
+        let mut end = path.len();
         loop {
-            if let Some(entry) = host_entry.get(&current_path) {
+            let slice = &path[..end];
+            if let Some(entry) = host_entry.get(slice) {
                 let (servers, index) = entry.value();
                 if !servers.is_empty() {
                     let idx = index.fetch_add(1, Ordering::Relaxed) % servers.len();
-                    best_match = Some(servers[idx].clone());
-                    break;
+                    return Some(servers[idx].clone());
                 }
             }
-            if let Some(pos) = current_path.rfind('/') {
-                current_path.truncate(pos);
+            if let Some(pos) = slice.rfind('/') {
+                end = pos;
             } else {
                 break;
             }
         }
-        if best_match.is_none() {
-            if let Some(entry) = host_entry.get("/") {
-                let (servers, index) = entry.value();
-                if !servers.is_empty() {
-                    let idx = index.fetch_add(1, Ordering::Relaxed) % servers.len();
-                    best_match = Some(servers[idx].clone());
-                }
+        if let Some(entry) = host_entry.get("/") {
+            let (servers, index) = entry.value();
+            if !servers.is_empty() {
+                let idx = index.fetch_add(1, Ordering::Relaxed) % servers.len();
+                return Some(servers[idx].clone());
             }
         }
-        // println!("Best Match :===> {:?}", best_match);
-        best_match
+        None
     }
-    fn get_header(&self, peer: &str, path: &str) -> Option<Vec<(String, String)>> {
-        let host_entry = self.headers.get(peer)?;
-        let mut current_path = path.to_string();
-        let mut best_match: Option<Vec<(String, String)>> = None;
+
+    fn get_header(&self, peer: &str, path: &str) -> Option<GetHostsReturHeaders> {
+        let client_entry = self.client_headers.get(peer)?;
+        let server_entry = self.server_headers.get(peer)?;
+        let mut current_path = path;
+        let mut clnt_match = None;
         loop {
-            if let Some(entry) = host_entry.get(&current_path) {
+            if let Some(entry) = client_entry.get(current_path) {
                 if !entry.value().is_empty() {
-                    best_match = Some(entry.value().clone());
+                    clnt_match = Some(entry.value().clone());
                     break;
                 }
             }
             if let Some(pos) = current_path.rfind('/') {
-                current_path.truncate(pos);
+                current_path = if pos == 0 { "/" } else { &current_path[..pos] };
             } else {
                 break;
             }
         }
-        if best_match.is_none() {
-            if let Some(entry) = host_entry.get("/") {
+        current_path = path;
+        let mut serv_match = None;
+        loop {
+            if let Some(entry) = server_entry.get(current_path) {
                 if !entry.value().is_empty() {
-                    best_match = Some(entry.value().clone());
+                    serv_match = Some(entry.value().clone());
+                    break;
+                }
+            }
+            if let Some(pos) = current_path.rfind('/') {
+                current_path = if pos == 0 { "/" } else { &current_path[..pos] };
+            } else {
+                break;
+            }
+            if serv_match.is_none() {
+                if let Some(entry) = server_entry.get("/") {
+                    if !entry.value().is_empty() {
+                        serv_match = Some(entry.value().clone());
+                        break;
+                    }
                 }
             }
         }
-        best_match
+        Some(GetHostsReturHeaders {
+            client_headers: clnt_match,
+            server_headers: serv_match,
+        })
     }
 }

src/web/proxyhttp.rs

@@ -14,6 +14,7 @@ use pingora_core::listeners::ALPN;
 use pingora_core::prelude::HttpPeer;
 use pingora_limits::rate::Rate;
 use pingora_proxy::{ProxyHttp, Session};
+// use std::net::{IpAddr, Ipv4Addr};
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::time::Instant;
@@ -25,19 +26,22 @@ pub struct LB {
     pub ump_upst: Arc<UpstreamsDashMap>,
     pub ump_full: Arc<UpstreamsDashMap>,
     pub ump_byid: Arc<UpstreamsIdMap>,
-    pub headers: Arc<Headers>,
+    pub client_headers: Arc<Headers>,
+    pub server_headers: Arc<Headers>,
     pub config: Arc<AppConfig>,
     pub extraparams: Arc<ArcSwap<Extraparams>>,
 }
 
 pub struct Context {
-    backend_id: String,
+    backend_id: Arc<str>,
+    // backend_id: Arc<(IpAddr, u16, bool)>,
     to_https: bool,
-    redirect_to: String,
+    redirect_to: Arc<str>,
     start_time: Instant,
-    hostname: Option<String>,
-    upstream_peer: Option<InnerMap>,
+    hostname: Option<Arc<str>>,
+    upstream_peer: Option<Arc<InnerMap>>,
     extraparams: arc_swap::Guard<Arc<Extraparams>>,
+    client_headers: Arc<Vec<(Arc<str>, Arc<str>)>>,
 }
 
 #[async_trait]
@@ -45,17 +49,19 @@ impl ProxyHttp for LB {
     type CTX = Context;
     fn new_ctx(&self) -> Self::CTX {
         Context {
-            backend_id: String::new(),
+            backend_id: Arc::from(""),
+            // backend_id: Arc::new((IpAddr::V4(Ipv4Addr::UNSPECIFIED), 0, false)),
             to_https: false,
-            redirect_to: String::new(),
+            redirect_to: Arc::from(""),
             start_time: Instant::now(),
             hostname: None,
             upstream_peer: None,
             extraparams: self.extraparams.load(),
+            client_headers: Arc::new(Vec::new()),
         }
     }
     async fn request_filter(&self, session: &mut Session, _ctx: &mut Self::CTX) -> Result<bool> {
-        let ep = _ctx.extraparams.clone();
+        let ep = _ctx.extraparams.as_ref();
 
         if let Some(auth) = ep.authentication.get("authorization") {
             let authenticated = authenticate(&auth.value(), &session);
@@ -89,7 +95,7 @@ impl ProxyHttp for LB {
             None => return Ok(false),
             Some(host) => {
                 // let optioninnermap = self.get_host(host.as_str(), host.as_str(), backend_id);
-                let optioninnermap = self.get_host(host.as_str(), session.req_header().uri.path(), backend_id);
+                let optioninnermap = self.get_host(host, session.req_header().uri.path(), backend_id);
                 match optioninnermap {
                     None => return Ok(false),
                     Some(ref innermap) => {
@@ -116,54 +122,54 @@ impl ProxyHttp for LB {
         Ok(false)
     }
     async fn upstream_peer(&self, session: &mut Session, ctx: &mut Self::CTX) -> Result<Box<HttpPeer>> {
-        // let host_name = return_header_host(&session);
         match ctx.hostname.as_ref() {
-            Some(hostname) => {
-                match ctx.upstream_peer.as_ref() {
-                    // Some((address, port, ssl, is_h2, to_https)) => {
-                    Some(innermap) => {
-                        let mut peer = Box::new(HttpPeer::new((innermap.address.clone(), innermap.port.clone()), innermap.is_ssl, String::new()));
-                        // if session.is_http2() {
-                        if innermap.is_http2 {
-                            peer.options.alpn = ALPN::H2;
-                        }
-                        if innermap.is_ssl {
-                            peer.sni = hostname.clone();
-                            peer.options.verify_cert = false;
-                            peer.options.verify_hostname = false;
-                        }
-                        if ctx.to_https || innermap.to_https {
-                            if let Some(stream) = session.stream() {
-                                if stream.get_ssl().is_none() {
-                                    if let Some(addr) = session.server_addr() {
-                                        if let Some((host, _)) = addr.to_string().split_once(':') {
-                                            let uri = session.req_header().uri.path_and_query().map_or("/", |pq| pq.as_str());
-                                            let port = self.config.proxy_port_tls.unwrap_or(403);
-                                            ctx.to_https = true;
-                                            ctx.redirect_to = format!("https://{}:{}{}", host, port, uri);
-                                        }
-                                    }
+            Some(hostname) => match ctx.upstream_peer.as_ref() {
+                Some(innermap) => {
+                    let mut peer = Box::new(HttpPeer::new((innermap.address, innermap.port), innermap.is_ssl, String::new()));
+                    if innermap.is_http2 {
+                        peer.options.alpn = ALPN::H2;
+                    }
+                    if innermap.is_ssl {
+                        peer.sni = hostname.to_string();
+                        peer.options.verify_cert = false;
+                        peer.options.verify_hostname = false;
+                    }
+                    if ctx.to_https || innermap.to_https {
+                        if let Some(stream) = session.stream() {
+                            if stream.get_ssl().is_none() {
+                                if let Some(host) = ctx.hostname.as_ref() {
+                                    let uri = session.req_header().uri.path_and_query().map_or("/", |pq| pq.as_str());
+                                    let port = self.config.proxy_port_tls.unwrap_or(403);
+                                    ctx.to_https = true;
+                                    ctx.redirect_to = Arc::from(format!("https://{}:{}{}", host, port, uri));
                                 }
+                                // if let Some(addr) = session.server_addr() {
+                                //     if let Some((host, _)) = addr.to_string().split_once(':') {
+                                //         let uri = session.req_header().uri.path_and_query().map_or("/", |pq| pq.as_str());
+                                //         let port = self.config.proxy_port_tls.unwrap_or(403);
+                                //         ctx.to_https = true;
+                                //         ctx.redirect_to = Arc::from(format!("https://{}:{}{}", host, port, uri));
+                                //     }
+                                // }
                             }
                         }
-
-                        ctx.backend_id = format!("{}:{}:{}", innermap.address.clone(), innermap.port.clone(), innermap.is_ssl);
-                        Ok(peer)
-                    }
-                    None => {
-                        if let Err(e) = session.respond_error_with_body(502, Bytes::from("502 Bad Gateway\n")).await {
-                            error!("Failed to send error response: {:?}", e);
-                        }
-                        Err(Box::new(Error {
-                            etype: HTTPStatus(502),
-                            esource: Upstream,
-                            retry: RetryType::Decided(false),
-                            cause: None,
-                            context: Option::from(ImmutStr::Static("Upstream not found")),
-                        }))
                     }
+                    ctx.backend_id = Arc::from(format!("{}:{}:{}", innermap.address, innermap.port, innermap.is_ssl));
+                    Ok(peer)
                 }
-            }
+                None => {
+                    if let Err(e) = session.respond_error_with_body(502, Bytes::from("502 Bad Gateway\n")).await {
+                        error!("Failed to send error response: {:?}", e);
+                    }
+                    Err(Box::new(Error {
+                        etype: HTTPStatus(502),
+                        esource: Upstream,
+                        retry: RetryType::Decided(false),
+                        cause: None,
+                        context: Option::from(ImmutStr::Static("Upstream not found")),
+                    }))
+                }
+            },
             None => {
                 // session.respond_error_with_body(502, Bytes::from("502 Bad Gateway\n")).await.expect("Failed to send error");
                 if let Err(e) = session.respond_error_with_body(502, Bytes::from("502 Bad Gateway\n")).await {
@@ -180,63 +186,46 @@ impl ProxyHttp for LB {
         }
     }
 
-    async fn upstream_request_filter(&self, _session: &mut Session, upstream_request: &mut RequestHeader, ctx: &mut Self::CTX) -> Result<()> {
+    async fn upstream_request_filter(&self, session: &mut Session, upstream_request: &mut RequestHeader, ctx: &mut Self::CTX) -> Result<()> {
         if let Some(hostname) = ctx.hostname.as_ref() {
-            upstream_request.insert_header("Host", hostname)?;
+            upstream_request.insert_header("Host", hostname.as_ref())?;
         }
         if let Some(peer) = ctx.upstream_peer.as_ref() {
-            upstream_request.insert_header("X-Forwarded-For", peer.address.as_str())?;
+            upstream_request.insert_header("X-Forwarded-For", peer.address.to_string())?;
         }
+
+        if let Some(headers) = self.get_header(ctx.hostname.as_ref().unwrap_or(&Arc::from("localhost")), session.req_header().uri.path()) {
+            if let Some(server_headers) = headers.server_headers {
+                for k in server_headers {
+                    upstream_request.insert_header(k.0.to_string(), k.1.as_ref())?;
+                }
+            }
+            if let Some(client_headers) = headers.client_headers {
+                let converted: Vec<(Arc<str>, Arc<str>)> = client_headers.into_iter().map(|(k, v)| (Arc::<str>::from(k), Arc::<str>::from(v))).collect();
+
+                ctx.client_headers = Arc::new(converted);
+            }
+        }
+
         Ok(())
     }
-
-    // async fn request_body_filter(&self, _session: &mut Session, _body: &mut Option<Bytes>, _end_of_stream: bool, _ctx: &mut Self::CTX) -> Result<()>
-    // where
-    //     Self::CTX: Send + Sync,
-    // {
-    //     Ok(())
-    // }
     async fn response_filter(&self, session: &mut Session, _upstream_response: &mut ResponseHeader, ctx: &mut Self::CTX) -> Result<()> {
-        // _upstream_response.insert_header("X-Proxied-From", "Fooooooooooooooo").unwrap();
         if ctx.extraparams.sticky_sessions {
-            let backend_id = ctx.backend_id.clone();
-            if let Some(bid) = self.ump_byid.get(&backend_id) {
+            if let Some(bid) = self.ump_byid.get(ctx.backend_id.as_ref()) {
                 let _ = _upstream_response.insert_header("set-cookie", format!("backend_id={}; Path=/; Max-Age=600; HttpOnly; SameSite=Lax", bid.address));
             }
         }
         if ctx.to_https {
             let mut redirect_response = ResponseHeader::build(StatusCode::MOVED_PERMANENTLY, None)?;
-            redirect_response.insert_header("Location", ctx.redirect_to.clone())?;
+            redirect_response.insert_header("Location", ctx.redirect_to.as_ref())?;
             redirect_response.insert_header("Content-Length", "0")?;
             session.write_response_header(Box::new(redirect_response), false).await?;
         }
-        match ctx.hostname.as_ref() {
-            Some(host) => {
-                let path = session.req_header().uri.path();
-                let host_header = host;
-                let split_header = host_header.split_once(':');
 
-                match split_header {
-                    Some(sh) => {
-                        let yoyo = self.get_header(sh.0, path);
-                        for k in yoyo.iter() {
-                            for t in k.iter() {
-                                _upstream_response.insert_header(t.0.clone(), t.1.clone()).unwrap();
-                            }
-                        }
-                    }
-                    None => {
-                        let yoyo = self.get_header(host_header, path);
-                        for k in yoyo.iter() {
-                            for t in k.iter() {
-                                _upstream_response.insert_header(t.0.clone(), t.1.clone()).unwrap();
-                            }
-                        }
-                    }
-                }
-            }
-            None => {}
+        for (key, value) in ctx.client_headers.iter() {
+            _upstream_response.insert_header(key.to_string(), value.as_ref()).unwrap();
         }
+
         session.set_keepalive(Some(300));
         Ok(())
     }
@@ -254,17 +243,17 @@ impl ProxyHttp for LB {
     }
 }
 
-fn return_header_host(session: &Session) -> Option<String> {
+fn return_header_host(session: &Session) -> Option<Arc<str>> {
     if session.is_http2() {
         match session.req_header().uri.host() {
-            Some(host) => Option::from(host.to_string()),
+            Some(host) => Option::from(Arc::from(host)),
             None => None,
         }
     } else {
         match session.req_header().headers.get("host") {
             Some(host) => {
-                let header_host = host.to_str().unwrap().splitn(2, ':').collect::<Vec<&str>>();
-                Option::from(header_host[0].to_string())
+                let header_host: &str = host.to_str().unwrap().split_once(':').map_or(host.to_str().unwrap(), |(h, _)| h);
+                Option::from(Arc::<str>::from(header_host))
             }
             None => None,
         }

src/web/start.rs

@@ -27,7 +27,8 @@ pub fn run() {
     let uf_config = Arc::new(DashMap::new());
     let ff_config = Arc::new(DashMap::new());
     let im_config = Arc::new(DashMap::new());
-    let hh_config = Arc::new(DashMap::new());
+    let ch_config = Arc::new(DashMap::new());
+    let sh_config = Arc::new(DashMap::new());
 
     let ec_config = Arc::new(ArcSwap::from_pointee(Extraparams {
         sticky_sessions: false,
@@ -43,7 +44,8 @@ pub fn run() {
         ump_full: ff_config,
         ump_byid: im_config,
         config: cfg.clone(),
-        headers: hh_config,
+        client_headers: ch_config,
+        server_headers: sh_config,
         extraparams: ec_config,
     };