Fix user's roles update

pydio · Jun 15, 2016 · 4d3dc1f · 4d3dc1f
1 parent 0e000ff
commit 4d3dc1f
Showing 1 changed file with 34 additions and 3 deletions.
diff --git a/core/src/plugins/auth.ldap/class.ldapAuthDriver.php b/core/src/plugins/auth.ldap/class.ldapAuthDriver.php
@@ -760,15 +760,25 @@ public function updateUserObject(&$userObject)
                                     $userroles = $userObject->getRoles();
                                     //remove all mapped roles before
 
+                                    $userroles = $userObject->getRoles();
+                                    //remove all mapped roles before
+
+                                    $oldRoles = array();
+                                    $newRoles = array();
+
                                     if (is_array($userroles)) {
                                         foreach ($userroles as $key => $role) {
                                             if ((AuthService::getRole($key)) && !(strpos($key, $this->mappedRolePrefix) === false)) {
-                                                $userObject->removeRole($key);
+                                                if (isSet($matchFilter) && !preg_match($matchFilter, $key)) continue;
+                                                if (isSet($valueFilters) && !in_array($key, $valueFilters)) continue;
+                                                //$userObject->removeRole($key);
+                                                $oldRoles[$key] = $role;
                                             }
                                         }
                                     }
-                                    $userObject->recomputeMergedRole();
+                                    //$userObject->recomputeMergedRole();
 
+                                    // Detect changes
                                     foreach ($memberValues as $uniqValue => $fullDN) {
                                         $uniqValueWithPrefix = $rolePrefix . $uniqValue;
                                         if (isSet($matchFilter) && !preg_match($matchFilter, $uniqValueWithPrefix)) continue;
@@ -779,9 +789,30 @@ public function updateUserObject(&$userObject)
                                             $roleToAdd->setLabel($uniqValue);
                                             AuthService::updateRole($roleToAdd);
                                         }
-                                        $userObject->addRole($roleToAdd);
+                                        $newRoles[$roleToAdd->getId()] = $roleToAdd;
+                                        //$userObject->addRole($roleToAdd);
+                                    }
+
+                                    if((count(array_diff(array_keys($oldRoles), array_keys($newRoles))) > 0) ||
+                                        (count(array_diff(array_keys($newRoles), array_keys($oldRoles))) > 0) )
+                                    {
+                                        // remove old roles
+                                        foreach ($oldRoles as $key => $role) {
+                                            if ((AuthService::getRole($key)) && !(strpos($key, $this->mappedRolePrefix) === false)) {
+                                                $userObject->removeRole($key);
+                                            }
+                                        }
+
+                                        //Add new roles;
+                                        foreach($newRoles as $key => $role){
+                                            if ((AuthService::getRole($key)) && !(strpos($key, $this->mappedRolePrefix) === false)) {
+                                                $userObject->addRole($role);
+                                            }
+                                        }
+                                        $userObject->recomputeMergedRole();
                                         $changes = true;
                                     }
+
                                 } else {
                                     foreach ($entry[$key] as $uniqValue) {
                                         if (isSet($matchFilter) && !preg_match($matchFilter, $uniqValue)) continue;