Skip to content

check for undesirable quotes #260

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
mbrt merged 1 commit into from
Jun 20, 2022
Merged

check for undesirable quotes #260

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
23 changes: 16 additions & 7 deletions internal/engine/filter/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,11 @@ func generateNode(node *parser.Node) (Criteria, error) {

func generateLeaf(leaf *parser.Leaf) (Criteria, error) {
needEscape := leaf.Function != parser.FunctionQuery && !leaf.IsRaw
query := joinStrings(needEscape, leaf.Args...)
query, err := joinStrings(needEscape, leaf.Args...)
Comment thread
mbrt marked this conversation as resolved.
if err != nil {
return Criteria{}, err
}
if len(leaf.Args) > 1 {
var err error
if query, err = groupWithOperation(query, leaf.Grouping); err != nil {
return Criteria{}, err
}
Expand Down Expand Up @@ -174,9 +176,11 @@ func generateNodeAsString(node *parser.Node) (string, error) {

func generateLeafAsString(leaf *parser.Leaf) (string, error) {
needEscape := leaf.Function != parser.FunctionQuery && !leaf.IsRaw
query := joinStrings(needEscape, leaf.Args...)
query, err := joinStrings(needEscape, leaf.Args...)
Comment thread
mbrt marked this conversation as resolved.
if err != nil {
return "", err
}
if len(leaf.Args) > 1 {
var err error
if query, err = groupWithOperation(query, leaf.Grouping); err != nil {
return "", err
}
Expand Down Expand Up @@ -226,11 +230,16 @@ func joinQueries(f1, f2 string) string {
return fmt.Sprintf("%s %s", f1, f2)
}

func joinStrings(escape bool, a ...string) string {
func joinStrings(escape bool, a ...string) (string, error) {
if escape {
return joinEscaped(a...)
for _, a := range a {
if strings.Contains(a, `"`) {
return "", fmt.Errorf("invalid quote in %q", a)
}
}
return joinEscaped(a...), nil
}
return strings.Join(a, " ")
return strings.Join(a, " "), nil
}

func joinEscaped(a ...string) string {
Expand Down
18 changes: 18 additions & 0 deletions internal/engine/filter/convert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,3 +363,21 @@ func TestActions(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, expected, got)
}

func TestDoubleQuoteError(t *testing.T) {
Comment thread
mbrt marked this conversation as resolved.
rules := []parser.Rule{
{
Criteria: &parser.Leaf{
Function: parser.FunctionSubject,
Args: []string{`a"b`},
IsRaw: false,
},
Actions: parser.Actions{
// action choice is irrelevant
Labels: []string{"l1"},
},
},
}
_, err := FromRules(rules)
assert.ErrorContains(t, err, "invalid quote")
}