Skip to content
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

Jump to bottom

Fix formatting #374

Merged
merged 1 commit into from Jan 11, 2022
Merged

Fix formatting #374

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions internal/graph/lookup.go
View file
Open in desktop
Expand Up @@ -211,6 +211,10 @@ func (cl *ConcurrentLookup) lookupDirect(ctx context.Context, req ValidatedLooku

// Dispatch a check for the subject wildcard, if allowed.
isWildcardAllowed, err := typeSystem.IsAllowedPublicNamespace(req.ObjectRelation.Relation, req.Subject.Namespace)
if err != nil {
return returnResult(lookupResultError(req, err, emptyMetadata))
}

if isWildcardAllowed == namespace.PublicSubjectAllowed {
requests = append(requests, func(ctx context.Context, resultChan chan<- LookupResult) {
objects := tuple.NewONRSet()
Expand Down
3 changes: 2 additions & 1 deletion internal/membership/foundsubject_test.go
View file
Open in desktop
Expand Up @@ -4,8 +4,9 @@ import (
"fmt"
"testing"

"github.com/authzed/spicedb/pkg/validationfile"
"github.com/stretchr/testify/require"

"github.com/authzed/spicedb/pkg/validationfile"
)

func TestToValidationString(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/membership/membership.go
View file
Open in desktop
Expand Up @@ -78,7 +78,7 @@ func populateFoundSubjects(rootONR *v0.ObjectAndRelation, treeNode *v0.RelationT

case v0.SetOperationUserset_INTERSECTION:
if len(typed.IntermediateNode.ChildNodes) == 0 {
return nil, fmt.Errorf("Found intersection with no children")
return nil, fmt.Errorf("found intersection with no children")
}

firstChildSet, err := populateFoundSubjects(rootONR, typed.IntermediateNode.ChildNodes[0])
Expand All @@ -100,7 +100,7 @@ func populateFoundSubjects(rootONR *v0.ObjectAndRelation, treeNode *v0.RelationT

case v0.SetOperationUserset_EXCLUSION:
if len(typed.IntermediateNode.ChildNodes) == 0 {
return nil, fmt.Errorf("Found exclusion with no children")
return nil, fmt.Errorf("found exclusion with no children")
}

firstChildSet, err := populateFoundSubjects(rootONR, typed.IntermediateNode.ChildNodes[0])
Expand Down
172 changes: 82 additions & 90 deletions internal/membership/membership_test.go
View file
Open in desktop
Expand Up @@ -192,16 +192,15 @@ func TestMembershipSetIntersectionWithOneWildcard(t *testing.T) {
require := require.New(t)
ms := NewMembershipSet()

intersection :=
graph.Intersection(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "*", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "legal", "...")),
),
)
intersection := graph.Intersection(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "*", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "legal", "...")),
),
)

fso, ok, err := ms.AddExpansion(ONR("folder", "company", "viewer"), intersection)
require.True(ok)
Expand All @@ -213,16 +212,15 @@ func TestMembershipSetIntersectionWithAllWildcardLeft(t *testing.T) {
require := require.New(t)
ms := NewMembershipSet()

intersection :=
graph.Intersection(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "*", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
)
intersection := graph.Intersection(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "*", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
)

fso, ok, err := ms.AddExpansion(ONR("folder", "company", "viewer"), intersection)
require.True(ok)
Expand All @@ -234,16 +232,15 @@ func TestMembershipSetIntersectionWithAllWildcardRight(t *testing.T) {
require := require.New(t)
ms := NewMembershipSet()

intersection :=
graph.Intersection(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "*", "...")),
),
)
intersection := graph.Intersection(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "*", "...")),
),
)

fso, ok, err := ms.AddExpansion(ONR("folder", "company", "viewer"), intersection)
require.True(ok)
Expand All @@ -255,16 +252,15 @@ func TestMembershipSetExclusionWithLeftWildcard(t *testing.T) {
require := require.New(t)
ms := NewMembershipSet()

exclusion :=
graph.Exclusion(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "*", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "legal", "...")),
),
)
exclusion := graph.Exclusion(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "*", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "legal", "...")),
),
)

