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

fix: RestoreRBAC pass wrong role info of user #840

Merged
merged 1 commit into from
Oct 30, 2024
Merged

fix: RestoreRBAC pass wrong role info of user #840

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
4 changes: 2 additions & 2 deletions client/rbac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,9 @@ func (c *GrpcClient) RestoreRBAC(ctx context.Context, meta *entity.RBACMeta) err
users := make([]*milvuspb.UserInfo, 0, len(meta.Users))
for _, user := range meta.Users {
roles := make([]*milvuspb.RoleEntity, 0, len(user.Roles))
for _, role := range meta.Roles {
for _, role := range user.Roles {
roles = append(roles, &milvuspb.RoleEntity{
Name: role.Name,
Name: role,
})
}
users = append(users, &milvuspb.UserInfo{
Expand Down
87 changes: 81 additions & 6 deletions examples/rbac/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ package main
import (
"context"
"log"
"strings"

"github.com/milvus-io/milvus-sdk-go/v2/client"
"github.com/milvus-io/milvus-sdk-go/v2/entity"
"github.com/milvus-io/milvus-sdk-go/v2/internal/utils/crypto"
"google.golang.org/grpc/metadata"
)

const (
Expand All @@ -22,13 +25,20 @@ func main() {

log.Println("start connecting to Milvus")
c, err := client.NewClient(ctx, client.Config{
Address: milvusAddr,
Address: milvusAddr,
Username: "root",
Password: "Milvus",
})
if err != nil {
log.Fatalf("failed to connect to milvus, err: %v", err)
}
defer c.Close()

// clean rbac
c.Revoke(ctx, "role123", entity.PriviledegeObjectTypeCollection, "*", "*")
c.DeleteCredential(ctx, "user123")
c.DropRole(ctx, "role123")

// create user
err = c.CreateCredential(ctx, "user123", "passwd1")
if err != nil {
Expand All @@ -40,30 +50,95 @@ func main() {
if err != nil {
log.Fatalf("failed to create role, err: %v", err)
}
c.Grant(ctx, "role123", entity.PriviledegeObjectTypeGlobal, "*", "read")

grants, _ := c.ListGrants(ctx, "role123", "default")
log.Println("grants: ", len(grants))

err = c.Grant(ctx, "role123", entity.PriviledegeObjectTypeCollection, "*", "Search")
if err != nil {
log.Fatalf("failed to grant role, err: %v", err)
}
grants, _ = c.ListGrants(ctx, "role123", "default")
log.Println("grants: ", len(grants))

// grant role to user
c.AddUserRole(ctx, "user123", "role123")
c.AddUserRole(ctx, "user123", "public")
c.AddUserRole(ctx, "user123", "admin")

// backup rbac
meta, err := c.BackupRBAC(ctx)
if err != nil {
log.Fatalf("failed to backup rbac, err: %v", err)
}
log.Println("user num: ", len(meta.Users))
for _, user := range meta.Users {
log.Println("user's role", user.Roles)
}
log.Println("role num: ", len(meta.Roles))
log.Println("grants num: ", len(meta.RoleGrants))

// clean rbac to make restore works
c.DropRole(ctx, "role123")
grants, _ = c.ListGrants(ctx, "role123", "default")
log.Println("grants: ", len(grants))
err = c.Revoke(ctx, "role123", entity.PriviledegeObjectTypeCollection, "*", "Search")
if err != nil {
log.Fatalf("failed to revoke, err: %v", err)
}
grants, _ = c.ListGrants(ctx, "role123", "default")
log.Println("grants: ", len(grants))
c.DeleteCredential(ctx, "user123")
c.Revoke(ctx, "role123", entity.PriviledegeObjectTypeGlobal, "*", "read")
err = c.DropRole(ctx, "role123")
if err != nil {
log.Fatalf("failed to drop role, err: %v", err)
}

log.Println("-----start to restore rbac-----")

// restore rbac
grants, _ = c.ListGrants(ctx, "role123", "default")
log.Println("grants: ", len(grants))

err = c.RestoreRBAC(ctx, meta)
if err != nil {
log.Fatalf("failed to restore rbac, err: %v", err)
}

// backup rbac to check
log.Println("-----verify restore result-----")
meta, err = c.BackupRBAC(ctx)
if err != nil {
log.Fatalf("failed to backup rbac, err: %v", err)
}
log.Println("user num: ", len(meta.Users))
for _, user := range meta.Users {
log.Println("user's role", user.Roles)
}
log.Println("role num: ", len(meta.Roles))
log.Println("grants num: ", len(meta.RoleGrants))

// clean rbac
c.DropRole(ctx, "role123")
grants, _ = c.ListGrants(ctx, "role123", "default")
log.Println("grants: ", len(grants))
err = c.Revoke(ctx, "role123", entity.PriviledegeObjectTypeCollection, "*", "Search")
if err != nil {
log.Fatalf("failed to revoke, err: %v", err)
}
grants, _ = c.ListGrants(ctx, "role123", "default")
log.Println("grants: ", len(grants))
c.DeleteCredential(ctx, "user123")
c.Revoke(ctx, "role123", entity.PriviledegeObjectTypeGlobal, "*", "read")
err = c.DropRole(ctx, "role123")
if err != nil {
log.Fatalf("failed to drop role, err: %v", err)
}
}

func GetContext(ctx context.Context, originValue string) context.Context {
authKey := strings.ToLower("authorization")
authValue := crypto.Base64Encode(originValue)
contextMap := map[string]string{
authKey: authValue,
}
md := metadata.New(contextMap)
return metadata.NewIncomingContext(ctx, md)
}
Loading