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

handle String Slice selector

Browse Source
This commit is contained in:
Fabio Bozzo
2024-09-13 14:49:52 +02:00
parent dbfff3f70c
commit a183b627be
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
capability/policy/selector/selector.go
View File

@@ -190,11 +190,14 @@ func resolve(sel Selector, subject ipld.Node, at []string) (ipld.Node, []ipld.No
case datamodel.Kind_Bytes: case datamodel.Kind_Bytes:
b, _ := cur.AsBytes() b, _ := cur.AsBytes()
start, end = resolveSliceIndices(slice, int64(len(b))) start, end = resolveSliceIndices(slice, int64(len(b)))
case datamodel.Kind_String:
str, _ := cur.AsString()
start, end = resolveSliceIndices(slice, int64(len(str)))
default: default:
return nil, nil, newResolutionError(fmt.Sprintf("can not slice on kind: %s", kindString(cur)), at) return nil, nil, newResolutionError(fmt.Sprintf("can not slice on kind: %s", kindString(cur)), at)
} }
if start < 0 || end < start || end > cur.Length() { if start < 0 || end < start {
if seg.Optional() { if seg.Optional() {
cur = nil cur = nil
} else { } else {
@@ -203,21 +206,31 @@ func resolve(sel Selector, subject ipld.Node, at []string) (ipld.Node, []ipld.No
} else { } else {
switch cur.Kind() { switch cur.Kind() {
case datamodel.Kind_List: case datamodel.Kind_List:
if end > cur.Length() {
end = cur.Length()
}
nb := basicnode.Prototype.List.NewBuilder() nb := basicnode.Prototype.List.NewBuilder()
assembler, _ := nb.BeginList(end - start) assembler, _ := nb.BeginList(int64(end - start))
for i := start; i < end; i++ { for i := start; i < end; i++ {
item, _ := cur.LookupByIndex(i) item, _ := cur.LookupByIndex(int64(i))
if err := assembler.AssembleValue().AssignNode(item); err != nil { assembler.AssembleValue().AssignNode(item)
return nil, nil, err
}
}
if err := assembler.Finish(); err != nil {
return nil, nil, err
} }
assembler.Finish()
cur = nb.Build() cur = nb.Build()
case datamodel.Kind_Bytes: case datamodel.Kind_Bytes:
b, _ := cur.AsBytes() b, _ := cur.AsBytes()
l := int64(len(b))
if end > l {
end = l
}
cur = basicnode.NewBytes(b[start:end]) cur = basicnode.NewBytes(b[start:end])
case datamodel.Kind_String:
str, _ := cur.AsString()
l := int64(len(str))
if end > l {
end = l
}
cur = basicnode.NewString(str[start:end])
} }
} }
} }