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

rbac: casbin: adjust model to use keyMatch5 #6290

Merged
merged 19 commits into from
Nov 12, 2024
Merged

rbac: casbin: adjust model to use keyMatch5 #6290

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift click to select a range
1062f52
rbac: casbin: adjust model to use globalMatch
moogacs Nov 11, 2024
e6cf663
fix builtin policy creation
moogacs Nov 11, 2024
784841f
use regex match
moogacs Nov 11, 2024
d597b9c
refact testnaming
moogacs Nov 11, 2024
86303e8
use KeyMatch5
moogacs Nov 12, 2024
2a6ff4d
Merge branch 'feat/rbac' into casbin-model
moogacs Nov 12, 2024
f0e9e14
clean after rebase
moogacs Nov 12, 2024
1baeeec
built in * instead of .*
moogacs Nov 12, 2024
dc47f29
fix tests
moogacs Nov 12, 2024
3b07be4
Merge branch 'feat/rbac' into casbin-model
moogacs Nov 12, 2024
22b075f
clean after rebase
moogacs Nov 12, 2024
5fcb3f5
convert test to table based
moogacs Nov 12, 2024
ea65e68
add pRole type
moogacs Nov 12, 2024
1af6d62
fix Test_policy
moogacs Nov 12, 2024
bd96a03
Merge branch 'feat/rbac' into casbin-model
moogacs Nov 12, 2024
f354a69
DeleteTenants: validate then authorize
moogacs Nov 12, 2024
fe60322
stop AuthZ to override input
moogacs Nov 12, 2024
f745174
un touch file
moogacs Nov 12, 2024
9dcb4e2
remove dupplicate override in Collections
moogacs Nov 12, 2024
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
Prev Previous commit
Next Next commit
stop AuthZ to override input
  • Loading branch information
@moogacs
moogacs committed Nov 12, 2024
commit fe60322c3127ddc15e639057ed5e181f6216fd93
9 changes: 6 additions & 3 deletions usecases/auth/authorization/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 92,9 @@ func Collections(classes ...string) []string {
resources := make([]string, len(classes))
for idx := range classes {
if classes[idx] == "" {
classes[idx] = "*"
resources[idx] = "collections/*"
} else {
resources[idx] = fmt.Sprintf("collections/%s/*", classes[idx])
}
resources[idx] = fmt.Sprintf("collections/%s/*", classes[idx])
moogacs marked this conversation as resolved.
Show resolved Hide resolved
}
Expand Down Expand Up @@ -124,9 126,10 @@ func Shards(class string, shards ...string) []string {
resources := make([]string, len(shards))
for idx := range shards {
if shards[idx] == "" {
shards[idx] = "*"
resources[idx] = fmt.Sprintf("collections/%s/shards/*/*", class)
} else {
resources[idx] = fmt.Sprintf("collections/%s/shards/%s/*", class, shards[idx])
}
resources[idx] = fmt.Sprintf("collections/%s/shards/%s/*", class, shards[idx])
}

return resources
Expand Down
8 changes: 4 additions & 4 deletions usecases/schema/tenant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,16 199,16 @@ func (h *Handler) UpdateTenants(ctx context.Context, principal *models.Principal
//
// Class must exist and has partitioning enabled
func (h *Handler) DeleteTenants(ctx context.Context, principal *models.Principal, class string, tenants []string) error {
if err := h.Authorizer.Authorize(principal, authorization.DELETE, authorization.Shards(class, tenants...)...); err != nil {
return err
}

for i, name := range tenants {
if name == "" {
return fmt.Errorf("empty tenant name at index %d", i)
}
}

if err := h.Authorizer.Authorize(principal, authorization.DELETE, authorization.Shards(class, tenants...)...); err != nil {
return err
}

req := api.DeleteTenantsRequest{
Tenants: tenants,
}
Expand Down
Loading