Merge branch 'WIN-54-http-body-filter' into win-47-file-filter

Author: itsamegraf

Cargo.lock

@@ -2,7 +2,6 @@ use std::{
     collections::HashMap,
     env::{self, temp_dir},
     fs::File,
-    os::unix::process::ExitStatusExt,
     path::{Path, PathBuf},
     process::Stdio,
     time::SystemTime,
@@ -15,6 +14,8 @@ use mirrord_auth::credentials::CiApiKey;
 use mirrord_config::{LayerConfig, ci::CiConfig, config::ConfigContext};
 use mirrord_operator::client::OperatorApi;
 use mirrord_progress::{Progress, ProgressTracker};
+#[cfg(not(target_os = "windows"))]
+use os::unix::process::ExitStatusExt;
 use rand::distr::{Alphanumeric, SampleString};
 use serde::{Deserialize, Serialize};
 use tokio::{
@@ -209,7 +210,8 @@ impl MirrordCi {
     /// Very similar to to how `mirrord exec` behaves, except that here we `spawn` a child process
     /// that'll keep running, and we store the pid of this process in [`MirrordCiStore`] so we can
     /// kill it later.
-    #[cfg_attr(target_os = "windows", allow(unused))]
+    // #[cfg_attr(target_os = "windows", allow(unused))]
+    #[cfg(not(target_os = "windows"))]
     #[tracing::instrument(level = Level::TRACE, skip(progress), err)]
     pub(super) async fn prepare_command<P: Progress>(
         self,

mirrord/cli/src/ci.rs

@@ -1,7 +1,7 @@
 use tracing::Level;
 
 use super::CiResult;
-use crate::MirrordCiStore;
+use crate::ci::MirrordCiStore;
 #[cfg(not(target_os = "windows"))]
 use crate::ci::error::CiError;
 

mirrord/cli/src/ci/stop.rs

@@ -9,7 +9,7 @@ use mirrord_config::{
         NetworkConfig,
         incoming::{
             IncomingConfig, IncomingMode as ConfigIncomingMode,
-            http_filter::{HttpFilterConfig, InnerFilter, PortList},
+            http_filter::{BodyFilter, HttpFilterConfig, InnerFilter},
         },
         outgoing::OutgoingConfig,
     },
@@ -18,7 +18,7 @@ use mirrord_config::{
 use mirrord_intproxy_protocol::PortSubscription;
 use mirrord_protocol::{
     Port,
-    tcp::{Filter, HttpFilter, HttpMethodFilter, MirrorType, StealType},
+    tcp::{Filter, HttpBodyFilter, HttpFilter, HttpMethodFilter, MirrorType, StealType},
 };
 
 use crate::{
@@ -213,9 +213,10 @@ impl IncomingMode {
             let ports = config
                 .http_filter
                 .ports
-                .as_ref()
-                .map(|port_list| port_list.iter().copied().collect())
-                .unwrap_or(PortList::default().into());
+                .get_or_insert_default()
+                .iter()
+                .copied()
+                .collect();
 
             let filter = Self::parse_http_filter(&config.http_filter);
 
@@ -228,12 +229,23 @@ impl IncomingMode {
         }
     }
 
+    fn parse_body_filter(filter: &BodyFilter) -> HttpBodyFilter {
+        match filter {
+            BodyFilter::Json { query, matches } => HttpBodyFilter::Json {
+                query: query.clone(),
+                matches: Filter::new(matches.clone())
+                    .expect("invalid json body filter `matches` string"),
+            },
+        }
+    }
+
     fn parse_http_filter(http_filter_config: &HttpFilterConfig) -> HttpFilter {
         match http_filter_config {
             HttpFilterConfig {
                 path_filter: Some(path),
                 header_filter: None,
                 method_filter: None,
+                body_filter: None,
                 all_of: None,
                 any_of: None,
                 ports: _ports,
@@ -243,6 +255,7 @@ impl IncomingMode {
                 path_filter: None,
                 header_filter: Some(header),
                 method_filter: None,
+                body_filter: None,
                 all_of: None,
                 any_of: None,
                 ports: _ports,
@@ -252,6 +265,7 @@ impl IncomingMode {
                 path_filter: None,
                 header_filter: None,
                 method_filter: Some(method),
+                body_filter: None,
                 all_of: None,
                 any_of: None,
                 ports: _ports,
@@ -263,6 +277,17 @@ impl IncomingMode {
                 path_filter: None,
                 header_filter: None,
                 method_filter: None,
+                body_filter: Some(filter),
+                all_of: None,
+                any_of: None,
+                ports: _ports,
+            } => HttpFilter::Body(Self::parse_body_filter(filter)),
+
+            HttpFilterConfig {
+                path_filter: None,
+                header_filter: None,
+                method_filter: None,
+                body_filter: None,
                 all_of: Some(filters),
                 any_of: None,
                 ports: _ports,
@@ -272,6 +297,7 @@ impl IncomingMode {
                 path_filter: None,
                 header_filter: None,
                 method_filter: None,
+                body_filter: None,
                 all_of: None,
                 any_of: Some(filters),
                 ports: _ports,
@@ -294,6 +320,9 @@ impl IncomingMode {
                 InnerFilter::Method { method } => HttpFilter::Method(
                     HttpMethodFilter::from_str(method).expect("invalid method filter string"),
                 ),
+                InnerFilter::Body(body_filter) => {
+                    HttpFilter::Body(Self::parse_body_filter(body_filter))
+                }
             })
             .collect();
 

mirrord/layer-lib/src/setup/windows.rs

@@ -2,7 +2,7 @@
 use std::os::unix::io::RawFd;
 use std::{
     convert::TryFrom,
-    net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
+    net::{Ipv4Addr, Ipv6Addr, SocketAddr},
     sync::Arc,
 };
 

mirrord/layer-lib/src/socket/ops.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mirrord-protocol"
-version = "1.23.0"
+version = "1.23.1"
 authors.workspace = true
 description.workspace = true
 documentation.workspace = true