Merge pull request #1 from preloopdev/mitm-proxy

Mitm proxy

Author: Bnjoroge1

.gitignore

@@ -5,3 +5,7 @@
 *.log
 .DS_Store
 
+experiments/mitm/.cache/
+experiments/mitm/captures/
+experiments/mitm/reports/
+__pycache__/

crates/aksh-conformance/src/main.rs

@@ -3,9 +3,9 @@
 use std::path::PathBuf;
 use std::process::Stdio;
 
+use aksh_gha_parser::{expand_jobs, parse_workflow};
 use anyhow::{bail, Context};
 use clap::{Parser, Subcommand};
-use aksh_gha_parser::{expand_jobs, parse_workflow};
 use tokio::process::Command;
 use walkdir::WalkDir;
 
@@ -122,11 +122,7 @@ fn looks_like_workflow(text: &str) -> bool {
     })
 }
 
-async fn compare_command(
-    upstream: String,
-    aksh: String,
-    args: Vec<String>,
-) -> anyhow::Result<()> {
+async fn compare_command(upstream: String, aksh: String, args: Vec<String>) -> anyhow::Result<()> {
     let upstream_output = Command::new(&upstream)
         .args(&args)
         .stdout(Stdio::piped())

crates/aksh-gha-parser/src/eval.rs

@@ -10,8 +10,8 @@
 
 use std::collections::BTreeMap;
 
-use indexmap::IndexMap;
 use aksh_gha_expressions::{eval_expression, Context};
+use indexmap::IndexMap;
 use serde_json::{Map, Value};
 
 /// Resolve all `${{ }}` expressions in a string using the given context.
@@ -119,10 +119,8 @@ pub fn build_context(
         .collect();
     ctx.insert("vars", Value::Object(vars_value));
 
-    let matrix_value: Map<String, Value> = matrix
-        .iter()
-        .map(|(k, v)| (k.clone(), v.clone()))
-        .collect();
+    let matrix_value: Map<String, Value> =
+        matrix.iter().map(|(k, v)| (k.clone(), v.clone())).collect();
     ctx.insert("matrix", Value::Object(matrix_value));
 
     ctx.insert("strategy", strategy.clone());
@@ -155,10 +153,7 @@ mod tests {
         let mut env = Map::new();
         env.insert("MY_VAR".to_owned(), Value::String("hello".to_owned()));
         ctx.insert("env", Value::Object(env));
-        ctx.insert(
-            "matrix",
-            json!({"os": "ubuntu-latest", "node": "18"}),
-        );
+        ctx.insert("matrix", json!({"os": "ubuntu-latest", "node": "18"}));
         ctx
     }
 
@@ -201,10 +196,7 @@ mod tests {
     #[test]
     fn resolve_env_value() {
         let ctx = make_context();
-        assert_eq!(
-            resolve_string("${{ env.MY_VAR }}", &ctx).unwrap(),
-            "hello"
-        );
+        assert_eq!(resolve_string("${{ env.MY_VAR }}", &ctx).unwrap(), "hello");
     }
 
     #[test]

crates/aksh-gha-parser/src/job_builder.rs

@@ -6,13 +6,12 @@
 use std::collections::BTreeMap;
 
 use aksh_gha_protocol::azdo::{
-    AgentJobRequestMessage, EndpointAuthorization, MaskHint, MaskType,
-    PipelineContextData, ServiceEndpoint, TaskResources, TaskStep,
-    TimelineReference, VariableValue,
+    AgentJobRequestMessage, EndpointAuthorization, MaskHint, MaskType, PipelineContextData,
+    ServiceEndpoint, TaskResources, TaskStep, TimelineReference, VariableValue,
 };
 
-use crate::JobPlan;
 use crate::eval::{build_context, resolve_map, resolve_string};
+use crate::JobPlan;
 use aksh_gha_expressions::Context;
 use serde_json::Value;
 
@@ -67,7 +66,9 @@ pub fn build_agent_job_message(
         variables.insert(k.clone(), VariableValue::new(v));
     }
     for (k, v) in global_env {
-        variables.entry(k.clone()).or_insert_with(|| VariableValue::new(v));
+        variables
+            .entry(k.clone())
+            .or_insert_with(|| VariableValue::new(v));
     }
     for (k, v) in vars {
         variables.insert(k.clone(), VariableValue::new(v));
@@ -90,8 +91,7 @@ pub fn build_agent_job_message(
         .collect();
 
     // Service endpoints (SystemVssConnection)
-    let mut endpoints = Vec::new();
-    endpoints.push(ServiceEndpoint {
+    let endpoints = vec![ServiceEndpoint {
         data: BTreeMap::new(),
         name: "SystemVssConnection".to_owned(),
         endpoint_type: Some("azdoserver".to_owned()),
@@ -108,7 +108,7 @@ pub fn build_agent_job_message(
         )]),
         is_shared: Some(false),
         service_owner: Some("github".to_owned()),
-    });
+    }];
 
     let resources = TaskResources {
         endpoints,
@@ -153,10 +153,7 @@ pub fn build_agent_job_message(
         "needs".to_owned(),
         PipelineContextData::Dict(BTreeMap::new()),
     );
-    context_data.insert(
-        "strategy".to_owned(),
-        to_context_data(&strategy_value),
-    );
+    context_data.insert("strategy".to_owned(), to_context_data(&strategy_value));
 
     // Actions download info
     let actions_download_info = BTreeMap::new();
@@ -180,7 +177,7 @@ pub fn build_agent_job_message(
 }
 
 /// Build a `TaskStep` from a `StepPlan`.
-fn build_task_step(step: &crate::StepPlan, index: usize, context: &Context) -> TaskStep {
+fn build_task_step(step: &crate::StepPlan, _index: usize, context: &Context) -> TaskStep {
     let step_id = uuid::Uuid::new_v4();
 
     // Resolve expressions in env and with
@@ -189,7 +186,8 @@ fn build_task_step(step: &crate::StepPlan, index: usize, context: &Context) -> T
         .with
         .iter()
         .map(|(k, v)| {
-            let resolved = resolve_string(&v.to_string(), context).unwrap_or_else(|_| v.to_string());
+            let resolved =
+                resolve_string(&v.to_string(), context).unwrap_or_else(|_| v.to_string());
             (k.clone(), resolved)
         })
         .collect();
@@ -209,14 +207,15 @@ fn build_task_step(step: &crate::StepPlan, index: usize, context: &Context) -> T
         display_name: step.name.clone(),
         condition,
         script: run,
-        reference: step.uses.as_ref().map(|uses| {
-            aksh_gha_protocol::azdo::TaskReference {
+        reference: step
+            .uses
+            .as_ref()
+            .map(|uses| aksh_gha_protocol::azdo::TaskReference {
                 id: None,
                 name: Some(uses.clone()),
                 version: None,
                 reference_type: None,
-            }
-        }),
+            }),
         inputs: with,
         env,
         continue_on_error: None,
@@ -272,13 +271,23 @@ jobs:
             "sha": "abc123"
         });
 
-        let msg = build_agent_job_message(plan, &github, &BTreeMap::new(), &BTreeMap::new(), &BTreeMap::new())
-            .unwrap();
+        let msg = build_agent_job_message(
+            plan,
+            &github,
+            &BTreeMap::new(),
+            &BTreeMap::new(),
+            &BTreeMap::new(),
+        )
+        .unwrap();
 
         assert!(!msg.steps.is_empty());
         assert!(msg.timeline.id != uuid::Uuid::nil());
         assert!(msg.job_id != uuid::Uuid::nil());
-        assert!(msg.resources.endpoints.iter().any(|e| e.name == "SystemVssConnection"));
+        assert!(msg
+            .resources
+            .endpoints
+            .iter()
+            .any(|e| e.name == "SystemVssConnection"));
     }
 
     #[test]
@@ -299,8 +308,14 @@ jobs:
         assert_eq!(plans.len(), 2);
 
         let github = serde_json::json!({"event_name": "push"});
-        let msg = build_agent_job_message(&plans[0], &github, &BTreeMap::new(), &BTreeMap::new(), &BTreeMap::new())
-            .unwrap();
+        let msg = build_agent_job_message(
+            &plans[0],
+            &github,
+            &BTreeMap::new(),
+            &BTreeMap::new(),
+            &BTreeMap::new(),
+        )
+        .unwrap();
 
         // Matrix should be in context data
         assert!(msg.context_data.contains_key("matrix"));
@@ -323,8 +338,14 @@ jobs:
         secrets.insert("MY_SECRET".to_owned(), "s3cr3t".to_owned());
 
         let github = serde_json::json!({"event_name": "push"});
-        let msg = build_agent_job_message(&plans[0], &github, &BTreeMap::new(), &secrets, &BTreeMap::new())
-            .unwrap();
+        let msg = build_agent_job_message(
+            &plans[0],
+            &github,
+            &BTreeMap::new(),
+            &secrets,
+            &BTreeMap::new(),
+        )
+        .unwrap();
 
         assert!(!msg.mask_hints.is_empty());
         assert_eq!(msg.mask_hints[0].value, "s3cr3t");

crates/aksh-gha-parser/src/lib.rs

@@ -3,8 +3,8 @@
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 
-use indexmap::IndexMap;
 use aksh_gha_protocol::{JobId, JobPlan, StepPlan};
+use indexmap::IndexMap;
 
 /// Expression evaluation for workflow fields.
 pub mod eval;
@@ -140,7 +140,9 @@ impl Trigger {
                         }
                         // paths filter
                         if let Some(path_filters) = obj.get("paths") {
-                            if !paths.is_empty() && !paths.iter().any(|p| matches_filter(path_filters, p)) {
+                            if !paths.is_empty()
+                                && !paths.iter().any(|p| matches_filter(path_filters, p))
+                            {
                                 return false;
                             }
                         }
@@ -742,10 +744,7 @@ fn object_entry_indexed(
             field,
         });
     };
-    Ok(map
-        .iter()
-        .map(|(k, v)| (k.clone(), v.clone()))
-        .collect())
+    Ok(map.iter().map(|(k, v)| (k.clone(), v.clone())).collect())
 }
 
 fn can_merge_include_indexed(
@@ -757,7 +756,7 @@ fn can_merge_include_indexed(
         .all(|(key, value)| candidate.get(key).is_none_or(|existing| existing == value))
 }
 
-fn object_entry(
+fn _object_entry(
     job_id: &str,
     field: &'static str,
     value: &Value,
@@ -782,7 +781,7 @@ fn matches_partial(candidate: &IndexMap<String, Value>, partial: &IndexMap<Strin
     })
 }
 
-fn can_merge_include(
+fn _can_merge_include(
     candidate: &IndexMap<String, Value>,
     include: &IndexMap<String, Value>,
 ) -> bool {