Merge commit '152e000b1b933fc7285fe3fc7fb204106ac01c6b' into HEAD

This commit is contained in:
Winston Howes
2026-06-18 11:39:28 -07:00
462 changed files with 19132 additions and 6630 deletions
+2
View File
@@ -200,6 +200,7 @@ async fn http_connect_accept(
protocol: NetworkProtocol::HttpsConnect,
host: host.clone(),
port: authority.port,
environment_id: None,
client_addr: client.clone(),
method: Some("CONNECT".to_string()),
command: None,
@@ -683,6 +684,7 @@ async fn http_plain_proxy(
protocol: NetworkProtocol::Http,
host: host.clone(),
port,
environment_id: None,
client_addr: client.clone(),
method: Some(req.method().as_str().to_string()),
command: None,
@@ -79,6 +79,7 @@ pub struct NetworkPolicyRequest {
pub protocol: NetworkProtocol,
pub host: String,
pub port: u16,
pub environment_id: Option<String>,
pub client_addr: Option<String>,
pub method: Option<String>,
pub command: Option<String>,
@@ -89,6 +90,7 @@ pub struct NetworkPolicyRequestArgs {
pub protocol: NetworkProtocol,
pub host: String,
pub port: u16,
pub environment_id: Option<String>,
pub client_addr: Option<String>,
pub method: Option<String>,
pub command: Option<String>,
@@ -101,6 +103,7 @@ impl NetworkPolicyRequest {
protocol,
host,
port,
environment_id,
client_addr,
method,
command,
@@ -110,6 +113,7 @@ impl NetworkPolicyRequest {
protocol,
host,
port,
environment_id,
client_addr,
method,
command,
@@ -625,6 +629,7 @@ mod tests {
protocol: NetworkProtocol::Http,
host: "example.com".to_string(),
port: 80,
environment_id: None,
client_addr: None,
method: None,
command: None,
@@ -686,6 +691,7 @@ mod tests {
protocol: NetworkProtocol::Http,
host: "blocked.com".to_string(),
port: 80,
environment_id: None,
client_addr: Some("127.0.0.1:1234".to_string()),
method: Some("GET".to_string()),
command: None,
@@ -729,6 +735,7 @@ mod tests {
protocol: NetworkProtocol::Http,
host: "example.com".to_string(),
port: 80,
environment_id: None,
client_addr: None,
method: Some("GET".to_string()),
command: None,
@@ -779,6 +786,7 @@ mod tests {
protocol: NetworkProtocol::Http,
host: "example.com".to_string(),
port: 80,
environment_id: None,
client_addr: None,
method: Some("GET".to_string()),
command: None,
@@ -865,6 +873,7 @@ mod tests {
protocol: NetworkProtocol::Http,
host: "127.0.0.1".to_string(),
port: 80,
environment_id: None,
client_addr: None,
method: Some("GET".to_string()),
command: None,
+2
View File
@@ -268,6 +268,7 @@ async fn handle_socks5_tcp(
protocol: NetworkProtocol::Socks5Tcp,
host: host.clone(),
port,
environment_id: None,
client_addr: client.clone(),
method: None,
command: None,
@@ -624,6 +625,7 @@ async fn inspect_socks5_udp(
protocol: NetworkProtocol::Socks5Udp,
host: host.clone(),
port,
environment_id: None,
client_addr: client.clone(),
method: None,
command: None,