MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-11 23:13:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

site replication must heal policy mappings with correct userType (#18563)

Browse Source
This commit is contained in:
Harshavardhana 2023-11-30 10:34:18 -08:00 committed by GitHub
parent 34187e047d
commit 879d5dd236
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/site-replication.go
View File

@ -2032,7 +2032,7 @@ func (c *SiteReplicationSys) syncToAllPeers(ctx context.Context, addOpts madmin.
Type: madmin.SRIAMItemPolicyMapping, Type: madmin.SRIAMItemPolicyMapping,
PolicyMapping: &madmin.SRPolicyMapping{ PolicyMapping: &madmin.SRPolicyMapping{
UserOrGroup: group, UserOrGroup: group,
UserType: -1, UserType: int(unknownIAMUserType),
IsGroup: true, IsGroup: true,
Policy: mp.Policies, Policy: mp.Policies,
}, },
@ -3757,12 +3757,14 @@ func (c *SiteReplicationSys) SiteReplicationMetaInfo(ctx context.Context, objAPI
if opts.Users || opts.Entity == madmin.SRUserEntity { if opts.Users || opts.Entity == madmin.SRUserEntity {
// Replicate policy mappings on local to all peers. // Replicate policy mappings on local to all peers.
userPolicyMap := make(map[string]MappedPolicy) userPolicyMap := make(map[string]MappedPolicy)
stsPolicyMap := make(map[string]MappedPolicy)
svcPolicyMap := make(map[string]MappedPolicy)
if opts.Entity == madmin.SRUserEntity { if opts.Entity == madmin.SRUserEntity {
if mp, ok := globalIAMSys.store.GetMappedPolicy(opts.EntityValue, false); ok { if mp, ok := globalIAMSys.store.GetMappedPolicy(opts.EntityValue, false); ok {
userPolicyMap[opts.EntityValue] = mp userPolicyMap[opts.EntityValue] = mp
} }
} else { } else {
stsErr := globalIAMSys.store.loadMappedPolicies(ctx, stsUser, false, userPolicyMap) stsErr := globalIAMSys.store.loadMappedPolicies(ctx, stsUser, false, stsPolicyMap)
if stsErr != nil { if stsErr != nil {
return info, errSRBackendIssue(stsErr) return info, errSRBackendIssue(stsErr)
} }
@ -3770,7 +3772,7 @@ func (c *SiteReplicationSys) SiteReplicationMetaInfo(ctx context.Context, objAPI
if usrErr != nil { if usrErr != nil {
return info, errSRBackendIssue(usrErr) return info, errSRBackendIssue(usrErr)
} }
svcErr := globalIAMSys.store.loadMappedPolicies(ctx, svcUser, false, userPolicyMap) svcErr := globalIAMSys.store.loadMappedPolicies(ctx, svcUser, false, svcPolicyMap)
if svcErr != nil { if svcErr != nil {
return info, errSRBackendIssue(svcErr) return info, errSRBackendIssue(svcErr)
} }
@ -3780,6 +3782,25 @@ func (c *SiteReplicationSys) SiteReplicationMetaInfo(ctx context.Context, objAPI
info.UserPolicies[user] = madmin.SRPolicyMapping{ info.UserPolicies[user] = madmin.SRPolicyMapping{
IsGroup: false, IsGroup: false,
UserOrGroup: user, UserOrGroup: user,
UserType: int(regUser),
Policy: mp.Policies,
UpdatedAt: mp.UpdatedAt,
}
}
for stsU, mp := range stsPolicyMap {
info.UserPolicies[stsU] = madmin.SRPolicyMapping{
IsGroup: false,
UserOrGroup: stsU,
UserType: int(stsUser),
Policy: mp.Policies,
UpdatedAt: mp.UpdatedAt,
}
}
for svcU, mp := range svcPolicyMap {
info.UserPolicies[svcU] = madmin.SRPolicyMapping{
IsGroup: false,
UserOrGroup: svcU,
UserType: int(svcUser),
Policy: mp.Policies, Policy: mp.Policies,
UpdatedAt: mp.UpdatedAt, UpdatedAt: mp.UpdatedAt,
} }
@ -5285,6 +5306,7 @@ func (c *SiteReplicationSys) healUserPolicies(ctx context.Context, objAPI Object
PolicyMapping: &madmin.SRPolicyMapping{ PolicyMapping: &madmin.SRPolicyMapping{
UserOrGroup: user, UserOrGroup: user,
IsGroup: false, IsGroup: false,
UserType: latestUserStat.userPolicy.UserType,
Policy: latestUserStat.userPolicy.Policy, Policy: latestUserStat.userPolicy.Policy,
}, },
UpdatedAt: lastUpdate, UpdatedAt: lastUpdate,
@ -5347,6 +5369,7 @@ func (c *SiteReplicationSys) healGroupPolicies(ctx context.Context, objAPI Objec
PolicyMapping: &madmin.SRPolicyMapping{ PolicyMapping: &madmin.SRPolicyMapping{
UserOrGroup: group, UserOrGroup: group,
IsGroup: true, IsGroup: true,
UserType: int(unknownIAMUserType),
Policy: latestGroupStat.groupPolicy.Policy, Policy: latestGroupStat.groupPolicy.Policy,
}, },
UpdatedAt: lastUpdate, UpdatedAt: lastUpdate,