Skip to content

redact .any() .all() fix #717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josephschorr merged 1 commit into from
Aug 26, 2026
Merged

redact .any() .all() fix #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pkg/backupformat/redaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,19 @@ func redactRewriteChildren(children []*core.SetOperation_Child, redactionMap *Re
t.TupleToUserset.Tupleset.Relation = redactionMap.Relations[t.TupleToUserset.Tupleset.Relation]
t.TupleToUserset.ComputedUserset.Relation = redactionMap.Relations[t.TupleToUserset.ComputedUserset.Relation]

case *core.SetOperation_Child_FunctionedTupleToUserset:
t.FunctionedTupleToUserset.Tupleset.Relation = redactionMap.Relations[t.FunctionedTupleToUserset.Tupleset.Relation]
t.FunctionedTupleToUserset.ComputedUserset.Relation = redactionMap.Relations[t.FunctionedTupleToUserset.ComputedUserset.Relation]

case *core.SetOperation_Child_XNil:
// nothing to do

case *core.SetOperation_Child_XThis:
// nothing to do

case *core.SetOperation_Child_XSelf:
// nothing to do

default:
return spiceerrors.MustBugf("unknown child type: %T", t)
}
Expand Down
32 changes: 32 additions & 0 deletions pkg/backupformat/redaction_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,38 @@ func TestRedactSchema(t *testing.T) {
ObjectIDs: map[string]string{},
},
},
{
name: "any and all operators",
opts: RedactionOptions{
RedactDefinitions: true,
RedactRelations: true,
RedactObjectIDs: true,
},
in: `
definition user {}

definition resource {
relation viewer: user
relation upstream: resource
permission readany = viewer + upstream.any(readany)
permission readall = viewer + upstream.all(readall)
}`,
out: "definition def0 {}\n\ndefinition def1 {\n\trelation rel2: def0\n\trelation rel3: def1\n\tpermission rel4 = rel2 + rel3.any(rel4)\n\tpermission rel5 = rel2 + rel3.all(rel5)\n}",
redactionMap: RedactionMap{
Definitions: map[string]string{
"user": "def0",
"resource": "def1",
},
Caveats: map[string]string{},
Relations: map[string]string{
"viewer": "rel2",
"upstream": "rel3",
"readany": "rel4",
"readall": "rel5",
},
ObjectIDs: map[string]string{},
},
},
{
name: "same relation name in different definitions",
opts: RedactionOptions{
Expand Down
Loading