fix(dotenv): strip trailing carriage return when parsing CRLF files - #2293
Open
x1247897956 wants to merge 1 commit into
Open
fix(dotenv): strip trailing carriage return when parsing CRLF files#2293x1247897956 wants to merge 1 commit into
x1247897956 wants to merge 1 commit into
Conversation
Signed-off-by: Mrxh <x1247897956@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Fix dotenv parsing so CRLF (
\r\n) line endings no longer corrupt decrypted values.sops/stores/dotenv/store.go'sLoadPlainFilesplits input on\nbut never strips the trailing\r. On files with Windows/CRLF line endings, every value ends up with a stray carriage return ("val1\r"), comments carry\r, and empty lines become\r-only lines that are treated as malformed input.Why
This is the same underlying symptom reported in #854, #1128, and #1157 — encrypted dotenv files that fail to decrypt (or silently corrupt values) after their line endings are converted to CRLF, e.g. by
giton Windows.Fix
Strip a single trailing
\rfrom each line before processing. This is additive and backward compatible: LF-only files behave exactly as before.Tests
Added
TestLoadPlainFileCRLFasserting that a CRLF file with values and a comment parses identically to its LF counterpart.go test ./stores/dotenv/passes.Signed-off-by: Mrxh x1247897956@users.noreply.github.com