adapt KindAll too

pkg/policy/match.go

@@ -38,20 +38,13 @@ func matchStatement(statement Statement, node ipld.Node) bool {
 	switch statement.Kind() {
 	case KindEqual:
 		if s, ok := statement.(equality); ok {
-			one, many, err := s.selector.Select(node)
+			one, _, err := s.selector.Select(node)
 			if err != nil {
 				return false
 			}
 			if one != nil {
 				return datamodel.DeepEqual(s.value, one)
 			}
-			if many != nil {
-				for _, n := range many {
-					if eq := datamodel.DeepEqual(s.value, n); eq {
-						return true
-					}
-				}
-			}
 
 			return false
 		}
@@ -128,16 +121,41 @@ func matchStatement(statement Statement, node ipld.Node) bool {
 		}
 	case KindAll:
 		if s, ok := statement.(quantifier); ok {
-			_, many, err := s.selector.Select(node)
-			if err != nil || many == nil {
+			one, many, err := s.selector.Select(node)
+			if err != nil {
 				return false
 			}
-			for _, n := range many {
-				ok := matchStatement(s.statement, n)
-				if !ok {
-					return false
+
+			if one != nil {
+				it := one.ListIterator()
+				if it != nil {
+					for !it.Done() {
+						_, v, err := it.Next()
+						if err != nil {
+							return false
+						}
+						ok := matchStatement(s.statement, v)
+						if !ok {
+							return false
+						}
+					}
+				} else {
+					ok := matchStatement(s.statement, one)
+					if !ok {
+						return false
+					}
 				}
 			}
+
+			if len(many) > 0 {
+				for _, n := range many {
+					ok := matchStatement(s.statement, n)
+					if !ok {
+						return false
+					}
+				}
+			}
+
 			return true
 		}
 	case KindAny:
@@ -146,13 +164,29 @@ func matchStatement(statement Statement, node ipld.Node) bool {
 			if err != nil {
 				return false
 			}
+
 			if one != nil {
-				ok := matchStatement(s.statement, one)
-				if ok {
-					return true
+				it := one.ListIterator()
+				if it != nil {
+					for !it.Done() {
+						_, v, err := it.Next()
+						if err != nil {
+							return false
+						}
+						ok := matchStatement(s.statement, v)
+						if ok {
+							return true
+						}
+					}
+				} else {
+					ok := matchStatement(s.statement, one)
+					if ok {
+						return true
+					}
 				}
 			}
-			if many != nil {
+
+			if len(many) > 0 {
 				for _, n := range many {
 					ok := matchStatement(s.statement, n)
 					if ok {

pkg/policy/selector/parsing.go

@@ -5,7 +5,6 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"unicode/utf8"
 )
 
 var (
@@ -103,10 +102,10 @@ func tokenize(str string) []string {
 	ctx := ""
 
 	for col < len(str) {
-		char, size := utf8.DecodeRuneInString(str[col:])
+		char := string(str[col])
 
-		if char == '"' && (col == 0 || str[col-1] != '\\') {
-			col += size
+		if char == "\"" && string(str[col-1]) != "\\" {
+			col++
 			if ctx == "\"" {
 				ctx = ""
 			} else {
@@ -116,17 +115,17 @@ func tokenize(str string) []string {
 		}
 
 		if ctx == "\"" {
-			col += size
+			col++
 			continue
 		}
 
-		if char == '.' || char == '[' {
+		if char == "." || char == "[" {
 			if ofs < col {
 				toks = append(toks, str[ofs:col])
 			}
 			ofs = col
 		}
-		col += size
+		col++
 	}
 
 	if ofs < col && ctx != "\"" {

pkg/policy/selector/parsing_test.go

@@ -1,30 +0,0 @@
-package selector
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestTokenizeUTF8(t *testing.T) {
-	t.Run("simple UTF-8", func(t *testing.T) {
-		str := ".こんにちは[0]"
-		expected := []string{".", "こんにちは", "[0]"}
-		actual := tokenize(str)
-		require.Equal(t, expected, actual)
-	})
-
-	t.Run("UTF-8 with quotes", func(t *testing.T) {
-		str := ".こんにちは[\"привет\"]"
-		expected := []string{".", "こんにちは", "[\"привет\"]"}
-		actual := tokenize(str)
-		require.Equal(t, expected, actual)
-	})
-
-	t.Run("UTF-8 with escaped quotes", func(t *testing.T) {
-		str := ".こんにちは[\"привет \\\"мир\\\"\"]"
-		expected := []string{".", "こんにちは", "[\"привет \\\"мир\\\"\"]"}
-		actual := tokenize(str)
-		require.Equal(t, expected, actual)
-	})
-}