NB-Public/user_saml
14
0
Fork 0
mirror of https://github.com/netzbegruenung/user_saml.git synced 2024-05-02 17:14:53 +02:00
Code Issues Projects Releases Wiki Activity

Create new SAML group on gid collision

Browse source 
Signed-off-by: Jonathan Treffler <mail@jonathan-treffler.de>
Signed-off-by: Giuliano Mele <giuliano.mele@verdigado.com>
This commit is contained in:
Giuliano Mele 2021-07-31 17:09:40 +02:00 committed by Jonathan Treffler
parent c43453e821
commit 49bc11c4e2
1 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/GroupManager.php
View file

@ -60,15 +60,42 @@ class GroupManager
$this->settings = $settings;
}
private function getGroupsToRemove($samlGroups, $assignedGroups): array {
$groupsToRemove = [];
foreach($assignedGroups as $group) {
// if group is not supplied by SAML and group has SAML backend
if (!in_array($group->getGID(), $samlGroups) && $this->hasSamlBackend($group)) {
$groupsToRemove[] = $group->getGID();
}
}
return $groupsToRemove;
}
private function getGroupsToAdd($samlGroups, $assignedGroupIds): array {
$groupsToAdd = [];
foreach($samlGroups as $group) {
// if user is not assigend to the group or the provided group has a non SAML backend
if (!in_array($group, $assignedGroupIds) || !$this->hasSamlBackend($this->groupManager->get($group))) {
$groupsToAdd[] = $group;
}
}
return $groupsToAdd;
}
public function replaceGroups($uid, $samlGroups) {
$user = $this->userManager->get($uid);
if($user === null) {
return;
}
$this->translateGroupToIds($samlGroups);
$assigned = $this->groupManager->getUserGroupIds($user);
$this->removeGroups($user, array_diff($assigned, $samlGroups));
$this->addGroups($user, array_diff($samlGroups, $assigned));
$assignedGroups = $this->groupManager->getUserGroups($user);
$assignedGroupIds = array_map(function(IGroup $group){
return $group->getGID();
}, $assignedGroups);
$groupsToRemove = $this->getGroupsToRemove($samlGroups, $assignedGroups);
$groupsToAdd = $this->getGroupsToAdd($samlGroups, $assignedGroupIds);
$this->removeGroups($user, $groupsToRemove);
$this->addGroups($user, $groupsToAdd);
}
protected function translateGroupToIds(array &$samlGroups) {
@ -88,7 +115,7 @@ class GroupManager
public function removeGroup(IUser $user, string $gid) {
$group = $this->groupManager->get($gid);
if($group === null || !$this->hasSamlBackend($group)) {
if($group === null) {
return;
}
$group->removeUser($user);