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 accidental overwriting of LDAP team memberships (#24050) #24065

Merged
merged 6 commits into from
Apr 12, 2023
Merged

Fix accidental overwriting of LDAP team memberships (#24050) #24065

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cac1e1c
Fix accidental overwriting of LDAP team memberships (#24050)
sillyguodong Apr 11, 2023
8ed27fa
Merge branch 'release/v1.19' into backport-24050-v1.19
lafriks Apr 12, 2023
285129f
Merge branch 'release/v1.19' into backport-24050-v1.19
GiteaBot Apr 12, 2023
8d68897
Merge branch 'release/v1.19' into backport-24050-v1.19
GiteaBot Apr 12, 2023
c335636
Merge branch 'release/v1.19' into backport-24050-v1.19
GiteaBot Apr 12, 2023
20d7c26
Merge branch 'release/v1.19' into backport-24050-v1.19
GiteaBot Apr 12, 2023
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 services/auth/source/source_group_sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ func resolveMappedMemberships(sourceUserGroups container.Set[string], sourceGrou
isUserInGroup := sourceUserGroups.Contains(group)
if isUserInGroup {
for org, teams := range memberships {
membershipsToAdd[org] = teams
membershipsToAdd[org] = append(membershipsToAdd[org], teams...)
}
} else {
for org, teams := range memberships {
membershipsToRemove[org] = teams
membershipsToRemove[org] = append(membershipsToRemove[org], teams...)
}
}
}
Expand Down