topdown: Correct glob default delimeter

The documentation says that the default delimeter for glob is `["."]` but the implementation did not actually do this (for the normal built in). This corrects the implementation to actually default to the correct value when it is omitted. Fixes: #2039 Signed-off-by: Patrick East <[email protected]>
open-policy-agent · Feb 6, 2020 · 0fe6394 · 0fe6394
1 parent 60cf8aa
commit 0fe6394
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/topdown/glob.go b/topdown/glob.go
@@ -24,6 +24,10 @@ func builtinGlobMatch(a, b, c ast.Value) (ast.Value, error) {
 		return nil, err
 	}
 
+	if len(delimiters) == 0 {
+		delimiters = []rune{'.'}
+	}
+
 	match, err := builtins.StringOperand(c, 3)
 	if err != nil {
 		return nil, err

diff --git a/topdown/glob_test.go b/topdown/glob_test.go
@@ -30,6 +30,10 @@ func TestGlobMatch(t *testing.T) {
 		{"glob match with pattern-alternatives list (fat)", []string{`p[x] { glob.match("{cat,bat,[fr]at}", [], "fat", x) }`}, "[true]"},
 		{"glob match with pattern-alternatives list (rat)", []string{`p[x] { glob.match("{cat,bat,[fr]at}", [], "rat", x) }`}, "[true]"},
 		{"glob no match with pattern-alternatives list", []string{`p[x] { glob.match("{cat,bat,[fr]at}", [], "at", x) }`}, "[false]"},
+		{"glob match single with . delimiter", []string{`p[x] { glob.match("*", ["."], "foo", x) }`}, "[true]"},
+		{"glob match single with default delimiter", []string{`p[x] { glob.match("*", [], "foo", x) }`}, "[true]"},
+		{"glob no match single with . delimiter", []string{`p[x] { glob.match("*", ["."], "foo.bar", x) }`}, "[false]"},
+		{"glob no match single with default delimiter", []string{`p[x] { glob.match("*", [], "foo.bar", x) }`}, "[false]"},
 	}
 
 	data := loadSmallTestData()