mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correctly determinate the owner in case of shared external storages 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2019-02-14 10:59:17 +01:00
parent 0b7b938a60
commit f66c37bdb8
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Share20/Manager.php
View File

@ -1419,10 +1419,12 @@ class Manager implements IManager {
return $al; return $al;
} }
//Get node for the owner //Get node for the owner and correct the owner in case of external storages
$userFolder = $this->rootFolder->getUserFolder($owner); $userFolder = $this->rootFolder->getUserFolder($owner);
if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) { if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) {
$path = $userFolder->getById($path->getId())[0]; $nodes = $userFolder->getById($path->getId());
$path = array_shift($nodes);
$owner = $path->getOwner()->getUID();
} }
$providers = $this->factory->getAllProviders(); $providers = $this->factory->getAllProviders();

46
tests/lib/Share20/ManagerTest.php
View File

@ -3427,15 +3427,15 @@ class ManagerTest extends \Test\TestCase {
$extraProvider = $this->createMock(IShareProvider::class); $extraProvider = $this->createMock(IShareProvider::class);
$factory->setSecondProvider($extraProvider); $factory->setSecondProvider($extraProvider);
$owner = $this->createMock(IUser::class); $nodeOwner = $this->createMock(IUser::class);
$owner->expects($this->once()) $nodeOwner->expects($this->once())
->method('getUID') ->method('getUID')
->willReturn('owner'); ->willReturn('user1');
$node = $this->createMock(Node::class); $node = $this->createMock(Node::class);
$node->expects($this->once()) $node->expects($this->once())
->method('getOwner') ->method('getOwner')
->willReturn($owner); ->willReturn($nodeOwner);
$node->method('getId') $node->method('getId')
->willReturn(42); ->willReturn(42);
@ -3443,10 +3443,17 @@ class ManagerTest extends \Test\TestCase {
$file = $this->createMock(File::class); $file = $this->createMock(File::class);
$folder = $this->createMock(Folder::class); $folder = $this->createMock(Folder::class);
$owner = $this->createMock(IUser::class);
$owner->expects($this->once())
->method('getUID')
->willReturn('owner');
$file->method('getParent') $file->method('getParent')
->willReturn($folder); ->willReturn($folder);
$file->method('getPath') $file->method('getPath')
->willReturn('/owner/files/folder/file'); ->willReturn('/owner/files/folder/file');
$file->method('getOwner')
->willReturn($owner);
$file->method('getId') $file->method('getId')
->willReturn(23); ->willReturn(23);
$folder->method('getParent') $folder->method('getParent')
@ -3455,12 +3462,12 @@ class ManagerTest extends \Test\TestCase {
->willReturn('/owner/files/folder'); ->willReturn('/owner/files/folder');
$userFolder->method('getById') $userFolder->method('getById')
->with($this->equalTo(42)) ->with($this->equalTo(42))
->willReturn([$file]); ->willReturn([12 => $file]);
$userFolder->method('getPath') $userFolder->method('getPath')
->willReturn('/owner/files'); ->willReturn('/user1/files');
$this->userManager->method('userExists') $this->userManager->method('userExists')
->with($this->equalTo('owner')) ->with($this->equalTo('user1'))
->willReturn(true); ->willReturn(true);
$this->defaultProvider->method('getAccessList') $this->defaultProvider->method('getAccessList')
@ -3494,7 +3501,7 @@ class ManagerTest extends \Test\TestCase {
]); ]);
$this->rootFolder->method('getUserFolder') $this->rootFolder->method('getUserFolder')
->with($this->equalTo('owner')) ->with($this->equalTo('user1'))
->willReturn($userFolder); ->willReturn($userFolder);
$expected = [ $expected = [
@ -3536,26 +3543,33 @@ class ManagerTest extends \Test\TestCase {
$extraProvider = $this->createMock(IShareProvider::class); $extraProvider = $this->createMock(IShareProvider::class);
$factory->setSecondProvider($extraProvider); $factory->setSecondProvider($extraProvider);
$owner = $this->createMock(IUser::class); $nodeOwner = $this->createMock(IUser::class);
$owner->expects($this->once()) $nodeOwner->expects($this->once())
->method('getUID') ->method('getUID')
->willReturn('owner'); ->willReturn('user1');
$node = $this->createMock(Node::class); $node = $this->createMock(Node::class);
$node->expects($this->once()) $node->expects($this->once())
->method('getOwner') ->method('getOwner')
->willReturn($owner); ->willReturn($nodeOwner);
$node->method('getId') $node->method('getId')
->willReturn(42); ->willReturn(42);
$userFolder = $this->createMock(Folder::class); $userFolder = $this->createMock(Folder::class);
$file = $this->createMock(File::class); $file = $this->createMock(File::class);
$owner = $this->createMock(IUser::class);
$owner->expects($this->once())
->method('getUID')
->willReturn('owner');
$folder = $this->createMock(Folder::class); $folder = $this->createMock(Folder::class);
$file->method('getParent') $file->method('getParent')
->willReturn($folder); ->willReturn($folder);
$file->method('getPath') $file->method('getPath')
->willReturn('/owner/files/folder/file'); ->willReturn('/owner/files/folder/file');
$file->method('getOwner')
->willReturn($owner);
$file->method('getId') $file->method('getId')
->willReturn(23); ->willReturn(23);
$folder->method('getParent') $folder->method('getParent')
@ -3564,12 +3578,12 @@ class ManagerTest extends \Test\TestCase {
->willReturn('/owner/files/folder'); ->willReturn('/owner/files/folder');
$userFolder->method('getById') $userFolder->method('getById')
->with($this->equalTo(42)) ->with($this->equalTo(42))
->willReturn([$file]); ->willReturn([42 => $file]);
$userFolder->method('getPath') $userFolder->method('getPath')
->willReturn('/owner/files'); ->willReturn('/user1/files');
$this->userManager->method('userExists') $this->userManager->method('userExists')
->with($this->equalTo('owner')) ->with($this->equalTo('user1'))
->willReturn(true); ->willReturn(true);
$this->defaultProvider->method('getAccessList') $this->defaultProvider->method('getAccessList')
@ -3605,7 +3619,7 @@ class ManagerTest extends \Test\TestCase {
]); ]);
$this->rootFolder->method('getUserFolder') $this->rootFolder->method('getUserFolder')
->with($this->equalTo('owner')) ->with($this->equalTo('user1'))
->willReturn($userFolder); ->willReturn($userFolder);
$expected = [ $expected = [