Github/aralez
1
0
Fork 0
mirror of https://github.com/sadoyan/aralez.git synced 2026-10-23 06:01:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Finalized Consul integration,

Browse Source 
Cached headers bug fix
This commit is contained in:
Ara Sadoyan
2026-08-31 19:18:10 +02:00
parent f575007044
commit d2d4100cba
7 changed files with 20 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/httpclient.rs
+2 -24
View File
@@ -3,9 +3,7 @@ use crate::utils::kuberconsul::match_path;
use crate::utils::kubernetes::KubeEndpoints;
use crate::utils::structs::{GlobalServiceMapping, InnerMap};
use ahash::HashMap;
use base64::{engine::general_purpose, Engine as _};
use dashmap::DashMap;
use log::warn;
use pingora_core::connectors::http::Connector;
use pingora_core::listeners::ALPN;
use pingora_core::prelude::HttpPeer;
@@ -66,28 +64,8 @@ fn parse_services(json: Vec<u8>) -> Result<ConsulServices, serde_json::Error> {
"aralez.to_https" => internal.to_https = value.parse::<bool>().ok(),
"aralez.auth" => internal.auth = Option::from(value.to_string()),
"aralez.redirect" => internal.redirect = Option::from(value.to_string()),
"aralez.client_headers" => {
let decoded_bytes = general_purpose::STANDARD.decode(value).unwrap_or_default();
let decoded: Result<Vec<String>, serde_json::Error> = serde_json::from_slice(&decoded_bytes);
match decoded {
Ok(dd) => internal.client_headers = Some(dd),
Err(er) => {
warn!("Could not decode client headers: {}", er);
internal.client_headers = None
}
}
}
"aralez.server_headers" => {
let decoded_bytes = general_purpose::STANDARD.decode(value).unwrap_or_default();
let decoded: Result<Vec<String>, serde_json::Error> = serde_json::from_slice(&decoded_bytes);
match decoded {
Ok(dd) => internal.server_headers = Some(dd),
Err(er) => {
warn!("Could not decode server headers: {}", er);
internal.server_headers = None
}
}
}
"aralez.client_header" => internal.client_headers.get_or_insert_default().push(value.to_string()),
"aralez.server_header" => internal.server_headers.get_or_insert_default().push(value.to_string()),
_ => {}
}
}
src/web/proxyhttp.rs
+4 -3
View File
@@ -310,15 +310,16 @@ impl ProxyHttp for LB {
let _ = _upstream_response.append_header("set-cookie", buf.as_str());
}
}
Ok(())
}
async fn upstream_response_filter(&self, _session: &mut Session, upstream_response: &mut ResponseHeader, ctx: &mut Self::CTX) -> Result<()> {
if let Some(client_headers) = &ctx.client_headers {
for (k, v) in client_headers.iter() {
_upstream_response.append_header(k.clone(), v.as_ref())?;
upstream_response.append_header(k.clone(), v.as_ref())?;
}
}
Ok(())
}
async fn logging(&self, session: &mut Session, _e: Option<&pingora::Error>, ctx: &mut Self::CTX) {
let response_code = session.response_written().map_or(0, |resp| resp.status.as_u16());
let m = &MetricTypes {