Type changes, auth override policy

Fix grammar and formatting in README.md

.cargo/config.toml

@@ -0,0 +1,13 @@
+[target.aarch64-unknown-linux-musl]
+rustflags = [
+    "-C", "link-arg=-Wl,--defsym=fopen64=fopen",
+    "-C", "link-arg=-Wl,--defsym=fseeko64=fseeko",
+    "-C", "link-arg=-Wl,--defsym=ftello64=ftello"
+]
+
+[target.x86_64-unknown-linux-musl]
+rustflags = [
+    "-C", "link-arg=-Wl,--defsym=fopen64=fopen",
+    "-C", "link-arg=-Wl,--defsym=fseeko64=fseeko",
+    "-C", "link-arg=-Wl,--defsym=ftello64=ftello"
+]

Cargo.toml

@@ -11,47 +11,43 @@ panic = "abort"
 strip = true
 
 [dependencies]
-tokio = { version = "1.48.0", features = ["full"] }
-pingora = { version = "0.6.0", features = ["lb", "openssl"] } # openssl, rustls, boringssl
+tokio = { version = "1.49.0", features = ["full"] }
+pingora = { version = "0.8.0", features = ["lb", "openssl"] } # openssl, rustls, boringssl
 serde = { version = "1.0.228", features = ["derive"] }
 dashmap = "7.0.0-rc2"
-pingora-core = "0.6.0"
-pingora-proxy = "0.6.0"
-pingora-http = "0.6.0"
-pingora-limits = "0.6.0"
+pingora-core = "0.8.0"
+pingora-proxy = "0.8.0"
+pingora-http = "0.8.0"
+pingora-limits = "0.8.0"
 async-trait = "0.1.89"
-env_logger = "0.11.8"
+env_logger = "0.11.9"
 log = "0.4.29"
-futures = "0.3.31"
-notify = "9.0.0-rc.1"
+futures = "0.3.32"
+notify = "9.0.0-rc.2"
 axum = { version = "0.8.8" }
-axum-server = { version = "0.8.0", features = ["tls-openssl"] }
-reqwest = { version = "0.13.1", features = ["json", "stream"] }
-#reqwest = { version = "0.12.15", features = ["json", "rustls-tls"] }
-#reqwest = { version = "0.12.15", default-features = false, features = ["rustls-tls", "json"] }
-
+#axum-server = { version = "0.8.0" }
+reqwest = { version = "0.13.2", features = ["json", "stream"] }
 serde_yaml = "0.9.34-deprecated"
-rand = "0.10.0-rc.5"
+rand = "0.10.0"
 base64 = "0.22.1"
-jsonwebtoken = { version = "10.3.0", features = ["aws_lc_rs"] }
-tonic = "0.14.2"
-sha2 = { version = "0.11.0-rc.3", default-features = false }
+#jsonwebtoken = { version = "10.3.0", features = ["aws_lc_rs"] }
+#jsonwebtoken = { version = "10.3.0", default-features = false, features = ["use_pem"] }
+jsonwebtoken = { version = "10.3.0", default-features = false, features = ["use_pem", "rust_crypto"] }
+tonic = "0.14.5"
+sha2 = { version = "0.11.0-rc.5", default-features = false }
 base16ct = { version = "1.0.0", features = ["alloc"] }
 urlencoding = "2.1.3"
-arc-swap = "1.7.1"
+arc-swap = "1.8.2"
 mimalloc = { version = "0.1.48", default-features = false }
 prometheus = "0.14.0"
 lazy_static = "1.5.0"
-x509-parser = "0.18.0"
+x509-parser = "0.18.1"
 rustls-pemfile = "2.2.0"
 tower-http = { version = "0.6.8", features = ["fs"] }
 once_cell = "1.21.3"
 privdrop = "0.5.6"
-ctrlc = "3.5.1"
+ctrlc = "3.5.2"
 port_check = "0.3.0"
 serde_json = "1.0.149"
 http = "1.4.0"
-#moka = { version = "0.12.12", features = ["sync"] }
-#rustls = { version = "0.23.27", features = ["ring"] }
-#hickory-client = { version = "0.25.2" }
-#openssl = "0.10.73"
+itoa = "1.0.14"

README.md

@@ -11,7 +11,7 @@ featuring Consul and Kubernetes integration for dynamic pod discovery and health
 
 ---
 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>.
+**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>.
 
 Built on Rust, on top of **Cloudflare’s Pingora engine**, **Aralez** delivers world-class performance, security and scalability — right out of the box.
 
@@ -23,7 +23,7 @@ Built on Rust, on top of **Cloudflare’s Pingora engine**, **Aralez** delivers
 
 - **Dynamic Config Reloads** — Upstreams can be updated live via API, no restart required.
 - **TLS Termination** — Built-in OpenSSL support.
-    - **Automatic load of certificates** — Automatically reads and loads certificates from a folder, without a restart.
+    - **Automatic loading of certificates** — Automatically reads and loads certificates from a folder, without a restart.
 - **Upstreams TLS detection** — Aralez will automatically detect if upstreams uses secure connection.
 - **Built in rate limiter** — Limit requests to server, by setting up upper limit for requests per seconds, per virtualhost.
     - **Global rate limiter** — Set rate limit for all virtualhosts.

src/utils.rs

@@ -2,6 +2,7 @@ pub mod auth;
 pub mod discovery;
 pub mod dnsclient;
 mod filewatch;
+pub mod fordebug;
 pub mod healthcheck;
 pub mod httpclient;
 pub mod jwt;

src/utils/auth.rs

@@ -57,22 +57,23 @@ fn validate(auth: &dyn AuthValidator, session: &Session) -> bool {
     auth.validate(session)
 }
 
