Skip to content

honor escapes inside keys in SplitPath #1086

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

Open
jmestwa-coder wants to merge 1 commit into
base: master
Choose a base branch
from
Open

honor escapes inside keys in SplitPath #1086

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
6 changes: 6 additions & 0 deletions util/path.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,12 @@ func SplitPath(path string) []string {
inKey = true
case ch == ']' && !inEscape:
inKey = false
case ch == '\\' && !inEscape && inKey:
// Keep escapes inside keys intact for the key parser, but honor
// them here so an escaped ] does not prematurely end the key.
inEscape = true
buf.WriteRune(ch)
continue
case ch == '\\' && !inEscape && !inKey:
inEscape = true
continue
Expand Down
6 changes: 6 additions & 0 deletions util/path_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,6 +1017,12 @@ func TestSplitPath(t *testing.T) {
want: []string{"a", `b[key1 = ../x/y key2 = "z"]`, "c"},
wantIgnoreLeadingTrailing: []string{"a", `b[key1 = ../x/y key2 = "z"]`, "c"},
},
{
desc: "escaped bracket then slash in key",
in: `a/b[k=x\]/y]/c`,
want: []string{"a", `b[k=x\]/y]`, "c"},
wantIgnoreLeadingTrailing: []string{"a", `b[k=x\]/y]`, "c"},
},
}

for _, tt := range tests {
Expand Down
Loading