fso, ok, err := ms.AddExpansion(ONR("folder", "company", "viewer"), exclusion)
require.True(ok)
Expand All @@ -276,16 +272,15 @@ func TestMembershipSetExclusionWithRightWildcard(t *testing.T) {
require := require.New(t)
ms := NewMembershipSet()

exclusion :=
graph.Exclusion(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "legal", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
)
exclusion := graph.Exclusion(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "legal", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
)

fso, ok, err := ms.AddExpansion(ONR("folder", "company", "viewer"), exclusion)
require.True(ok)
Expand All @@ -297,19 +292,18 @@ func TestMembershipSetIntersectionWithThreeWildcards(t *testing.T) {
require := require.New(t)
ms := NewMembershipSet()

intersection :=
graph.Intersection(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "legal", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
)
intersection := graph.Intersection(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "legal", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
)

fso, ok, err := ms.AddExpansion(ONR("folder", "company", "viewer"), intersection)
require.True(ok)
Expand All @@ -321,20 +315,19 @@ func TestMembershipSetIntersectionWithOneBranchMissingWildcards(t *testing.T) {
require := require.New(t)
ms := NewMembershipSet()

intersection :=
graph.Intersection(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "legal", "...")),
tuple.User(ONR("user", "*", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
)
intersection := graph.Intersection(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "legal", "...")),
tuple.User(ONR("user", "*", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
)

fso, ok, err := ms.AddExpansion(ONR("folder", "company", "viewer"), intersection)
require.True(ok)
Expand All @@ -346,19 +339,18 @@ func TestMembershipSetIntersectionWithTwoBranchesMissingWildcards(t *testing.T)
require := require.New(t)
ms := NewMembershipSet()

intersection :=
graph.Intersection(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "legal", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "another", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
)
intersection := graph.Intersection(ONR("folder", "company", "viewer"),
graph.Leaf(_this,
tuple.User(ONR("user", "owner", "...")),
tuple.User(ONR("user", "legal", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "another", "...")),
),
graph.Leaf(_this,
tuple.User(ONR("user", "*", "...")),
),
)

fso, ok, err := ms.AddExpansion(ONR("folder", "company", "viewer"), intersection)
require.True(ok)
Expand Down
8 changes: 4 additions & 4 deletions internal/services/testconfigs/simplewildcard.yaml
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ relationships: |
test/resource:first#viewer@test/user:concreteguy
assertions:
assertTrue:
- test/resource:first#viewer@test/user:concreteguy
- test/resource:first#viewer@test/user:anotheruser
- test/resource:first#viewer@test/user:aseconduser
- test/resource:first#viewer@test/user:athirduser
- "test/resource:first#viewer@test/user:concreteguy"
- "test/resource:first#viewer@test/user:anotheruser"
- "test/resource:first#viewer@test/user:aseconduser"
- "test/resource:first#viewer@test/user:athirduser"
26 changes: 13 additions & 13 deletions internal/services/testconfigs/wildcardnested.yaml
View file
Open in desktop
Expand Up @@ -16,20 +16,20 @@ relationships: |
test/resource:first#mustbehere@test/user:somegal
assertions:
assertTrue:
- test/resource:first#viewer@test/user:somegal
- test/resource:first#viewer@test/user:anotherperson
- test/resource:first#viewer@test/user:thirduser
- test/resource:first#viewer@test/user:bannedguy
- "test/resource:first#viewer@test/user:somegal"
- "test/resource:first#viewer@test/user:anotherperson"
- "test/resource:first#viewer@test/user:thirduser"
- "test/resource:first#viewer@test/user:bannedguy"

- test/resource:first#view@test/user:somegal
- test/resource:first#view@test/user:anotherperson
- test/resource:first#view@test/user:thirduser
- "test/resource:first#view@test/user:somegal"
- "test/resource:first#view@test/user:anotherperson"
- "test/resource:first#view@test/user:thirduser"

- test/resource:first#mustbehere@test/user:somegal
- test/resource:first#specialview@test/user:somegal
- "test/resource:first#mustbehere@test/user:somegal"
- "test/resource:first#specialview@test/user:somegal"
assertFalse:
- test/resource:first#view@test/user:bannedguy
- "test/resource:first#view@test/user:bannedguy"

- test/resource:first#specialview@test/user:bannedguy
- test/resource:first#specialview@test/user:anotherperson
- test/resource:first#specialview@test/user:thirduser
- "test/resource:first#specialview@test/user:bannedguy"
- "test/resource:first#specialview@test/user:anotherperson"
- "test/resource:first#specialview@test/user:thirduser"
6 changes: 3 additions & 3 deletions internal/services/testconfigs/wildcardwithintersection.yaml
View file
Open in desktop
Expand Up @@ -16,9 +16,9 @@ relationships: |
test/resource:second#viewer@test/user:*
assertions:
assertTrue:
- test/resource:first#view@test/user:somegal
- test/resource:second#view@test/user:editordude
- test/resource:second#view@test/user:seconduser
- "test/resource:first#view@test/user:somegal"
- "test/resource:second#view@test/user:editordude"
- "test/resource:second#view@test/user:seconduser"
assertFalse:
- "test/resource:first#view@test/user:editordude"
- "test/resource:first#view@test/user:anotheruser"
Expand Down
6 changes: 3 additions & 3 deletions internal/services/testconfigs/wildcardwithrightsideexclusion.yaml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ schema: >-
definition test/user {}

definition test/resource {
relation viewer: test/user
relation viewer: test/user
relation banned: test/user | test/user:*

permission view = viewer - banned
Expand All @@ -16,8 +16,8 @@ relationships: |
test/resource:second#viewer@test/user:somegal
assertions:
assertTrue:
- test/resource:first#viewer@test/user:somegal
- test/resource:second#viewer@test/user:somegal
- "test/resource:first#viewer@test/user:somegal"
- "test/resource:second#viewer@test/user:somegal"
assertFalse:
- "test/resource:first#view@test/user:editordude"
- "test/resource:first#view@test/user:anotheruser"
Expand Down