enhance: [2.4] add list aliases privilege into public role and fix ty…

…po (#38208) cherry-pick from master: #38176, #38195 related issue: #37031 --------- Signed-off-by: shaoting-huang <[email protected]>
milvus-io · Dec 4, 2024 · febed0a · febed0a
1 parent 319f549
commit febed0a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/internal/proxy/impl.go b/internal/proxy/impl.go
@@ -5276,7 +5276,7 @@ func (node *Proxy) validateOperatePrivilegeV2Params(req *milvuspb.OperatePrivile
 			return err
 		}
 	}
-	if err := ValidateObjectName(req.CollectionName); err != nil {
+	if err := ValidateCollectionName(req.CollectionName); err != nil {
 		return err
 	}
 	return nil

diff --git a/internal/proxy/util.go b/internal/proxy/util.go
@@ -928,6 +928,13 @@ func ValidateObjectName(entity string) error {
 	return validateName(entity, "object name")
 }
 
+func ValidateCollectionName(entity string) error {
+	if util.IsAnyWord(entity) {
+		return nil
+	}
+	return validateName(entity, "collection name")
+}
+
 func ValidateObjectType(entity string) error {
 	return validateName(entity, "ObjectType")
 }

diff --git a/internal/rootcoord/root_coord.go b/internal/rootcoord/root_coord.go
@@ -566,6 +566,7 @@ func (c *Core) initPublicRolePrivilege() error {
 	// grant privileges for the public role
 	globalPrivileges := []string{
 		commonpb.ObjectPrivilege_PrivilegeDescribeCollection.String(),
+		commonpb.ObjectPrivilege_PrivilegeListAliases.String(),
 	}
 	collectionPrivileges := []string{
 		commonpb.ObjectPrivilege_PrivilegeIndexDetail.String(),

diff --git a/internal/rootcoord/root_coord_test.go b/internal/rootcoord/root_coord_test.go
@@ -1864,7 +1864,7 @@ func TestCore_InitRBAC(t *testing.T) {
 		meta := mockrootcoord.NewIMetaTable(t)
 		c := newTestCore(withHealthyCode(), withMeta(meta))
 		meta.EXPECT().CreateRole(mock.Anything, mock.Anything).Return(nil).Twice()
-		meta.EXPECT().OperatePrivilege(mock.Anything, mock.Anything, mock.Anything).Return(nil).Twice()
+		meta.EXPECT().OperatePrivilege(mock.Anything, mock.Anything, mock.Anything).Return(nil).Times(3)
 
 		Params.Save(Params.RoleCfg.Enabled.Key, "false")
 		Params.Save(Params.ProxyCfg.EnablePublicPrivilege.Key, "true")