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
 			}
+
+			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 {
+				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 {