mirror of
https://github.com/nextcloud/server.git
synced 2026-06-10 17:23:59 -04:00
admin have no special rights on users' entries
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
This commit is contained in:
parent
dc73199e2f
commit
82e269c521
2 changed files with 7 additions and 30 deletions
|
|
@ -108,7 +108,7 @@ class AjaxController extends Controller {
|
|||
$currentUser = $this->userSession->getUser();
|
||||
|
||||
// Non-admins can only edit their own credentials
|
||||
$allowedToEdit = ($this->groupManager->isAdmin($currentUser->getUID()) || $currentUser->getUID() === $uid);
|
||||
$allowedToEdit = ($currentUser->getUID() === $uid);
|
||||
|
||||
if ($allowedToEdit) {
|
||||
$this->globalAuth->saveAuth($uid, $user, $password);
|
||||
|
|
|
|||
|
|
@ -102,17 +102,11 @@ class AjaxControllerTest extends TestCase {
|
|||
->expects($this->once())
|
||||
->method('getUser')
|
||||
->willReturn($user);
|
||||
$this->groupManager
|
||||
->expects($this->once())
|
||||
->method('isAdmin')
|
||||
->with('MyAdminUid')
|
||||
->willReturn(true);
|
||||
$this->globalAuth
|
||||
->expects($this->once())
|
||||
->method('saveAuth')
|
||||
->with('UidOfTestUser', 'test', 'password');
|
||||
->expects($this->never())
|
||||
->method('saveAuth');
|
||||
|
||||
$this->assertSame(true, $this->ajaxController->saveGlobalCredentials('UidOfTestUser', 'test', 'password'));
|
||||
$this->assertSame(false, $this->ajaxController->saveGlobalCredentials('UidOfTestUser', 'test', 'password'));
|
||||
}
|
||||
|
||||
public function testSaveGlobalCredentialsAsAdminForSelf() {
|
||||
|
|
@ -125,11 +119,6 @@ class AjaxControllerTest extends TestCase {
|
|||
->expects($this->once())
|
||||
->method('getUser')
|
||||
->willReturn($user);
|
||||
$this->groupManager
|
||||
->expects($this->once())
|
||||
->method('isAdmin')
|
||||
->with('MyAdminUid')
|
||||
->willReturn(true);
|
||||
$this->globalAuth
|
||||
->expects($this->once())
|
||||
->method('saveAuth')
|
||||
|
|
@ -141,20 +130,12 @@ class AjaxControllerTest extends TestCase {
|
|||
public function testSaveGlobalCredentialsAsNormalUserForSelf() {
|
||||
$user = $this->createMock(IUser::class);
|
||||
$user
|
||||
->expects($this->exactly(2))
|
||||
->method('getUID')
|
||||
->willReturn('MyUserUid');
|
||||
$this->userSession
|
||||
->expects($this->once())
|
||||
->method('getUser')
|
||||
->willReturn($user);
|
||||
$this->groupManager
|
||||
->expects($this->once())
|
||||
->method('isAdmin')
|
||||
->with('MyUserUid')
|
||||
->willReturn(false);
|
||||
$this->globalAuth
|
||||
->expects($this->once())
|
||||
->method('saveAuth')
|
||||
->with('MyUserUid', 'test', 'password');
|
||||
|
||||
|
|
@ -164,18 +145,14 @@ class AjaxControllerTest extends TestCase {
|
|||
public function testSaveGlobalCredentialsAsNormalUserForAnotherUser() {
|
||||
$user = $this->createMock(IUser::class);
|
||||
$user
|
||||
->expects($this->exactly(2))
|
||||
->method('getUID')
|
||||
->willReturn('MyUserUid');
|
||||
$this->userSession
|
||||
->expects($this->once())
|
||||
->method('getUser')
|
||||
->willReturn($user);
|
||||
$this->groupManager
|
||||
->expects($this->once())
|
||||
->method('isAdmin')
|
||||
->with('MyUserUid')
|
||||
->willReturn(false);
|
||||
$this->globalAuth
|
||||
->expects($this->never())
|
||||
->method('saveAuth');
|
||||
|
||||
$this->assertSame(false, $this->ajaxController->saveGlobalCredentials('AnotherUserUid', 'test', 'password'));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue