src: allow absolute paths for --env-file

nodejs · Aug 21, 2023 · 127d263 · 127d263
1 parent 484ad83
commit 127d263
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/src/node.cc b/src/node.cc
@@ -124,6 +124,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <filesystem>
 
 #include <string>
 #include <tuple>
@@ -844,10 +845,15 @@ static ExitCode InitializeNodeWithArgsInternal(
   auto file_path = node::Dotenv::GetPathFromArgs(*argv);
 
   if (file_path.has_value()) {
-    auto cwd = Environment::GetCwd(Environment::GetExecPath(*argv));
-    std::string path = cwd + kPathSeparator + file_path.value();
     CHECK(!per_process::v8_initialized);
-    per_process::dotenv_file.ParsePath(path);
+
+    if (file_path->is_absolute()) {
+      per_process::dotenv_file.ParsePath(file_path->string());
+    } else {
+      auto cwd = Environment::GetCwd(Environment::GetExecPath(*argv));
+      std::string path = cwd + kPathSeparator + file_path->string();
+      per_process::dotenv_file.ParsePath(path);
+    }
     per_process::dotenv_file.AssignNodeOptionsIfAvailable(&node_options);
   }
 

diff --git a/src/node_dotenv.cc b/src/node_dotenv.cc
@@ -8,7 +8,7 @@ namespace node {
 using v8::NewStringType;
 using v8::String;
 
-std::optional<std::string> Dotenv::GetPathFromArgs(
+std::optional<std::filesystem::path> Dotenv::GetPathFromArgs(
     const std::vector<std::string>& args) {
   std::string_view flag = "--env-file";
   // Match the last `--env-file`
@@ -26,7 +26,7 @@ std::optional<std::string> Dotenv::GetPathFromArgs(
   auto equal_char = path->find('=');
 
   if (equal_char != std::string::npos) {
-    return path->substr(equal_char + 1);
+    return std::filesystem::path(path->substr(equal_char + 1));
   }
 
   auto next_arg = std::prev(path);
@@ -35,7 +35,7 @@ std::optional<std::string> Dotenv::GetPathFromArgs(
     return std::nullopt;
   }
 
-  return *next_arg;
+  return std::filesystem::path(*next_arg);
 }
 
 void Dotenv::SetEnvironment(node::Environment* env) {

diff --git a/src/node_dotenv.h b/src/node_dotenv.h
@@ -5,6 +5,7 @@
 
 #include "util-inl.h"
 
+#include <filesystem>
 #include <map>
 #include <optional>
 
@@ -23,7 +24,7 @@ class Dotenv {
   void AssignNodeOptionsIfAvailable(std::string* node_options);
   void SetEnvironment(Environment* env);
 
-  static std::optional<std::string> GetPathFromArgs(
+  static std::optional<std::filesystem::path> GetPathFromArgs(
       const std::vector<std::string>& args);
 
  private:

diff --git a/test/parallel/test-dotenv-edge-cases.js b/test/parallel/test-dotenv-edge-cases.js
@@ -2,10 +2,13 @@
 
 const common = require('../common');
 const assert = require('node:assert');
+const path = require('node:path');
+const fixtures = require('../common/fixtures');
 const { describe, it } = require('node:test');
 
-const validEnvFilePath = '../fixtures/dotenv/valid.env';
-const relativePath = '../fixtures/dotenv/node-options.env';
+const validEnvFilePath = path.relative(__dirname, fixtures.path('dotenv/valid.env'));
+const absolutePath = fixtures.path('dotenv/node-options.env');
+const relativePath = path.relative(__dirname, absolutePath);
 
 describe('.env supports edge cases', () => {
 
@@ -35,4 +38,17 @@ describe('.env supports edge cases', () => {
     assert.strictEqual(child.code, 0);
   });
 
+  it('should support absolute paths', async () => {
+    const code = `
+      require('assert').strictEqual(process.env.CUSTOM_VARIABLE, 'hello-world');
+    `.trim();
+    const child = await common.spawnPromisified(
+      process.execPath,
+      [ '--env-file', absolutePath, '--eval', code ],
+      { cwd: __dirname },
+    );
+    assert.strictEqual(child.stderr, '');
+    assert.strictEqual(child.code, 0);
+  });
+
 });