go/ucan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selector: remove remnant of policy matching, that concept doesn't really work with complex policies

Browse Source 
Maybe it will be revived later.
This commit is contained in:
Michael Muré
2024-10-24 11:07:00 +02:00
parent 866683347f
commit a27eb258e5
2 changed files with 0 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pkg/policy/selector/selector.go
View File

@@ -27,12 +27,6 @@ func (s Selector) Select(subject ipld.Node) (ipld.Node, error) {
return resolve(s, subject, nil)
}
// // MatchPath tells if the selector operates on the given (string only) path segments.
// // It returns the segments that didn't get consumed by the matching.
// func (s Selector) MatchPath(pathSegment ...string) (bool, []string) {
// return matchPath(s, pathSegment)
// }
func (s Selector) String() string {
var res strings.Builder
for _, seg := range s {
@@ -229,19 +223,6 @@ func resolve(sel Selector, subject ipld.Node, at []string) (ipld.Node, error) {
}
cur, _ = cur.LookupByIndex(int64(idx))
// TODO: not supported yet
//case datamodel.Kind_String:
// str, _ := cur.AsString()
// runes := []rune(str)
// if idx < 0 {
// idx = len(runes) + idx
// }
// if idx < 0 || idx >= len(runes) {
// err := newResolutionError(fmt.Sprintf("index out of bounds: %d", seg.Index()), at)
// return nil, errIfNotOptional(seg, err)
// }
// cur = basicnode.NewString(string(runes[idx]))
case datamodel.Kind_Bytes:
b, _ := cur.AsBytes()
if idx < 0 {
@@ -263,39 +244,6 @@ func resolve(sel Selector, subject ipld.Node, at []string) (ipld.Node, error) {
return cur, nil
}
// func matchPath(sel Selector, path []string) (bool, []string) {
// for _, seg := range sel {
// if len(path) == 0 {
// return true, path
// }
// switch {
// case seg.Identity():
// continue
//
// case seg.Iterator():
// // we have reached a [] iterator, it should have matched earlier
// return false, nil
//
// case seg.Field() != "":
// // if exact match on the segment, we continue
// if path[0] == seg.Field() {
// path = path[1:]
// continue
// }
// return false, nil
//
// case seg.Slice() != nil:
// // we have reached a [<int>:<int>] slicing, it should have matched earlier
// return false, nil
//
// default: // Index()
// // we have reached a [<int>] indexing, it should have matched earlier
// return false, nil
// }
// }
// return true, path
// }
// resolveSliceIndices resolves the start and end indices for slicing a list or byte array.
//
// It takes the slice indices from the selector segment and the length of the list or byte array,

26
pkg/policy/selector/selector_test.go
View File

@@ -248,32 +248,6 @@ func TestSelect(t *testing.T) {
})
}
// func TestMatch(t *testing.T) {
// for _, tc := range []struct {
// sel string
// path []string
// want bool
// remaining []string
// }{
// {sel: ".foo.bar", path: []string{"foo", "bar"}, want: true, remaining: []string{}},
// {sel: ".foo.bar", path: []string{"foo"}, want: true, remaining: []string{}},
// {sel: ".foo.bar", path: []string{"foo", "bar", "baz"}, want: true, remaining: []string{"baz"}},
// {sel: ".foo.bar", path: []string{"foo", "faa"}, want: false},
// {sel: ".foo.[]", path: []string{"foo", "faa"}, want: false},
// {sel: ".foo.[]", path: []string{"foo"}, want: true, remaining: []string{}},
// {sel: ".foo.bar?", path: []string{"foo"}, want: true, remaining: []string{}},
// {sel: ".foo.bar?", path: []string{"foo", "bar"}, want: true, remaining: []string{}},
// {sel: ".foo.bar?", path: []string{"foo", "baz"}, want: false},
// } {
// t.Run(tc.sel, func(t *testing.T) {
// sel := MustParse(tc.sel)
// res, remain := sel.MatchPath(tc.path...)
// require.Equal(t, tc.want, res)
// require.EqualValues(t, tc.remaining, remain)
// })
// }
// }
func FuzzParse(f *testing.F) {
selectorCorpus := []string{
`.`, `.[]`, `.[]?`, `.[][]?`, `.x`, `.["x"]`, `.[0]`, `.[-1]`, `.[0]`,