insert sockets even if envp is empty

mirrord/layer/src/detour.rs

@@ -351,6 +351,15 @@ impl<S> Detour<S> {
             Detour::Error(e) => op(e),
         }
     }
+
+    #[inline]
+    pub fn or_bypass<O: FnOnce(Bypass) -> Detour<S>>(self, op: O) -> Detour<S> {
+        match self {
+            Detour::Success(s) => Detour::Success(s),
+            Detour::Bypass(b) => op(b),
+            Detour::Error(e) => Detour::Error(e),
+        }
+    }
 }
 
 impl<S> Detour<S>

mirrord/layer/src/exec_hooks/hooks.rs

@@ -41,7 +41,11 @@ fn shared_sockets() -> Vec<(i32, UserSocket)> {
     )
 )]
 pub(crate) fn execve(env_vars: Detour<Argv>) -> Detour<*const *const c_char> {
-    let mut env_vars = env_vars?;
+    let mut env_vars = env_vars.or_bypass(|x| match x {
+        crate::detour::Bypass::EmptyOption => Detour::Success(Argv(Vec::new())),
+        other => Detour::Bypass(other),
+    })?;
+
     let encoded = bincode::encode_to_vec(shared_sockets(), bincode::config::standard())
         .map(|bytes| BASE64_URL_SAFE.encode(bytes))?;
 

mirrord/layer/src/lib.rs

@@ -351,12 +351,12 @@ fn layer_start(mut config: LayerConfig) {
 
     let _detour_guard = DetourGuard::new();
     tracing::info!("Initializing mirrord-layer!");
-    tracing::trace!(
+    tracing::debug!(
         executable = ?EXECUTABLE_PATH.get(),
         args = ?EXECUTABLE_ARGS.get(),
         pid = std::process::id(),
         parent_pid = parent_id(),
-        env_vars = ?std::env::vars().count(),
+        env_vars = ?std::env::vars(),
         "Loaded into executable",
     );