Added new configuration 'use_proxy' (metalbear-co#2076)

* Added new configuration 'use_proxy' that lets user disable usage of http/s proxy by mirrord even when env is set

* config docs

* Update mirrord/config/src/lib.rs

Co-authored-by: Michał Smolarek <[email protected]>

* aa.

* ..

* f.

---------

Co-authored-by: Michał Smolarek <[email protected]>

changelog.d/+use_proxy.added.md

@@ -0,0 +1 @@
+Added new configuration 'use_proxy' that lets user disable usage of http/s proxy by mirrord even when env is set

mirrord-schema.json

@@ -135,6 +135,14 @@
         "boolean",
         "null"
       ]
+    },
+    "use_proxy": {
+      "title": "use_proxy {#root-use_proxy}",
+      "description": "When disabled, mirrord will remove `HTTP[S]_PROXY` env variables before doing any network requests. This is useful when the system sets a proxy but you don't want mirrord to use it. This also applies to the mirrord process (as it just removes the env). If the remote pod sets this env, the mirrord process will still use it.",
+      "type": [
+        "boolean",
+        "null"
+      ]
     }
   },
   "additionalProperties": false,

mirrord/cli/src/execution.rs

@@ -132,6 +132,15 @@ impl MirrordExecution {
     {
         let lib_path = extract_library(None, progress, true)?;
 
+        if !config.use_proxy {
+            for (key, _val) in std::env::vars() {
+                let lower_key = key.to_lowercase();
+                if lower_key == "http_proxy" || lower_key == "https_proxy" {
+                    std::env::remove_var(key)
+                }
+            }
+        }
+
         let (connect_info, mut connection) = create_and_connect(config, progress, analytics)
             .await
             .inspect_err(|_| analytics.set_error(AnalyticsError::AgentConnection))?;

mirrord/config/src/lib.rs

@@ -299,6 +299,16 @@ pub struct LayerConfig {
     /// # internal_proxy {#root-internal_proxy}
     #[config(nested)]
     pub internal_proxy: InternalProxyConfig,
+
+    /// ## use_proxy {#root-use_proxy}
+    ///
+    /// When disabled, mirrord will remove `HTTP[S]_PROXY` env variables before
+    /// doing any network requests. This is useful when the system sets a proxy
+    /// but you don't want mirrord to use it.
+    /// This also applies to the mirrord process (as it just removes the env).
+    /// If the remote pod sets this env, the mirrord process will still use it.
+    #[config(env = "MIRRORD_PROXY", default = true)]
+    pub use_proxy: bool,
 }
 
 impl LayerConfig {
@@ -744,6 +754,7 @@ mod tests {
             sip_binaries: None,
             kube_context: None,
             internal_proxy: None,
+            use_proxy: None,
         };
 
         assert_eq!(config, expect);