Skip to content

fix(dql): whitespace sensitivity issues in conditional eval #9692

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
matthewmcneely wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −1
Open

fix(dql): whitespace sensitivity issues in conditional eval #9692

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
16 changes: 15 additions & 1 deletion edgraph/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,10 +721,22 @@ func validateCondValue(cond string) error {
}

lower := strings.ToLower(cond)
if !strings.HasPrefix(lower, "@if(") && !strings.HasPrefix(lower, "@filter(") {
if !strings.HasPrefix(lower, "@if") && !strings.HasPrefix(lower, "@filter") {
return errors.Errorf("invalid cond value: must start with @if( or @filter(")
}

// Strip the directive prefix and verify the remainder (after optional whitespace) starts with '('.
prefix := "@if"
if strings.HasPrefix(lower, "@filter") {
prefix = "@filter"
}
rest := strings.TrimSpace(cond[len(prefix):])
if len(rest) == 0 || rest[0] != '(' {
return errors.Errorf("invalid cond value: must start with @if( or @filter(")
}
// Rebuild cond without the space so the paren-balancing logic works on the normalized form.
cond = prefix + rest

openIdx := strings.Index(cond, "(")
if openIdx == -1 {
return errors.Errorf("invalid cond value: missing opening parenthesis")
Expand Down Expand Up @@ -781,6 +793,7 @@ var valVarRegexp = regexp.MustCompile(`^val\([a-zA-Z_][a-zA-Z0-9_.]*\)$`)
// validateValObjectId checks that an ObjectId starting with "val(" is a well-formed
// val(variableName) reference and contains no injected DQL syntax.
func validateValObjectId(objectId string) error {
objectId = strings.TrimSpace(objectId)
if !valVarRegexp.MatchString(objectId) {
return errors.Errorf("invalid val() reference in ObjectId: %q", objectId)
}
Expand All @@ -792,6 +805,7 @@ var langTagRegexp = regexp.MustCompile(`^[a-zA-Z]+(-[a-zA-Z0-9]+)*$`)

// validateLangTag checks that a language tag contains only safe characters.
func validateLangTag(lang string) error {
lang = strings.TrimSpace(lang)
if lang == "" {
return nil
}
Expand Down
13 changes: 13 additions & 0 deletions edgraph/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,11 @@ func TestValidateCondValue(t *testing.T) {
`@if(not(eq(len(v), 0)))`,
`@if(eq(name, "has (parens) inside"))`,
`@filter(eq(len(v), 0))`,
// Spaces between directive and opening paren should be allowed (issue #9687).
`@if (eq(len(v), 0))`,
`@if (eq(len(v), 0))`,
`@filter (eq(len(v), 0))`,
` @if ( NOT eq(len(RoutesId), 0) ) `,
}
for _, c := range valid {
require.NoError(t, validateCondValue(c), "expected valid: %q", c)
Expand Down Expand Up @@ -430,6 +435,10 @@ func TestValidateValObjectId(t *testing.T) {
"val(queryVariable)",
"val(my_var_123)",
"val(Amt)",
// Leading/trailing whitespace should be tolerated.
" val(v)",
"val(v) ",
" val(v) ",
}
for _, v := range valid {
require.NoError(t, validateValObjectId(v), "expected valid: %q", v)
Expand All @@ -454,6 +463,10 @@ func TestValidateLangTag(t *testing.T) {
"fr",
"zh-Hans",
"en-US",
// Leading/trailing whitespace should be tolerated.
" en",
"en ",
" en ",
}
for _, v := range valid {
require.NoError(t, validateLangTag(v), "expected valid: %q", v)
Expand Down
Loading