-pub fn authenticate(c: &[Arc<str>], session: &Session) -> bool {
-    match &*c[0] {
+// pub fn authenticate(c: &[Arc<str>], session: &Session) -> bool {
+pub fn authenticate(auth_type: &Arc<str>, credentials: &Arc<str>, session: &Session) -> bool {
+    match &*auth_type.clone() {
         "basic" => {
-            let auth = BasicAuth(&*c[1]);
+            let auth = BasicAuth(&*credentials.clone());
             validate(&auth, session)
         }
         "apikey" => {
-            let auth = ApiKeyAuth(&*c[1]);
+            let auth = ApiKeyAuth(&*credentials.clone());
             validate(&auth, session)
         }
         "jwt" => {
-            let auth = JwtAuth(&*c[1]);
+            let auth = JwtAuth(&*credentials.clone());
             validate(&auth, session)
         }
         _ => {
-            println!("Unsupported authentication mechanism : {}", c[0]);
+            println!("Unsupported authentication mechanism : {}", auth_type);
             false
         }
     }

src/utils/discovery.rs

@@ -10,9 +10,9 @@ pub struct APIUpstreamProvider {
     pub config_api_enabled: bool,
     pub address: String,
     pub masterkey: String,
-    pub tls_address: Option<String>,
-    pub tls_certificate: Option<String>,
-    pub tls_key_file: Option<String>,
+    // pub tls_address: Option<String>,
+    // pub tls_certificate: Option<String>,
+    // pub tls_key_file: Option<String>,
     pub file_server_address: Option<String>,
     pub file_server_folder: Option<String>,
     pub current_upstreams: Arc<UpstreamsDashMap>,

src/utils/dnsclient.rs

@@ -103,6 +103,7 @@ impl DnsClient {
                             is_ssl: false,
                             is_http2: false,
                             to_https: false,
+                            sticky_sessions: false,
                             rate_limit: None,
                         };
                         values.push(to_add);

src/utils/fordebug.rs

@@ -0,0 +1,31 @@
+use std::alloc::{GlobalAlloc, Layout, System};
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+pub struct CountingAllocator;
+
+pub static ALLOC_COUNT: AtomicUsize = AtomicUsize::new(0);
+pub static DEALLOC_COUNT: AtomicUsize = AtomicUsize::new(0);
+pub static ALLOC_BYTES: AtomicUsize = AtomicUsize::new(0);
+#[allow(dead_code)]
+unsafe impl GlobalAlloc for CountingAllocator {
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+        ALLOC_COUNT.fetch_add(1, Ordering::Relaxed);
+        ALLOC_BYTES.fetch_add(layout.size(), Ordering::Relaxed);
+        System.alloc(layout)
+    }
+
+    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
+        DEALLOC_COUNT.fetch_add(1, Ordering::Relaxed);
+        System.dealloc(ptr, layout)
+    }
+}
+
+// Uncomment following lines and comment allocator in main.rs
+// #[global_allocator]
+// pub static A: CountingAllocator = CountingAllocator;
+#[allow(dead_code)]
+fn for_example() {
+    let before = crate::utils::fordebug::ALLOC_COUNT.load(Ordering::Relaxed);
+    let after = crate::utils::fordebug::ALLOC_COUNT.load(Ordering::Relaxed);
+    println!("Allocations : {}", after - before);
+}

src/utils/healthcheck.rs

@@ -70,6 +70,7 @@ async fn build_upstreams(fullist: &UpstreamsDashMap, method: &str, client: &Clie
                     to_https: upstream.to_https,
                     rate_limit: upstream.rate_limit,
                     healthcheck: upstream.healthcheck,
+                    authorization: upstream.authorization.clone(),
                 };
 
                 if scheme.healthcheck.unwrap_or(true) {

src/utils/httpclient.rs

@@ -25,16 +25,17 @@ pub async fn for_consul(url: String, token: Option<String>, conf: &ServiceMappin
     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 addr = subsets.tagged_addresses.get("lan_ipv4").unwrap().address.clone();
         let prt = subsets.tagged_addresses.get("lan_ipv4").unwrap().port.clone();
         let to_add = Arc::from(InnerMap {
-            address: addr,
+            address: Arc::from(&*addr),
             port: prt,
             is_ssl: false,
             is_http2: false,
             to_https: conf.to_https.unwrap_or(false),
             rate_limit: conf.rate_limit,
             healthcheck: None,
+            authorization: None,
         });
         inner_vec.push(to_add);
     }
@@ -61,13 +62,14 @@ pub async fn for_kuber(url: &str, token: &str, conf: &ServiceMapping) -> Option<
                 for addr in addresses {
                     for port in &ports {
                         let to_add = Arc::from(InnerMap {
-                            address: addr.ip.parse().unwrap(),
+                            address: Arc::from(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,
+                            authorization: None,
                         });
                         inner_vec.push(to_add);
                     }

src/utils/kuberconsul.rs

@@ -7,7 +7,7 @@ use dashmap::DashMap;
 use futures::channel::mpsc::Sender;
 use futures::SinkExt;
 use pingora::prelude::sleep;
-use rand::Rng;
+use rand::RngExt;
 use serde::Deserialize;
 use std::collections::HashMap;
 use std::env;
@@ -19,10 +19,6 @@ use std::time::Duration;
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
 
-// #[derive(Debug, Deserialize)]
-// pub struct KubeEndpointsList {
-//     pub items: Vec<KubeEndpoints>,
-// }
 #[derive(Debug, serde::Deserialize)]
 pub struct KubeEndpoints {
     pub subsets: Option<Vec<KubeSubset>>,

src/utils/metrics.rs

@@ -1,4 +1,5 @@
 use http::method::Method;
+use http::StatusCode;
 use pingora_http::Version;
 use prometheus::{register_histogram, register_int_counter, register_int_counter_vec, Histogram, IntCounter, IntCounterVec};
 use std::sync::Arc;
@@ -7,7 +8,7 @@ use std::time::Duration;
 pub struct MetricTypes {
     pub method: Method,
     pub upstream: Arc<str>,
-    pub code: String,
+    pub code: Option<StatusCode>,
     pub latency: Duration,
     pub version: Version,
 }
@@ -39,7 +40,7 @@ lazy_static::lazy_static! {
     pub static ref REQUESTS_BY_UPSTREAM: IntCounterVec = register_int_counter_vec!(
         "aralez_requests_by_upstream",
         "Number of requests by UPSTREAM server",
-        &["method"]
+        &["upstream"]
     ).unwrap();
     pub static ref REQUESTS_BY_VERSION: IntCounterVec = register_int_counter_vec!(
         "aralez_requests_by_version_total",
@@ -65,7 +66,7 @@ pub fn calc_metrics(metric_types: &MetricTypes) {
         _ => "Unknown",
     };
     REQUESTS_BY_VERSION.with_label_values(&[&version_str]).inc();
-    RESPONSE_CODES.with_label_values(&[&metric_types.code]).inc();
+    RESPONSE_CODES.with_label_values(&[metric_types.code.unwrap_or(http::StatusCode::GONE).as_str()]).inc();
     REQUESTS_BY_METHOD.with_label_values(&[&metric_types.method]).inc();
     REQUESTS_BY_UPSTREAM.with_label_values(&[metric_types.upstream.as_ref()]).inc();
     RESPONSE_LATENCY.observe(metric_types.latency.as_secs_f64());

src/utils/parceyaml.rs

@@ -8,7 +8,6 @@ use std::collections::HashMap;
 use std::sync::atomic::AtomicUsize;
 use std::sync::Arc;
 use std::{env, fs};
-// use tokio::sync::oneshot::{Receiver, Sender};
 
 pub async fn load_configuration(d: &str, kind: &str) -> (Option<Configuration>, String) {
     let yaml_data = match kind {
@@ -34,7 +33,10 @@ pub async fn load_configuration(d: &str, kind: &str) -> (Option<Configuration>,
     };
 
     let parsed: Config = match serde_yaml::from_str(&yaml_data) {
-        Ok(cfg) => cfg,
+        Ok(cfg) => {
+            // println!("{:#?}", cfg);
+            cfg
+        }
         Err(e) => {
             error!("Failed to parse upstreams file: {}", e);
             return (None, e.to_string());
@@ -67,7 +69,6 @@ pub async fn load_configuration(d: &str, kind: &str) -> (Option<Configuration>,
 
 async fn populate_headers_and_auth(config: &mut Configuration, parsed: &Config) {
     let mut ch: Vec<(Arc<str>, Arc<str>)> = Vec::new();
-    ch.push((Arc::from("Server"), Arc::from("Aralez")));
     if let Some(headers) = &parsed.client_headers {
         for header in headers {
             if let Some((key, val)) = header.split_once(':') {
@@ -80,7 +81,6 @@ async fn populate_headers_and_auth(config: &mut Configuration, parsed: &Config)
     config.client_headers.insert(Arc::from("GLOBAL_CLIENT_HEADERS"), 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(':') {
@@ -91,24 +91,20 @@ async fn populate_headers_and_auth(config: &mut Configuration, parsed: &Config)
     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(Arc::from("GLOBAL_SERVER_HEADERS"), server_global_headers);
-
-    config.extraparams.sticky_sessions = parsed.sticky_sessions;
     config.extraparams.to_https = parsed.to_https;
+    config.extraparams.sticky_sessions = parsed.sticky_sessions;
     config.extraparams.rate_limit = parsed.rate_limit;
 
     if let Some(rate) = &parsed.rate_limit {
         info!("Applied Global Rate Limit : {} request per second", rate);
     }
 
-    if let Some(auth) = &parsed.authorization {
-        let name = auth.get("type").unwrap_or(&"".to_string()).to_string();
-        let creds = auth.get("creds").unwrap_or(&"".to_string()).to_string();
-        config
-            .extraparams
-            .authentication
-            .insert(Arc::from("authorization"), vec![Arc::from(name), Arc::from(creds)]);
-    } else {
-        config.extraparams.authentication = DashMap::new();
+    if let Some(pa) = &parsed.authorization {
+        let y: InnerAuth = InnerAuth {
+            auth_type: Arc::from(pa.auth_type.clone()),
+            auth_cred: Arc::from(pa.auth_cred.clone()),
+        };
+        config.extraparams.authentication = Some(y);
     }
 }
 
@@ -123,26 +119,34 @@ async fn populate_file_upstreams(config: &mut Configuration, parsed: &Config) {
                 if let Some(rate) = &path_config.rate_limit {
                     info!("Applied Rate Limit for {} : {} request per second", hostname, rate);
                 }
-
                 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 {
+                    let mut path_auth: Option<Arc<InnerAuth>> = None;
+                    if let Some(pa) = &path_config.authorization {
+                        let y: InnerAuth = InnerAuth {
+                            auth_type: Arc::from(pa.auth_type.clone()),
+                            auth_cred: Arc::from(pa.auth_cred.clone()),
+                        };
+                        path_auth = Some(Arc::from(y));
+                    }
+
                     if let Some((ip, port_str)) = server.split_once(':') {
                         if let Ok(port) = port_str.parse::<u16>() {
                             server_list.push(Arc::from(InnerMap {
-                                address: ip.trim().parse().unwrap(),
+                                address: Arc::from(ip),
                                 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,
+                                authorization: path_auth,
                             }));
                         }
                     }
@@ -245,12 +249,5 @@ pub fn build_headers(path_config: &Option<Vec<String>>, _config: &Configuration,
                 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

@@ -1,33 +1,34 @@
 use dashmap::DashMap;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::net::IpAddr;
 use std::sync::atomic::AtomicUsize;
 use std::sync::Arc;
 
 pub type UpstreamsDashMap = DashMap<Arc<str>, DashMap<Arc<str>, (Vec<Arc<InnerMap>>, AtomicUsize)>>;
 
-pub type UpstreamsIdMap = DashMap<Arc<str>, Arc<InnerMap>>;
+pub type UpstreamsIdMap = DashMap<String, Arc<InnerMap>>;
 pub type Headers = DashMap<Arc<str>, DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>>>;
 
+#[derive(Clone, Debug, Default)]
+pub struct Extraparams {
+    pub to_https: Option<bool>,
+    pub sticky_sessions: bool,
+    pub authentication: Option<InnerAuth>,
+    pub rate_limit: Option<isize>,
+}
+
 #[derive(Debug, Default, Clone, Serialize, Deserialize)]
 pub struct ServiceMapping {
     pub upstream: String,
     pub hostname: String,
     pub path: Option<String>,
     pub to_https: Option<bool>,
+    pub sticky_sessions: Option<bool>,
     pub rate_limit: Option<isize>,
     pub client_headers: Option<Vec<String>>,
     pub server_headers: Option<Vec<String>>,
 }
 
-#[derive(Clone, Debug, Default)]
-pub struct Extraparams {
-    pub sticky_sessions: bool,
-    pub to_https: Option<bool>,
-    pub authentication: DashMap<Arc<str>, Vec<Arc<str>>>,
-    pub rate_limit: Option<isize>,
-}
 #[derive(Clone, Default, Debug, Serialize, Deserialize)]
 pub struct Kubernetes {
     pub servers: Option<Vec<String>>,
@@ -44,8 +45,8 @@ pub struct Consul {
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct Config {
     pub provider: String,
-    pub sticky_sessions: bool,
     pub to_https: Option<bool>,
+    pub sticky_sessions: bool,
     #[serde(default)]
     pub upstreams: Option<HashMap<String, HostConfig>>,
     #[serde(default)]
@@ -55,7 +56,7 @@ pub struct Config {
     #[serde(default)]
     pub server_headers: Option<Vec<String>>,
     #[serde(default)]
-    pub authorization: Option<HashMap<String, String>>,
+    pub authorization: Option<Auth>,
     #[serde(default)]
     pub consul: Option<Consul>,
     #[serde(default)]
@@ -69,15 +70,23 @@ pub struct HostConfig {
     pub paths: HashMap<String, PathConfig>,
     pub rate_limit: Option<isize>,
 }
-
+#[derive(Debug, Default, Serialize, Deserialize, Clone)]
+pub struct Auth {
+    #[serde(rename = "type")]
+    pub auth_type: String,
+    #[serde(rename = "creds")]
+    pub auth_cred: String,
+}
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct PathConfig {
     pub servers: Vec<String>,
     pub to_https: Option<bool>,
+    pub sticky_sessions: Option<bool>,
     pub client_headers: Option<Vec<String>>,
     pub server_headers: Option<Vec<String>>,
     pub rate_limit: Option<isize>,
     pub healthcheck: Option<bool>,
+    pub authorization: Option<Auth>,
 }
 #[derive(Debug, Default)]
 pub struct Configuration {
@@ -114,9 +123,43 @@ pub struct AppConfig {
     pub rungroup: Option<String>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize)]
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub struct InnerAuth {
+    pub auth_type: Arc<str>,
+    pub auth_cred: Arc<str>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct InnerMap {
-    pub address: IpAddr,
+    pub address: Arc<str>,
+    pub port: u16,
+    pub is_ssl: bool,
+    pub is_http2: bool,
+    pub to_https: bool,
+    pub rate_limit: Option<isize>,
+    pub healthcheck: Option<bool>,
+    pub authorization: Option<Arc<InnerAuth>>,
+}
+
+#[allow(dead_code)]
+impl InnerMap {
+    pub fn new() -> Self {
+        Self {
+            address: Arc::from("127.0.0.1"),
+            port: Default::default(),
+            is_ssl: Default::default(),
+            is_http2: Default::default(),
+            to_https: Default::default(),
+            rate_limit: Default::default(),
+            healthcheck: Default::default(),
+            authorization: Default::default(),
+        }
+    }
+}
+
+#[derive(Debug, Default, Serialize, Deserialize)]
+pub struct InnerMapForJson {
+    pub address: String,
     pub port: u16,
     pub is_ssl: bool,
     pub is_http2: bool,
@@ -124,25 +167,8 @@ pub struct InnerMap {
     pub rate_limit: Option<isize>,
     pub healthcheck: Option<bool>,
 }
-
-#[allow(dead_code)]
-impl InnerMap {
-    pub fn new() -> Self {
-        Self {
-            address: "127.0.0.1".parse().unwrap(),
-            port: Default::default(),
-            is_ssl: Default::default(),
-            is_http2: Default::default(),
-            to_https: Default::default(),
-            rate_limit: Default::default(),
-            healthcheck: Default::default(),
-        }
-    }
-}
-
-#[derive(Serialize)]
-pub struct UpstreamSnapshot {
-    pub backends: Vec<InnerMap>,
+#[derive(Debug, Default, Serialize, Deserialize)]
+pub struct UpstreamSnapshotForJson {
+    pub backends: Vec<InnerMapForJson>,
     pub requests: usize,
 }
-// pub type UpstreamsSnapshot = HashMap<String, HashMap<String, UpstreamSnapshot>>;

src/utils/tls.rs

@@ -228,26 +228,30 @@ pub fn set_tsl_grade(tls_settings: &mut TlsSettings, grade: &str) {
             let _ = tls_settings.set_min_proto_version(Some(SslVersion::TLS1_2));
             // let _ = tls_settings.set_max_proto_version(Some(SslVersion::TLS1_3));
             let _ = tls_settings.set_cipher_list(CIPHERS.high);
-            let _ = tls_settings.set_ciphersuites(CIPHERS.high);
+            // let _ = tls_settings.set_ciphersuites(CIPHERS.high);
+            let _ = tls_settings.set_cipher_list(CIPHERS.high);
             info!("TLS grade: {:?}, => HIGH", tls_settings.options());
         }
         Some(TlsGrade::MEDIUM) => {
             let _ = tls_settings.set_min_proto_version(Some(SslVersion::TLS1));
             let _ = tls_settings.set_cipher_list(CIPHERS.medium);
-            let _ = tls_settings.set_ciphersuites(CIPHERS.medium);
+            // let _ = tls_settings.set_ciphersuites(CIPHERS.medium);
+            let _ = tls_settings.set_cipher_list(CIPHERS.medium);
             info!("TLS grade: {:?}, => MEDIUM", tls_settings.options());
         }
         Some(TlsGrade::LEGACY) => {
             let _ = tls_settings.set_min_proto_version(Some(SslVersion::SSL3));
             let _ = tls_settings.set_cipher_list(CIPHERS.legacy);
-            let _ = tls_settings.set_ciphersuites(CIPHERS.legacy);
+            // let _ = tls_settings.set_ciphersuites(CIPHERS.legacy);
+            let _ = tls_settings.set_cipher_list(CIPHERS.legacy);
             warn!("TLS grade: {:?}, => UNSAFE", tls_settings.options());
         }
         None => {
             // Defaults to MEDIUM
             let _ = tls_settings.set_min_proto_version(Some(SslVersion::TLS1));
             let _ = tls_settings.set_cipher_list(CIPHERS.medium);
-            let _ = tls_settings.set_ciphersuites(CIPHERS.medium);
+            // let _ = tls_settings.set_ciphersuites(CIPHERS.medium);
+            let _ = tls_settings.set_cipher_list(CIPHERS.medium);
             warn!("TLS grade is not detected defaulting top MEDIUM");
         }
     }

src/utils/tools.rs

@@ -1,4 +1,4 @@
-use crate::utils::structs::{InnerMap, UpstreamSnapshot, UpstreamsDashMap, UpstreamsIdMap};
+use crate::utils::structs::{InnerMap, InnerMapForJson, UpstreamSnapshotForJson, UpstreamsDashMap, UpstreamsIdMap};
 use crate::utils::tls;
 use crate::utils::tls::CertificateConfig;
 use dashmap::DashMap;
@@ -124,11 +124,23 @@ pub fn compare_dashmaps(map1: &UpstreamsDashMap, map2: &UpstreamsDashMap) -> boo
                 return false; // Path exists in map1 but not in map2
             };
             let (vec2, _counter2) = entry2.value();
-            let set1: HashSet<_> = vec1.iter().collect();
-            let set2: HashSet<_> = vec2.iter().collect();
-            if set1 != set2 {
+
+            if vec1.len() != vec2.len() {
                 return false;
             }
+            for item in vec1.iter() {
+                let count1 = vec1.iter().filter(|&x| x == item).count();
+                let count2 = vec2.iter().filter(|&x| x == item).count();
+                if count1 != count2 {
+                    return false;
+                }
+            }
+
+            // let set1: HashSet<_> = vec1.iter().collect();
+            // let set2: HashSet<_> = vec2.iter().collect();
+            // if set1 != set2 {
+            //     return false;
+            // }
         }
     }
     true
@@ -161,16 +173,19 @@ 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: "127.0.0.1".parse().unwrap(),
+                    address: Arc::from("127.0.0.1"),
                     port: 0,
                     is_ssl: false,
                     is_http2: false,
                     to_https: false,
                     rate_limit: None,
                     healthcheck: None,
+                    authorization: None,
                 };
-                cloned.insert(Arc::from(id.as_str()), Arc::from(to_add));
-                cloned.insert(Arc::from(hh.as_str()), Arc::from(x.to_owned()));
+
+                cloned.insert(id, Arc::from(to_add));
+                cloned.insert(hh, Arc::from(x.to_owned()));
+                // println!("CLONNED  :===========> {:?}", cloned);
             }
             new_inner_map.insert(path.clone(), new_vec);
         }
@@ -283,8 +298,19 @@ pub fn upstreams_to_json(upstreams: &UpstreamsDashMap) -> serde_json::Result<Str
 
             inner_map.insert(
                 inner_entry.key().to_string(),
-                UpstreamSnapshot {
-                    backends: backends.iter().map(|a| (**a).clone()).collect(),
+                UpstreamSnapshotForJson {
+                    backends: backends
+                        .iter()
+                        .map(|a| InnerMapForJson {
+                            address: a.address.to_string(),
+                            port: a.port,
+                            is_ssl: a.is_ssl,
+                            is_http2: a.is_http2,
+                            to_https: a.to_https,
+                            rate_limit: a.rate_limit,
+                            healthcheck: a.healthcheck,
+                        })
+                        .collect(),
                     requests: counter.load(Ordering::Relaxed),
                 },
             );
@@ -323,7 +349,7 @@ pub fn upstreams_liveness_json(configured: &UpstreamsDashMap, current: &Upstream
                         false
                     };
                     json!({
-                        "address": backend.address,
+                        "address": &*backend.address,
                         "port": backend.port,
                         "alive": alive
                     })

src/web/bgservice.rs

@@ -54,9 +54,9 @@ impl BackgroundService for LB {
             address: self.config.config_address.clone(),
             masterkey: self.config.master_key.clone(),
             config_api_enabled: self.config.config_api_enabled.clone(),
-            tls_address: self.config.config_tls_address.clone(),
-            tls_certificate: self.config.config_tls_certificate.clone(),
-            tls_key_file: self.config.config_tls_key_file.clone(),
+            // tls_address: self.config.config_tls_address.clone(),
+            // tls_certificate: self.config.config_tls_certificate.clone(),
+            // tls_key_file: self.config.config_tls_key_file.clone(),
             file_server_address: self.config.file_server_address.clone(),
             file_server_folder: self.config.file_server_folder.clone(),
             current_upstreams: self.ump_upst.clone(),
@@ -83,8 +83,8 @@ impl BackgroundService for LB {
                             clone_dashmap_into(&ss.upstreams, &self.ump_upst);
                             let current = self.extraparams.load_full();
                             let mut new = (*current).clone();
-                            new.sticky_sessions = ss.extraparams.sticky_sessions;
                             new.to_https = ss.extraparams.to_https;
+                            new.sticky_sessions = ss.extraparams.sticky_sessions;
                             new.authentication = ss.extraparams.authentication.clone();
                             new.rate_limit = ss.extraparams.rate_limit;
                             self.extraparams.store(Arc::new(new));

src/web/gethosts.rs

@@ -56,49 +56,66 @@ impl GetHost for LB {
     }
 
     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 client_entry = self.client_headers.get(peer);
+        let server_entry = self.server_headers.get(peer);
+        if client_entry.is_none() && server_entry.is_none() {
+            return None;
+        }
         let mut current_path = path;
         let mut clnt_match = None;
-        loop {
-            if let Some(entry) = client_entry.get(current_path) {
-                if !entry.value().is_empty() {
-                    clnt_match = Some(entry.value().clone());
+        if let Some(client_entry) = client_entry {
+            loop {
+                if let Some(entry) = client_entry.get(current_path) {
+                    if !entry.value().is_empty() {
+                        clnt_match = Some(entry.value().clone());
+                        break;
+                    }
+                }
+                if current_path == "/" {
+                    break;
+                }
+                if let Some(pos) = current_path.rfind('/') {
+                    current_path = if pos == 0 { "/" } else { &current_path[..pos] };
+                } else {
                     break;
                 }
-            }
-            if let Some(pos) = current_path.rfind('/') {
-                current_path = if pos == 0 { "/" } else { &current_path[..pos] };
-            } else {
-                break;
             }
         }
         current_path = path;
         let mut serv_match = None;
-        loop {
-            if let Some(entry) = server_entry.get(current_path) {
-                if !entry.value().is_empty() {
-                    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 let Some(server_entry) = server_entry {
+            loop {
+                if let Some(entry) = server_entry.get(current_path) {
                     if !entry.value().is_empty() {
                         serv_match = Some(entry.value().clone());
                         break;
                     }
                 }
+                if current_path == "/" {
+                    if let Some(entry) = server_entry.get("/") {
+                        if !entry.value().is_empty() {
+                            serv_match = Some(entry.value().clone());
+                            break;
+                        }
+                    }
+                    break;
+                }
+                if let Some(pos) = current_path.rfind('/') {
+                    current_path = if pos == 0 { "/" } else { &current_path[..pos] };
+                } else {
+                    break;
+                }
             }
         }
-        Some(GetHostsReturHeaders {
+        let result = GetHostsReturHeaders {
             client_headers: clnt_match,
             server_headers: serv_match,
-        })
+        };
+
+        if result.client_headers.is_some() || result.server_headers.is_some() {
+            Some(result)
+        } else {
+            None
+        }
     }
 }

src/web/proxyhttp.rs

@@ -1,10 +1,13 @@
 use crate::utils::auth::authenticate;
 use crate::utils::metrics::*;
 use crate::utils::structs::{AppConfig, Extraparams, Headers, InnerMap, UpstreamsDashMap, UpstreamsIdMap};
-use crate::web::gethosts::GetHost;
+use crate::web::gethosts::{GetHost, GetHostsReturHeaders};
 use arc_swap::ArcSwap;
 use async_trait::async_trait;
 use axum::body::Bytes;
+use dashmap::DashMap;
+// use x509_parser::asn1_rs::ToDer;
+use itoa::Buffer;
 use log::{debug, error, warn};
 use once_cell::sync::Lazy;
 use pingora::http::{RequestHeader, ResponseHeader, StatusCode};
@@ -12,14 +15,20 @@ use pingora::prelude::*;
 use pingora::ErrorSource::Upstream;
 use pingora_core::listeners::ALPN;
 use pingora_core::prelude::HttpPeer;
+// use pingora_core::protocols::TcpKeepalive;
 use pingora_limits::rate::Rate;
 use pingora_proxy::{ProxyHttp, Session};
-// use std::net::{IpAddr, Ipv4Addr};
+use sha2::{Digest, Sha256};
+use std::cell::RefCell;
+// use std::collections::BTreeMap;
+use std::fmt::Write;
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::time::Instant;
 
 static RATE_LIMITER: Lazy<Rate> = Lazy::new(|| Rate::new(Duration::from_secs(1)));
+static REVERSE_STORE: Lazy<DashMap<String, String>> = Lazy::new(|| DashMap::new());
+thread_local! {static IP_BUFFER: RefCell<String> = RefCell::new(String::with_capacity(50));}
 
 #[derive(Clone)]
 pub struct LB {
@@ -33,15 +42,15 @@ pub struct LB {
 }
 
 pub struct Context {
-    backend_id: Arc<str>,
-    // backend_id: Arc<(IpAddr, u16, bool)>,
+    backend_id: Option<String>,
     to_https: bool,
-    redirect_to: Arc<str>,
+    sticky_sessions: bool,
+    redirect_to: Option<String>,
     start_time: Instant,
     hostname: Option<Arc<str>>,
     upstream_peer: Option<Arc<InnerMap>>,
     extraparams: arc_swap::Guard<Arc<Extraparams>>,
-    client_headers: Arc<Vec<(Arc<str>, Arc<str>)>>,
+    client_headers: Option<Arc<Vec<(Arc<str>, Arc<str>)>>>,
 }
 
 #[async_trait]
@@ -49,64 +58,72 @@ impl ProxyHttp for LB {
     type CTX = Context;
     fn new_ctx(&self) -> Self::CTX {
         Context {
-            backend_id: Arc::from(""),
+            backend_id: None,
             to_https: false,
-            redirect_to: Arc::from(""),
+            sticky_sessions: false,
+            redirect_to: None,
             start_time: Instant::now(),
             hostname: None,
             upstream_peer: None,
             extraparams: self.extraparams.load(),
-            client_headers: Arc::new(Vec::new()),
+            client_headers: None,
         }
     }
     async fn request_filter(&self, session: &mut Session, _ctx: &mut Self::CTX) -> Result<bool> {
-        let ep = _ctx.extraparams.as_ref();
-
-        if let Some(auth) = ep.authentication.get("authorization") {
-            let authenticated = authenticate(auth.value(), &session);
+        // let ep = _ctx.extraparams.as_ref();
+        if let Some(auth) = &_ctx.extraparams.authentication {
+            let authenticated = authenticate(&auth.auth_type, &auth.auth_cred, &session);
             if !authenticated {
                 let _ = session.respond_error(401).await;
                 warn!("Forbidden: {:?}, {}", session.client_addr(), session.req_header().uri.path());
                 return Ok(true);
             }
-        };
-
+        }
         let hostname = return_header_host_from_upstream(session, &self.ump_upst);
         _ctx.hostname = hostname;
-
         let mut backend_id = None;
 
-        if ep.sticky_sessions {
+        if _ctx.extraparams.sticky_sessions {
             if let Some(cookies) = session.req_header().headers.get("cookie") {
                 if let Ok(cookie_str) = cookies.to_str() {
-                    for cookie in cookie_str.split(';') {
-                        let trimmed = cookie.trim();
-                        if let Some(value) = trimmed.strip_prefix("backend_id=") {
-                            backend_id = Some(value);
-                            break;
-                        }
+                    if let Some(pos) = cookie_str.find("backend_id=") {
+                        let value = &cookie_str[pos + "backend_id=".len()..];
+                        let end = value.find(';').unwrap_or(value.len());
+                        backend_id = Some(&value[..end]);
                     }
                 }
             }
         }
-
         match _ctx.hostname.as_ref() {
             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, session.req_header().uri.path(), backend_id);
+
                 match optioninnermap {
                     None => return Ok(false),
                     Some(ref innermap) => {
-                        if let Some(rate) = innermap.rate_limit.or(ep.rate_limit) {
-                            // let rate_key = session.client_addr().and_then(|addr| addr.as_inet()).map(|inet| inet.ip().to_string()).unwrap_or_else(|| host.to_string());
+                        // Inner auth works only if global is disabled.
+                        if let Some(auth) = &innermap.authorization {
+                            if _ctx.extraparams.authentication.is_none() {
+                                let authenticated = authenticate(&auth.auth_type, &auth.auth_cred, &session);
+                                if !authenticated {
+                                    let _ = session.respond_error(401).await;
+                                    warn!("Forbidden: {:?}, {}", session.client_addr(), session.req_header().uri.path());
+                                    return Ok(true);
+                                }
+                            }
+                        }
+
+                        if let Some(rate) = innermap.rate_limit.or(_ctx.extraparams.rate_limit) {
                             let rate_key = session.client_addr().and_then(|addr| addr.as_inet()).map(|inet| inet.ip());
                             let curr_window_requests = RATE_LIMITER.observe(&rate_key, 1);
                             if curr_window_requests > rate {
-                                let mut header = ResponseHeader::build(429, None).unwrap();
-                                header.insert_header("X-Rate-Limit-Limit", rate.to_string()).unwrap();
-                                header.insert_header("X-Rate-Limit-Remaining", "0").unwrap();
-                                header.insert_header("X-Rate-Limit-Reset", "1").unwrap();
+                                let mut buf = Buffer::new();
+                                let rate_str = buf.format(rate);
+                                let mut header = ResponseHeader::build(429, None)?;
+                                header.insert_header("X-Rate-Limit-Limit", rate_str)?;
+                                header.insert_header("X-Rate-Limit-Remaining", "0")?;
+                                header.insert_header("X-Rate-Limit-Reset", "1")?;
                                 session.set_keepalive(None);
                                 session.write_response_header(Box::new(header), true).await?;
                                 debug!("Rate limited: {:?}, {}", rate_key, rate);
@@ -124,28 +141,50 @@ impl ProxyHttp for LB {
         match ctx.hostname.as_ref() {
             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()));
+                    let mut peer = Box::new(HttpPeer::new((&*innermap.address, innermap.port), innermap.is_ssl, hostname.to_string()));
+
                     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 {
+
+                    // Experimental optionsv
+                    // The following TCP optimizations were tested but caused performance degrade under heavy load:
+                    // peer.options.tcp_keepalive = Some(TcpKeepalive {
+                    //     idle: Duration::from_secs(60),
+                    //     interval: Duration::from_secs(10),
+                    //     count: 5,
+                    //     user_timeout: Duration::from_secs(30),
+                    // });
+                    //
+                    // peer.options.idle_timeout = Some(Duration::from_secs(300));
+                    // peer.options.tcp_recv_buf = Some(128 * 1024);
+                    // End of experimental options
+
+                    if ctx.extraparams.to_https.unwrap_or(false) || 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);
+                                    let port = self.config.proxy_port_tls.unwrap_or(443);
                                     ctx.to_https = true;
-                                    ctx.redirect_to = Arc::from(format!("https://{}:{}{}", host, port, uri));
+                                    let mut s = String::with_capacity(64);
+                                    write!(&mut s, "https://{}:{}{}", host, port, uri).unwrap_or_default();
+                                    ctx.redirect_to = Some(s);
                                 }
                             }
                         }
                     }
-                    ctx.backend_id = Arc::from(format!("{}:{}:{}", innermap.address, innermap.port, innermap.is_ssl));
+
+                    if ctx.extraparams.sticky_sessions {
+                        let mut s = String::with_capacity(64);
+                        write!(&mut s, "{}:{}:{}", innermap.address, innermap.port, innermap.is_ssl).unwrap();
+                        ctx.backend_id = Some(s);
+                        ctx.sticky_sessions = true;
+                    }
                     Ok(peer)
                 }
                 None => {
@@ -162,7 +201,6 @@ impl ProxyHttp for LB {
                 }
             },
             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 {
                     error!("Failed to send error response: {:?}", e);
                 }
@@ -178,44 +216,70 @@ impl ProxyHttp for LB {
     }
 
     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.as_ref())?;
-        }
-        if let Some(peer) = ctx.upstream_peer.as_ref() {
-            upstream_request.insert_header("X-Forwarded-For", peer.address.to_string())?;
+        if let Some(hostname) = ctx.hostname.as_deref() {
+            upstream_request.insert_header("Host", hostname)?;
         }
 
-        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, v) in server_headers.iter() {
-                    upstream_request.insert_header(k.to_string(), v.as_ref())?;
-                }
-            }
-            if let Some(client_headers) = headers.client_headers {
-                ctx.client_headers = Arc::new(client_headers);
+        if let Some(client_ip) = session.client_addr() {
+            IP_BUFFER.with(|buffer| {
+                let mut buf = buffer.borrow_mut();
+                buf.clear();
+                write!(buf, "{}", client_ip).unwrap_or(());
+                upstream_request.append_header("x-forward-for", buf.as_str()).unwrap_or(false);
+            });
+        }
+        let hostname = ctx.hostname.as_deref().unwrap_or("localhost");
+        let path = session.req_header().uri.path();
+        let GetHostsReturHeaders { server_headers, client_headers } = match self.get_header(hostname, path) {
+            Some(h) => h,
+            None => return Ok(()),
+        };
+
+        if let Some(sh) = server_headers {
+            for (k, v) in sh {
+                upstream_request.insert_header(k.to_string(), v.as_ref())?;
             }
         }
-
+        if let Some(ch) = client_headers {
+            ctx.client_headers = Some(Arc::new(ch));
+        }
         Ok(())
     }
     async fn response_filter(&self, session: &mut Session, _upstream_response: &mut ResponseHeader, ctx: &mut Self::CTX) -> Result<()> {
-        if ctx.extraparams.sticky_sessions {
-            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.sticky_sessions {
+            if let Some(bid) = ctx.backend_id.clone() {
+                if REVERSE_STORE.get(&*bid).is_none() {
+                    let mut hasher = Sha256::new();
+                    hasher.update(bid.clone().into_bytes());
+                    let hash = hasher.finalize();
+                    let hex_hash = base16ct::lower::encode_string(&hash);
+                    let hh = hex_hash[0..50].to_string();
+                    REVERSE_STORE.insert(bid.clone(), hh.clone());
+                    REVERSE_STORE.insert(hh.clone(), bid.clone());
+                }
+                if let Some(tt) = REVERSE_STORE.get(&*bid) {
+                    let _ = _upstream_response.insert_header("set-cookie", format!("backend_id={}; Path=/; Max-Age=600; HttpOnly; SameSite=Lax", tt.value()));
+                }
             }
         }
+
         if ctx.to_https {
             let mut redirect_response = ResponseHeader::build(StatusCode::MOVED_PERMANENTLY, None)?;
-            redirect_response.insert_header("Location", ctx.redirect_to.as_ref())?;
+            redirect_response.insert_header("Location", ctx.redirect_to.clone().unwrap_or(String::from("/")))?;
             redirect_response.insert_header("Content-Length", "0")?;
             session.write_response_header(Box::new(redirect_response), false).await?;
         }
 
-        for (k, v) in ctx.client_headers.iter() {
-            _upstream_response.insert_header(k.to_string(), v.as_ref())?;
+        // ALLOCATIONS !
+        if let Some(client_headers) = &ctx.client_headers {
+            for (k, v) in client_headers.iter() {
+                _upstream_response.append_header(k.to_string(), v.as_ref())?;
+            }
         }
+        // END ALLOCATIONS !
 
-        session.set_keepalive(Some(300));
+        // session.set_keepalive(Some(300));
+        // println!("session.get_keepalive: {:?}", session.get_keepalive());
         Ok(())
     }
 
@@ -224,8 +288,7 @@ impl ProxyHttp for LB {
         debug!("{}, response code: {response_code}", self.request_summary(session, ctx));
         let m = &MetricTypes {
             method: session.req_header().method.clone(),
-            // method: Arc::from(session.req_header().method.as_str()),
-            code: session.response_written().map(|resp| resp.status.as_str().to_owned()).unwrap_or("0".to_string()),
+            code: session.response_written().map(|resp| resp.status),
             latency: ctx.start_time.elapsed(),
             version: session.req_header().version,
             upstream: ctx.hostname.clone().unwrap_or(Arc::from("localhost")),
@@ -234,50 +297,6 @@ impl ProxyHttp for LB {
     }
 }
 
-// use moka::sync::Cache;
-// Using Moka for a high-concurrency, size-limited cache
-// static HOST_CACHE: Lazy<Cache<String, Arc<str>>> = Lazy::new(|| {
-//     Cache::builder()
-//         .max_capacity(10_000) // Limits memory usage if attacked
-//         .build()
-// });
-// fn return_header_host_cached(session: &Session) -> Option<Arc<str>> {
-//     let host_str = if session.is_http2() {
-//         session.req_header().uri.host()?
-//     } else {
-//         let h = session.req_header().headers.get("host")?.to_str().ok()?;
-//         h.split_once(':').map_or(h, |(host, _)| host)
-//     };
-//     HOST_CACHE
-//         .get_with(host_str.to_string(), || {
-//             Arc::from(host_str)
-//         })
-//         .into()
-// }
-
-// use dashmap::DashMap;
-// A simple cache to reuse Arcs for common hostnames
-// static HOST_CACHE: Lazy<DashMap<String, Arc<str>>> = Lazy::new(|| DashMap::with_capacity(200));
-//
-// fn return_header_host_cached(session: &Session) -> Option<Arc<str>> {
-//     let host_str = if session.is_http2() {
-//         session.req_header().uri.host()?
-//     } else {
-//         let h = session.req_header().headers.get("host")?.to_str().ok()?;
-//         h.split_once(':').map_or(h, |(host, _)| host)
-//     };
-//
-//     // Fast path: check if we already have an Arc for this host
-//     if let Some(arc) = HOST_CACHE.get(host_str) {
-//         return Some(arc.clone()); // Only an atomic increment!
-//     }
-//
-//     // Slow path: create new Arc and cache it
-//     let new_arc: Arc<str> = Arc::from(host_str);
-//     HOST_CACHE.insert(host_str.to_string(), new_arc.clone());
-//     Some(new_arc)
-// }
-
 fn return_header_host_from_upstream(session: &Session, ump_upst: &UpstreamsDashMap) -> Option<Arc<str>> {
     let host_str = if session.is_http2() {
         session.req_header().uri.host()?

src/web/start.rs

@@ -31,9 +31,9 @@ pub fn run() {
     let sh_config = Arc::new(DashMap::new());
 
     let ec_config = Arc::new(ArcSwap::from_pointee(Extraparams {
-        sticky_sessions: false,
         to_https: None,
-        authentication: DashMap::new(),
+        sticky_sessions: false,
+        authentication: None,
         rate_limit: None,
     }));
 

src/web/webserver.rs

@@ -7,7 +7,7 @@ use axum::http::{Response, StatusCode};
 use axum::response::IntoResponse;
 use axum::routing::{get, post};
 use axum::{Json, Router};
-use axum_server::tls_openssl::OpenSSLConfig;
+// use axum_server::tls_openssl::OpenSSLConfig;
 use futures::channel::mpsc::Sender;
 use futures::SinkExt;
 use jsonwebtoken::{encode, EncodingKey, Header};
@@ -15,7 +15,7 @@ use log::{error, info, warn};
 use prometheus::{gather, Encoder, TextEncoder};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::net::SocketAddr;
+// use std::net::SocketAddr;
 use std::sync::Arc;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 use tokio::net::TcpListener;
@@ -64,17 +64,17 @@ pub async fn run_server(config: &APIUpstreamProvider, mut to_return: Sender<Conf
         .route("/status", get(status))
         .with_state(app_state);
 
-    if let Some(value) = &config.tls_address {
-        let cf = OpenSSLConfig::from_pem_file(config.tls_certificate.clone().unwrap(), config.tls_key_file.clone().unwrap()).unwrap();
-        let addr: SocketAddr = value.parse().expect("Unable to parse socket address");
-        let tls_app = app.clone();
-        tokio::spawn(async move {
-            if let Err(e) = axum_server::bind_openssl(addr, cf).serve(tls_app.into_make_service()).await {
-                eprintln!("TLS server failed: {}", e);
-            }
-        });
-        info!("Starting the TLS API server on: {}", value);
-    }
+    // if let Some(value) = &config.tls_address {
+    //     let cf = OpenSSLConfig::from_pem_file(config.tls_certificate.clone().unwrap(), config.tls_key_file.clone().unwrap()).unwrap();
+    //     let addr: SocketAddr = value.parse().expect("Unable to parse socket address");
+    //     let tls_app = app.clone();
+    //     tokio::spawn(async move {
+    //         if let Err(e) = axum_server::bind_openssl(addr, cf).serve(tls_app.into_make_service()).await {
+    //             eprintln!("TLS server failed: {}", e);
+    //         }
+    //     });
+    //     info!("Starting the TLS API server on: {}", value);
+    // }
 
     if let (Some(address), Some(folder)) = (&config.file_server_address, &config.file_server_folder) {
         let static_files = ServeDir::new(folder);