Skip to content

src: improve performance of dotenv ToObject #60038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 1 commit into from
Oct 4, 2025
Merged

src: improve performance of dotenv ToObject #60038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
src: improve performance of dotenv ToObject 
Improves the performance of the dotenv parser
ToObject method. Also, switch to a null prototype
object to avoid potential prototype pollution
issues.
  • Loading branch information
@jasnell
jasnell committed Sep 27, 2025
commit 91028a811c2db10ce17949cf870b71aad982d6e6
25 changes: 18 additions & 7 deletions src/node_dotenv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ namespace node {
using v8::EscapableHandleScope;
using v8::JustVoid;
using v8::Local;
using v8::LocalVector;
using v8::Maybe;
using v8::MaybeLocal;
using v8::Name;
using v8::Nothing;
using v8::Object;
using v8::String;
Expand Down Expand Up @@ -86,20 +88,29 @@ Maybe<void> Dotenv::SetEnvironment(node::Environment* env) {

MaybeLocal<Object> Dotenv::ToObject(Environment* env) const {
EscapableHandleScope scope(env->isolate());
Local<Object> result = Object::New(env->isolate());

Local<Value> name;
Local<Value> val;
LocalVector<Name> names(env->isolate(), store_.size());
LocalVector<Value> values(env->isolate(), store_.size());
auto context = env->context();

Local<Value> tmp;

int n = 0;
for (const auto& entry : store_) {
if (!ToV8Value(context, entry.first).ToLocal(&name) ||
!ToV8Value(context, entry.second).ToLocal(&val) ||
result->Set(context, name, val).IsNothing()) {
if (!ToV8Value(context, entry.first).ToLocal(&tmp)) {
return MaybeLocal<Object>();
}
names[n] = tmp.As<Name>();
if (!ToV8Value(context, entry.second).ToLocal(&tmp)) {
return MaybeLocal<Object>();
}
values[n++] = tmp;
}

Local<Object> result = Object::New(env->isolate(),
Null(env->isolate()),
names.data(),
values.data(),
values.size());
return scope.Escape(result);
}

Expand Down
3 changes: 3 additions & 0 deletions test/parallel/test-dotenv-edge-cases.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ describe('.env supports edge cases', () => {
].join('\n'));

assert.deepStrictEqual(result, {
__proto__: null,
baz: 'whatever',
VALID_AFTER_INVALID: 'test',
ANOTHER_VALID: 'value',
Expand All @@ -236,6 +237,7 @@ describe('.env supports edge cases', () => {
].join('\n'));

assert.deepStrictEqual(result, {
__proto__: null,
KEY_WITH_SPACES_BEFORE: 'value_with_spaces_before_and_after',
KEY_WITH_TABS_BEFORE: 'value_with_tabs_before_and_after',
KEY_WITH_SPACES_AND_TABS: 'value_with_spaces_and_tabs',
Expand All @@ -255,6 +257,7 @@ describe('.env supports edge cases', () => {
].join('\n'));

assert.deepStrictEqual(result, {
__proto__: null,
KEY_WITH_COMMENT_IN_VALUE: 'value # this is a comment',
});
});
Expand Down
12 changes: 8 additions & 4 deletions test/parallel/test-util-parse-env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ const fs = require('node:fs');
const validEnvFilePath = fixtures.path('dotenv/valid.env');
const validContent = fs.readFileSync(validEnvFilePath, 'utf8');

assert.deepStrictEqual(util.parseEnv(validContent), {
const checkObj = {
__proto__: null,
A: 'B=C',
B: 'C=D',
AFTER_LINE: 'after_line',
Expand Down Expand Up @@ -56,11 +57,14 @@ const fs = require('node:fs');
SPACED_KEY: 'parsed',
SPACE_BEFORE_DOUBLE_QUOTES: 'space before double quotes',
TRIM_SPACE_FROM_UNQUOTED: 'some spaced out string',
});
};

assert.deepStrictEqual(util.parseEnv(validContent), checkObj);
}

assert.deepStrictEqual(util.parseEnv(''), {});
assert.deepStrictEqual(util.parseEnv('FOO=bar\nFOO=baz\n'), { FOO: 'baz' });
assert.deepStrictEqual(util.parseEnv(''), { __proto__: null });
assert.deepStrictEqual(util.parseEnv('FOO=bar\nFOO=baz\n'),
{ __proto__: null, FOO: 'baz' });

// Test for invalid input.
assert.throws(() => {
Expand Down
Loading