Replaced

Cargo.toml

@@ -102,8 +102,7 @@ streammap-ext = "0.1"
 regex = { version = "1", features = ["unicode-case"] }
 fancy-regex = { version = "0.14" }
 enum_dispatch = "0.3"
-envfile = "0.2"
-
+dotenv = "0.15"
 
 # If you update `hyper`, check that `h2` version is compatible in `intproxy/Cargo.toml`.
 # There is a test for this: `cargo test -p mirrord-intproxy hyper_and_h2_versions_in_sync`

mirrord/cli/Cargo.toml

@@ -35,7 +35,7 @@ mirrord-vpn = { path = "../vpn" }
 
 actix-codec.workspace = true
 clap.workspace = true
-envfile.workspace = true
+dotenv.workspace = true
 tracing.workspace = true
 serde_json.workspace = true
 serde.workspace = true

mirrord/cli/src/config.rs

@@ -330,8 +330,9 @@ impl ExecParams {
         if let Some(env_file) = &self.env_file {
             // Set canonicalized path to env file, in case forks/children are in different
             // working directories.
-            let full_path = std::fs::canonicalize(env_file)
-                .map_err(|e| CliError::EnvFileAccessError(env_file.clone(), e))?;
+            let full_path = std::fs::canonicalize(env_file).map_err(|e| {
+                CliError::EnvFileAccessError(env_file.clone(), dotenv::Error::Io(e))
+            })?;
             envs.insert(
                 MIRRORD_OVERRIDE_ENV_FILE_ENV.into(),
                 full_path.as_os_str().to_owned(),

mirrord/cli/src/error.rs

@@ -250,7 +250,7 @@ pub(crate) enum CliError {
 
     #[error("Failed to access env file at `{0}`: {1}")]
     #[diagnostic(help("Please check that the path is correct and that you have permissions to read it.{GENERAL_HELP}"))]
-    EnvFileAccessError(PathBuf, std::io::Error),
+    EnvFileAccessError(PathBuf, dotenv::Error),
 
     #[cfg(target_os = "macos")]
     #[error("SIP Error: `{0:#?}`")]

mirrord/cli/src/execution.rs

@@ -498,9 +498,11 @@ impl MirrordExecution {
         };
 
         if let Some(file) = &config.feature.env.env_file {
-            let envs_from_file = envfile::EnvFile::new(file)
-                .map_err(|error| CliError::EnvFileAccessError(file.clone(), error))?
-                .store;
+            #[allow(deprecated)]
+            let envs_from_file = dotenv::from_path_iter(file)
+                .and_then(|iter| iter.collect::<Result<Vec<_>, _>>())
+                .map_err(|error| CliError::EnvFileAccessError(file.clone(), error))?;
+
             env_vars.extend(envs_from_file);
         }
 

mirrord/layer/Cargo.toml

@@ -31,7 +31,7 @@ base64.workspace = true
 bincode.workspace = true
 bytemuck = "1"
 ctor = "0.2"
-envfile.workspace = true
+dotenv.workspace = true
 errno = "0.3"
 frida-gum = { version = "0.15", features = ["auto-download"] }
 hashbrown = "0.15"

mirrord/layer/src/lib.rs

@@ -460,9 +460,11 @@ fn fetch_env_vars() -> HashMap<String, String> {
         .unwrap_or_default();
 
     if let Some(file) = &setup().env_config().env_file {
-        let envs_from_file = envfile::EnvFile::new(file)
-            .expect("failed to access env file")
-            .store;
+        #[allow(deprecated)]
+        let envs_from_file = dotenv::from_path_iter(file)
+            .and_then(|iter| iter.collect::<Result<Vec<_>, _>>())
+            .expect("failed to access the env file");
+
         env_vars.extend(envs_from_file);
     }