Skip to content

src: add support for escaping quotes with escape slash in --env-file #50814

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

Closed
pluris wants to merge 3 commits into from
Closed

src: add support for escaping quotes with escape slash in --env-file #50814

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09f8165
src: add support for escaping quotes with escape slash in `--env-file`
Nov 19, 2023
690fa43
fixup! src: add support for escaping quotes with escape slash in `--e…
Nov 19, 2023
94ada51
fixup! src: add support for escaping quotes with escape slash in `--e…
Nov 20, 2023
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
Prev Previous commit
fixup! src: add support for escaping quotes with escape slash in `--e… 
…nv-file`
  • Loading branch information
pluris committed Nov 20, 2023
commit 94ada51436e89bc19369599a36f1de7bc406c3c0
12 changes: 7 additions & 5 deletions src/node_dotenv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ void Dotenv::SetEnvironment(node::Environment* env) {
auto existing = env->env_vars()->Get(key.data());

if (existing.IsNothing()) {
size_t found = value.find("\\\"");
while (found != std::string::npos) {
value.replace(found, 2, "\"");
found = value.find("\\\"", found + 1);
}
env->env_vars()->Set(
isolate,
v8::String::NewFromUtf8(
Expand Down Expand Up @@ -155,6 +150,13 @@ void Dotenv::ParseLine(const std::string_view line) {
}

value.erase(end_quotation_index);

// Remove escaping slash
size_t found = value.find("\\");
while (found != std::string::npos) {
value.erase(found, 1);
found = value.find("\\", found + 1);
}
} else {
auto hash_index = value.find('#');

Expand Down
3 changes: 2 additions & 1 deletion test/fixtures/dotenv/valid.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ EQUAL_SIGNS=equals==
RETAIN_INNER_QUOTES={"foo": "bar"}
RETAIN_INNER_QUOTES_AS_STRING='{"foo": "bar"}'
RETAIN_INNER_QUOTES_AS_BACKTICKS=`{"foo": "bar's"}`
RETAIN_INNER_QUOTES_AS_ESCAPE_SLASH="{\"foo\": \"bar\"}"
RETAIN_INNER_SINGLE_QUOTES_AS_ESCAPE_SLASH="{\'foo\': \'bar\'}"
RETAIN_INNER_DOUBLE_QUOTES_AS_ESCAPE_SLASH="{\"foo\": \"bar\"}"
TRIM_SPACE_FROM_UNQUOTED= some spaced out string
EMAIL=therealnerdybeast@example.tld
SPACED_KEY = parsed
Expand Down
3 changes: 2 additions & 1 deletion test/parallel/test-dotenv.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ assert.strictEqual(process.env.EQUAL_SIGNS, 'equals==');
assert.strictEqual(process.env.RETAIN_INNER_QUOTES, '{"foo": "bar"}');
assert.strictEqual(process.env.RETAIN_INNER_QUOTES_AS_STRING, '{"foo": "bar"}');
assert.strictEqual(process.env.RETAIN_INNER_QUOTES_AS_BACKTICKS, '{"foo": "bar\'s"}');
assert.strictEqual(process.env.RETAIN_INNER_QUOTES_AS_ESCAPE_SLASH, '{"foo": "bar"}');
assert.strictEqual(process.env.RETAIN_INNER_SINGLE_QUOTES_AS_ESCAPE_SLASH, "{'foo': 'bar'}");
assert.strictEqual(process.env.RETAIN_INNER_DOUBLE_QUOTES_AS_ESCAPE_SLASH, '{"foo": "bar"}');
// Retains spaces in string
assert.strictEqual(process.env.TRIM_SPACE_FROM_UNQUOTED, 'some spaced out string');
// Parses email addresses completely
Expand Down