fix: allow ldap managed grps to be set and removed as principals… (#3363)
This commit is contained in:
3 files changed
+31
-4
No files matched your search
@@ -1006,7 +1006,8 @@ func validateSetRolePrincipalsRequest(req *pbs.SetRolePrincipalsRequest) error {
|
||||
for _, id := range req.GetPrincipalIds() {
|
||||
if !handlers.ValidId(handlers.Id(id), globals.GroupPrefix) &&
|
||||
!handlers.ValidId(handlers.Id(id), globals.UserPrefix) &&
|
||||
!handlers.ValidId(handlers.Id(id), globals.OidcManagedGroupPrefix) {
|
||||
!handlers.ValidId(handlers.Id(id), globals.OidcManagedGroupPrefix) &&
|
||||
!handlers.ValidId(handlers.Id(id), globals.LdapManagedGroupPrefix) {
|
||||
badFields["principal_ids"] = "Must only have valid user, group, and/or managed group ids."
|
||||
break
|
||||
}
|
||||
@@ -1035,7 +1036,8 @@ func validateRemoveRolePrincipalsRequest(req *pbs.RemoveRolePrincipalsRequest) e
|
||||
for _, id := range req.GetPrincipalIds() {
|
||||
if !handlers.ValidId(handlers.Id(id), globals.GroupPrefix) &&
|
||||
!handlers.ValidId(handlers.Id(id), globals.UserPrefix) &&
|
||||
!handlers.ValidId(handlers.Id(id), globals.OidcManagedGroupPrefix) {
|
||||
!handlers.ValidId(handlers.Id(id), globals.OidcManagedGroupPrefix) &&
|
||||
!handlers.ValidId(handlers.Id(id), globals.LdapManagedGroupPrefix) {
|
||||
badFields["principal_ids"] = "Must only have valid user, group, and/or managed group ids."
|
||||
break
|
||||
}
|
||||
|
||||
@@ -1246,6 +1246,9 @@ func TestSetPrincipal(t *testing.T) {
|
||||
oidc.WithApiUrl(oidc.TestConvertToUrls(t, "https://www.alice.com/callback")[0]),
|
||||
)
|
||||
|
||||
ldapAuthMethod := ldap.TestAuthMethod(t, conn, databaseWrapper, o.PublicId, []string{"ldaps://ldap1"})
|
||||
ldapManagedGroup := ldap.TestManagedGroup(t, conn, ldapAuthMethod, []string{"admin"})
|
||||
|
||||
users := []*iam.User{
|
||||
iam.TestUser(t, iamRepo, o.GetPublicId()),
|
||||
iam.TestUser(t, iamRepo, o.GetPublicId()),
|
||||
@@ -1332,6 +1335,14 @@ func TestSetPrincipal(t *testing.T) {
|
||||
setManagedGroups: []string{managedGroups[1].GetPublicId()},
|
||||
resultManagedGroups: []string{managedGroups[1].GetPublicId()},
|
||||
},
|
||||
{
|
||||
name: "Set LDAP managed group on populated role",
|
||||
setup: func(r *iam.Role) {
|
||||
iam.TestManagedGroupRole(t, conn, r.GetPublicId(), managedGroups[0].GetPublicId())
|
||||
},
|
||||
setManagedGroups: []string{ldapManagedGroup.GetPublicId()},
|
||||
resultManagedGroups: []string{ldapManagedGroup.GetPublicId()},
|
||||
},
|
||||
{
|
||||
name: "Set invalid u_recovery on role",
|
||||
setup: func(r *iam.Role) {},
|
||||
@@ -1436,6 +1447,9 @@ func TestRemovePrincipal(t *testing.T) {
|
||||
oidc.WithApiUrl(oidc.TestConvertToUrls(t, "https://www.alice.com/callback")[0]),
|
||||
)
|
||||
|
||||
ldapAuthMethod := ldap.TestAuthMethod(t, conn, databaseWrapper, o.PublicId, []string{"ldaps://ldap1"})
|
||||
ldapManagedGroup := ldap.TestManagedGroup(t, conn, ldapAuthMethod, []string{"admin"})
|
||||
|
||||
users := []*iam.User{
|
||||
iam.TestUser(t, iamRepo, o.GetPublicId()),
|
||||
iam.TestUser(t, iamRepo, o.GetPublicId()),
|
||||
@@ -1569,6 +1583,15 @@ func TestRemovePrincipal(t *testing.T) {
|
||||
removeManagedGroups: []string{managedGroups[0].GetPublicId(), managedGroups[1].GetPublicId()},
|
||||
resultManagedGroups: []string{},
|
||||
},
|
||||
{
|
||||
name: "Remove LDAP managed groups from role",
|
||||
setup: func(r *iam.Role) {
|
||||
iam.TestManagedGroupRole(t, conn, r.GetPublicId(), ldapManagedGroup.GetPublicId())
|
||||
iam.TestManagedGroupRole(t, conn, r.GetPublicId(), managedGroups[0].GetPublicId())
|
||||
},
|
||||
removeManagedGroups: []string{ldapManagedGroup.GetPublicId()},
|
||||
resultManagedGroups: []string{managedGroups[0].GetPublicId()},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range addCases {
|
||||
|
||||
Reference in new issue
Block a user