nextcloud / server

tests/lib/Files/Node/FolderTest.php

Indentation +996 added lines, -996 removed lines

@@ -41,1000 +41,1000 @@
  * @package Test\Files\Node
  */
 class FolderTest extends NodeTestCase {
-	protected function createTestNode($root, $view, $path, array $data = [], $internalPath = '', $storage = null) {
-		$view->expects($this->any())
-			->method('getRoot')
-			->willReturn('');
-		if ($data || $internalPath || $storage) {
-			return new Folder($root, $view, $path, $this->getFileInfo($data, $internalPath, $storage));
-		} else {
-			return new Folder($root, $view, $path);
-		}
-	}
-
-	protected function getNodeClass() {
-		return '\OC\Files\Node\Folder';
-	}
-
-	protected function getNonExistingNodeClass() {
-		return '\OC\Files\Node\NonExistingFolder';
-	}
-
-	protected function getViewDeleteMethod() {
-		return 'rmdir';
-	}
-
-	public function testGetDirectoryContent(): void {
-		$manager = $this->createMock(Manager::class);
-		/**
-		 * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view
-		 */
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->expects($this->any())
-			->method('getUser')
-			->willReturn($this->user);
-
-		$this->view->expects($this->any())
-			->method('getDirectoryContent')
-			->with('/bar/foo')
-			->willReturn([
-				new FileInfo('/bar/foo/asd', null, 'foo/asd', ['fileid' => 2, 'path' => '/bar/foo/asd', 'name' => 'asd', 'size' => 100, 'mtime' => 50, 'mimetype' => 'text/plain'], null),
-				new FileInfo('/bar/foo/qwerty', null, 'foo/qwerty', ['fileid' => 3, 'path' => '/bar/foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'httpd/unix-directory'], null),
-			]);
-		$this->view->method('getFileInfo')
-			->willReturn($this->createMock(FileInfo::class));
-		$this->view->method('getRelativePath')
-			->willReturn('/bar/foo');
-
-		$node = new Folder($root, $this->view, '/bar/foo');
-		$children = $node->getDirectoryListing();
-		$this->assertEquals(2, count($children));
-		$this->assertInstanceOf('\OC\Files\Node\File', $children[0]);
-		$this->assertInstanceOf('\OC\Files\Node\Folder', $children[1]);
-		$this->assertEquals('asd', $children[0]->getName());
-		$this->assertEquals('qwerty', $children[1]->getName());
-		$this->assertEquals(2, $children[0]->getId());
-		$this->assertEquals(3, $children[1]->getId());
-	}
-
-	public function testGet(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->expects($this->any())
-			->method('getUser')
-			->willReturn($this->user);
-
-		$node = new File($root, $view, '/bar/foo/asd');
-		$root->method('get')
-			->with('/bar/foo/asd')
-			->willReturn($node);
-
-		$parentNode = new Folder($root, $view, '/bar/foo');
-		self::assertEquals($node, $parentNode->get('asd'));
-	}
-
-	public function testNodeExists(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->expects($this->any())
-			->method('getUser')
-			->willReturn($this->user);
-
-		$child = new Folder($root, $view, '/bar/foo/asd');
-
-		$root->method('get')
-			->with('/bar/foo/asd')
-			->willReturn($child);
-
-		$node = new Folder($root, $view, '/bar/foo');
-		$this->assertTrue($node->nodeExists('asd'));
-	}
-
-	public function testNodeExistsNotExists(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->expects($this->any())
-			->method('getUser')
-			->willReturn($this->user);
-
-		$root->method('get')
-			->with('/bar/foo/asd')
-			->will($this->throwException(new NotFoundException()));
-
-		$node = new Folder($root, $view, '/bar/foo');
-		$this->assertFalse($node->nodeExists('asd'));
-	}
-
-	public function testNewFolder(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->expects($this->any())
-			->method('getUser')
-			->willReturn($this->user);
-
-		$view->method('getFileInfo')
-			->with('/bar/foo')
-			->willReturn($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_ALL]));
-
-		$view->method('mkdir')
-			->with('/bar/foo/asd')
-			->willReturn(true);
-
-		$node = new Folder($root, $view, '/bar/foo');
-		$child = new Folder($root, $view, '/bar/foo/asd', null, $node);
-		$result = $node->newFolder('asd');
-		$this->assertEquals($child, $result);
-	}
-
-	public function testNewFolderDeepParent(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->expects($this->any())
-			->method('getUser')
-			->willReturn($this->user);
-
-		$view->method('getFileInfo')
-			->with('/foobar')
-			->willReturn($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_ALL]));
-
-		$view->method('mkdir')
-			->with('/foobar/asd/sdf')
-			->willReturn(true);
-
-		$node = new Folder($root, $view, '/foobar');
-		$child = new Folder($root, $view, '/foobar/asd/sdf', null, null);
-		$result = $node->newFolder('asd/sdf');
-		$this->assertEquals($child, $result);
-	}
-
-
-	public function testNewFolderNotPermitted(): void {
-		$this->expectException(\OCP\Files\NotPermittedException::class);
-
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->method('getUser')
-			->willReturn($this->user);
-
-		$view->method('getFileInfo')
-			->with('/bar/foo')
-			->willReturn($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_READ]));
-
-		$node = new Folder($root, $view, '/bar/foo');
-		$node->newFolder('asd');
-	}
-
-	public function testNewFile(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->expects($this->any())
-			->method('getUser')
-			->willReturn($this->user);
-
-		$view->method('getFileInfo')
-			->with('/bar/foo')
-			->willReturn($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_ALL]));
-
-		$view->method('touch')
-			->with('/bar/foo/asd')
-			->willReturn(true);
-
-		$node = new Folder($root, $view, '/bar/foo');
-		$child = new \OC\Files\Node\File($root, $view, '/bar/foo/asd', null, $node);
-		$result = $node->newFile('asd');
-		$this->assertEquals($child, $result);
-	}
-
-
-	public function testNewFileNotPermitted(): void {
-		$this->expectException(\OCP\Files\NotPermittedException::class);
-
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->method('getUser')
-			->willReturn($this->user);
-
-		$view->method('getFileInfo')
-			->with('/bar/foo')
-			->willReturn($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_READ]));
-
-		$node = new Folder($root, $view, '/bar/foo');
-		$node->newFile('asd');
-	}
-
-	public function testGetFreeSpace(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->method('getUser')
-			->willReturn($this->user);
-
-		$view->method('free_space')
-			->with('/bar/foo')
-			->willReturn(100);
-
-		$node = new Folder($root, $view, '/bar/foo');
-		$this->assertEquals(100, $node->getFreeSpace());
-	}
-
-	public function testSearch(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->method('getUser')
-			->willReturn($this->user);
-		/** @var Storage\IStorage&MockObject $storage */
-		$storage = $this->createMock(IStorage::class);
-		$storage->method('getId')->willReturn('test::1');
-		$cache = new Cache($storage);
-
-		$storage->method('getCache')
-			->willReturn($cache);
-
-		$storage->expects($this->atLeastOnce())
-			->method('getOwner')
-			->with('qwerty')
-			->willReturn(false);
-
-		$mount = $this->createMock(IMountPoint::class);
-		$mount->expects($this->atLeastOnce())
-			->method('getStorage')
-			->willReturn($storage);
-		$mount->expects($this->atLeastOnce())
-			->method('getInternalPath')
-			->willReturn('foo');
-
-		$cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('foo', ['size' => 200, 'mtime' => 55, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('foo/qwerty', ['size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain']);
-
-		$root->method('getMountsIn')
-			->with('/bar/foo')
-			->willReturn([]);
-
-		$root->method('getMount')
-			->with('/bar/foo')
-			->willReturn($mount);
-
-		$node = new Folder($root, $view, '/bar/foo');
-		$result = $node->search('qw');
-		$cache->clear();
-		$this->assertEquals(1, count($result));
-		$this->assertEquals('/bar/foo/qwerty', $result[0]->getPath());
-	}
-
-	public function testSearchInRoot(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->onlyMethods(['getUser', 'getMountsIn', 'getMount'])
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->expects($this->any())
-			->method('getUser')
-			->willReturn($this->user);
-		/** @var \PHPUnit\Framework\MockObject\MockObject|Storage $storage */
-		$storage = $this->createMock(IStorage::class);
-		$storage->method('getId')->willReturn('test::2');
-		$cache = new Cache($storage);
-
-		$mount = $this->createMock(IMountPoint::class);
-		$mount->method('getStorage')
-			->willReturn($storage);
-		$mount->method('getInternalPath')
-			->willReturn('files');
-
-		$storage->method('getCache')
-			->willReturn($cache);
-		$storage->method('getOwner')
-			->willReturn('owner');
-
-		$cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('files', ['size' => 200, 'mtime' => 55, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('files/foo', ['size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain']);
-
-		$root->method('getMountsIn')
-			->with('')
-			->willReturn([]);
-
-		$root->method('getMount')
-			->with('')
-			->willReturn($mount);
-
-		$result = $root->search('foo');
-		$cache->clear();
-		$this->assertEquals(1, count($result));
-		$this->assertEquals('/foo', $result[0]->getPath());
-	}
-
-	public function testSearchInStorageRoot(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->method('getUser')
-			->willReturn($this->user);
-		$storage = $this->createMock(IStorage::class);
-		$storage->method('getId')->willReturn('test::1');
-		$cache = new Cache($storage);
-
-		$mount = $this->createMock(IMountPoint::class);
-		$mount->method('getStorage')
-			->willReturn($storage);
-		$mount->method('getInternalPath')
-			->willReturn('');
-
-		$storage->method('getCache')
-			->willReturn($cache);
-		$storage->method('getOwner')
-			->willReturn('owner');
-
-		$cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('foo', ['size' => 200, 'mtime' => 55, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('foo/qwerty', ['size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain']);
-
-
-		$root->method('getMountsIn')
-			->with('/bar')
-			->willReturn([]);
-
-		$root->method('getMount')
-			->with('/bar')
-			->willReturn($mount);
-
-		$node = new Folder($root, $view, '/bar');
-		$result = $node->search('qw');
-		$cache->clear();
-		$this->assertEquals(1, count($result));
-		$this->assertEquals('/bar/foo/qwerty', $result[0]->getPath());
-	}
-
-	public function testSearchSubStorages(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->expects($this->any())
-			->method('getUser')
-			->willReturn($this->user);
-		$storage = $this->createMock(IStorage::class);
-		$storage->method('getId')->willReturn('test::1');
-		$cache = new Cache($storage);
-		$subStorage = $this->createMock(IStorage::class);
-		$subStorage->method('getId')->willReturn('test::2');
-		$subCache = new Cache($subStorage);
-		$subMount = $this->getMockBuilder(MountPoint::class)->setConstructorArgs([Temporary::class, ''])->getMock();
-
-		$mount = $this->createMock(IMountPoint::class);
-		$mount->method('getStorage')
-			->willReturn($storage);
-		$mount->method('getInternalPath')
-			->willReturn('foo');
-
-		$subMount->method('getStorage')
-			->willReturn($subStorage);
-
-		$subMount->method('getMountPoint')
-			->willReturn('/bar/foo/bar/');
-
-		$storage->method('getCache')
-			->willReturn($cache);
-		$storage->method('getOwner')
-			->willReturn('owner');
-
-		$subStorage->method('getCache')
-			->willReturn($subCache);
-		$subStorage->method('getOwner')
-			->willReturn('owner');
-
-		$cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('foo', ['size' => 200, 'mtime' => 55, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('foo/qwerty', ['size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain']);
-
-		$subCache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$subCache->insert('asd', ['size' => 200, 'mtime' => 55, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$subCache->insert('asd/qwerty', ['size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain']);
-
-
-		$root->method('getMountsIn')
-			->with('/bar/foo')
-			->willReturn([$subMount]);
-
-		$root->method('getMount')
-			->with('/bar/foo')
-			->willReturn($mount);
-
-
-		$node = new Folder($root, $view, '/bar/foo');
-		$result = $node->search('qw');
-		$cache->clear();
-		$subCache->clear();
-		$this->assertEquals(2, count($result));
-	}
-
-	public function testIsSubNode(): void {
-		$rootFolderMock = $this->createMock(IRootFolder::class);
-		$file = new Node($rootFolderMock, $this->view, '/foo/bar');
-		$folder = new Folder($rootFolderMock, $this->view, '/foo');
-		$this->assertTrue($folder->isSubNode($file));
-		$this->assertFalse($folder->isSubNode($folder));
-
-		$file = new Node($rootFolderMock, $this->view, '/foobar');
-		$this->assertFalse($folder->isSubNode($file));
-	}
-
-	public function testGetById(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->onlyMethods(['getMountsIn', 'getMount'])
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$storage = $this->createMock(\OC\Files\Storage\Storage::class);
-		$mount = new MountPoint($storage, '/bar');
-		$storage->method('getId')->willReturn('');
-		$cache = $this->getMockBuilder(Cache::class)->setConstructorArgs([$storage])->getMock();
-
-		$fileInfo = new CacheEntry(['path' => 'foo/qwerty', 'mimetype' => 'text/plain'], null);
-
-		$storage->method('getCache')
-			->willReturn($cache);
-		$storage->method('getOwner')
-			->willReturn('owner');
-
-		$this->userMountCache->expects($this->any())
-			->method('getMountsForFileId')
-			->with(1)
-			->willReturn([new CachedMountInfo(
-				$this->user,
-				1,
-				0,
-				'/bar/',
-				'test',
-				1,
-				''
-			)]);
-
-		$cache->method('get')
-			->with(1)
-			->willReturn($fileInfo);
-
-		$root->method('getMountsIn')
-			->with('/bar/foo')
-			->willReturn([]);
-
-		$manager->method('getMountsByMountProvider')
-			->willReturn([$mount]);
-
-		$node = new Folder($root, $view, '/bar/foo');
-		$result = $node->getById(1);
-		$this->assertEquals(1, count($result));
-		$this->assertEquals('/bar/foo/qwerty', $result[0]->getPath());
-	}
-
-	public function testGetByIdMountRoot(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->onlyMethods(['getMountsIn', 'getMount'])
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$storage = $this->createMock(\OC\Files\Storage\Storage::class);
-		$mount = new MountPoint($storage, '/bar');
-		$storage->method('getId')->willReturn('');
-		$cache = $this->getMockBuilder(Cache::class)->setConstructorArgs([$storage])->getMock();
-
-		$fileInfo = new CacheEntry(['path' => '', 'mimetype' => 'text/plain'], null);
-
-		$storage->method('getCache')
-			->willReturn($cache);
-		$storage->method('getOwner')
-			->willReturn('owner');
-
-		$this->userMountCache->expects($this->any())
-			->method('getMountsForFileId')
-			->with(1)
-			->willReturn([new CachedMountInfo(
-				$this->user,
-				1,
-				0,
-				'/bar/',
-				'test',
-				1,
-				''
-			)]);
-
-		$cache->method('get')
-			->with(1)
-			->willReturn($fileInfo);
-
-		$manager->method('getMountsByMountProvider')
-			->willReturn([$mount]);
-
-		$node = new Folder($root, $view, '/bar');
-		$result = $node->getById(1);
-		$this->assertEquals(1, count($result));
-		$this->assertEquals('/bar', $result[0]->getPath());
-	}
-
-	public function testGetByIdOutsideFolder(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->onlyMethods(['getMountsIn', 'getMount'])
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$storage = $this->createMock(\OC\Files\Storage\Storage::class);
-		$mount = new MountPoint($storage, '/bar');
-		$storage->method('getId')->willReturn('');
-		$cache = $this->getMockBuilder(Cache::class)->setConstructorArgs([$storage])->getMock();
-
-		$fileInfo = new CacheEntry(['path' => 'foobar', 'mimetype' => 'text/plain'], null);
-
-		$storage->method('getCache')
-			->willReturn($cache);
-		$storage->method('getOwner')
-			->willReturn('owner');
-
-		$this->userMountCache->expects($this->any())
-			->method('getMountsForFileId')
-			->with(1)
-			->willReturn([new CachedMountInfo(
-				$this->user,
-				1,
-				0,
-				'/bar/',
-				'test',
-				1,
-				''
-			)]);
-
-		$cache->method('get')
-			->with(1)
-			->willReturn($fileInfo);
-
-		$manager->method('getMountsByMountProvider')
-			->willReturn([$mount]);
-
-		$node = new Folder($root, $view, '/bar/foo');
-		$result = $node->getById(1);
-		$this->assertEquals(0, count($result));
-	}
-
-	public function testGetByIdMultipleStorages(): void {
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->onlyMethods(['getMountsIn', 'getMount'])
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$storage = $this->createMock(\OC\Files\Storage\Storage::class);
-		$mount1 = new MountPoint($storage, '/bar');
-		$mount2 = new MountPoint($storage, '/bar/foo/asd');
-		$storage->method('getId')->willReturn('');
-		$cache = $this->getMockBuilder(Cache::class)->setConstructorArgs([$storage])->getMock();
-
-		$fileInfo = new CacheEntry(['path' => 'foo/qwerty', 'mimetype' => 'text/plain'], null);
-
-		$storage->method('getCache')
-			->willReturn($cache);
-		$storage->method('getOwner')
-			->willReturn('owner');
-
-		$this->userMountCache->method('getMountsForFileId')
-			->with(1)
-			->willReturn([
-				new CachedMountInfo(
-					$this->user,
-					1,
-					0,
-					'/bar/',
-					'test',
-					1,
-					''
-				),
-			]);
-
-		$cache->method('get')
-			->with(1)
-			->willReturn($fileInfo);
-
-		$manager->method('getMountsByMountProvider')
-			->willReturn([$mount1, $mount2]);
-
-		$node = new Folder($root, $view, '/bar/foo');
-		$result = $node->getById(1);
-		$this->assertEquals(2, count($result));
-		$this->assertEquals('/bar/foo/qwerty', $result[0]->getPath());
-		$this->assertEquals('/bar/foo/asd/foo/qwerty', $result[1]->getPath());
-	}
-
-	public static function uniqueNameProvider(): array {
-		return [
-			// input, existing, expected
-			['foo', [], 'foo'],
-			['foo', ['foo'], 'foo (2)'],
-			['foo', ['foo', 'foo (2)'], 'foo (3)'],
-		];
-	}
-
-	/**
-	 * @dataProvider uniqueNameProvider
-	 */
-	public function testGetUniqueName($name, $existingFiles, $expected): void {
-		$manager = $this->createMock(Manager::class);
-		$folderPath = '/bar/foo';
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->onlyMethods(['getUser', 'getMountsIn', 'getMount'])
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-
-		$view->expects($this->any())
-			->method('file_exists')
-			->willReturnCallback(function ($path) use ($existingFiles, $folderPath) {
-				foreach ($existingFiles as $existing) {
-					if ($folderPath . '/' . $existing === $path) {
-						return true;
-					}
-				}
-				return false;
-			});
-
-		$node = new Folder($root, $view, $folderPath);
-		$this->assertEquals($expected, $node->getNonExistingName($name));
-	}
-
-	public function testRecent(): void {
-		$manager = $this->createMock(Manager::class);
-		$folderPath = '/bar/foo';
-		$view = $this->getRootViewMock();
-		/** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\Node\Root $root */
-		$root = $this->getMockBuilder(Root::class)
-			->onlyMethods(['getUser', 'getMountsIn', 'getMount'])
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		/** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\FileInfo $folderInfo */
-		$folderInfo = $this->getMockBuilder(FileInfo::class)
-			->disableOriginalConstructor()->getMock();
-
-		$baseTime = time();
-		$storage = new Temporary();
-		$mount = new MountPoint($storage, '');
-
-		$folderInfo->expects($this->any())
-			->method('getMountPoint')
-			->willReturn($mount);
-		$root->method('getMount')
-			->willReturn($mount);
-		$root->method('getMountsIn')
-			->willReturn([]);
-
-		$cache = $storage->getCache();
-
-		$cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('bar', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('bar/foo', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('bar/asd', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$id1 = $cache->put('bar/foo/inside.txt', [
-			'storage_mtime' => $baseTime,
-			'mtime' => $baseTime,
-			'mimetype' => 'text/plain',
-			'size' => 3,
-			'permissions' => \OCP\Constants::PERMISSION_ALL,
-		]);
-		$id2 = $cache->put('bar/foo/old.txt', [
-			'storage_mtime' => $baseTime - 100,
-			'mtime' => $baseTime - 100,
-			'mimetype' => 'text/plain',
-			'size' => 3,
-			'permissions' => \OCP\Constants::PERMISSION_READ,
-		]);
-		$cache->put('bar/asd/outside.txt', [
-			'storage_mtime' => $baseTime,
-			'mtime' => $baseTime,
-			'mimetype' => 'text/plain',
-			'size' => 3,
-		]);
-		$id3 = $cache->put('bar/foo/older.txt', [
-			'storage_mtime' => $baseTime - 600,
-			'mtime' => $baseTime - 600,
-			'mimetype' => 'text/plain',
-			'size' => 3,
-			'permissions' => \OCP\Constants::PERMISSION_ALL,
-		]);
-
-		$node = new Folder($root, $view, $folderPath, $folderInfo);
-
-
-		$nodes = $node->getRecent(5);
-		$ids = array_map(function (Node $node) {
-			return (int)$node->getId();
-		}, $nodes);
-		$this->assertEquals([$id1, $id2, $id3], $ids);
-	}
-
-	public function testRecentFolder(): void {
-		$manager = $this->createMock(Manager::class);
-		$folderPath = '/bar/foo';
-		$view = $this->getRootViewMock();
-		/** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\Node\Root $root */
-		$root = $this->getMockBuilder(Root::class)
-			->onlyMethods(['getUser', 'getMountsIn', 'getMount'])
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		/** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\FileInfo $folderInfo */
-		$folderInfo = $this->getMockBuilder(FileInfo::class)
-			->disableOriginalConstructor()->getMock();
-
-		$baseTime = time();
-		$storage = new Temporary();
-		$mount = new MountPoint($storage, '');
-
-		$folderInfo->expects($this->any())
-			->method('getMountPoint')
-			->willReturn($mount);
-
-		$root->method('getMount')
-			->willReturn($mount);
-		$root->method('getMountsIn')
-			->willReturn([]);
-
-		$cache = $storage->getCache();
-
-		$cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('bar', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('bar/foo', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$id1 = $cache->put('bar/foo/folder', [
-			'storage_mtime' => $baseTime,
-			'mtime' => $baseTime,
-			'mimetype' => \OCP\Files\FileInfo::MIMETYPE_FOLDER,
-			'size' => 3,
-			'permissions' => 0,
-		]);
-		$id2 = $cache->put('bar/foo/folder/bar.txt', [
-			'storage_mtime' => $baseTime,
-			'mtime' => $baseTime,
-			'mimetype' => 'text/plain',
-			'size' => 3,
-			'parent' => $id1,
-			'permissions' => \OCP\Constants::PERMISSION_ALL,
-		]);
-		$id3 = $cache->put('bar/foo/folder/asd.txt', [
-			'storage_mtime' => $baseTime - 100,
-			'mtime' => $baseTime - 100,
-			'mimetype' => 'text/plain',
-			'size' => 3,
-			'parent' => $id1,
-			'permissions' => \OCP\Constants::PERMISSION_ALL,
-		]);
-
-		$node = new Folder($root, $view, $folderPath, $folderInfo);
-
-
-		$nodes = $node->getRecent(5);
-		$ids = array_map(function (Node $node) {
-			return (int)$node->getId();
-		}, $nodes);
-		$this->assertEquals([$id2, $id3], $ids);
-		$this->assertEquals($baseTime, $nodes[0]->getMTime());
-		$this->assertEquals($baseTime - 100, $nodes[1]->getMTime());
-	}
-
-	public function testRecentJail(): void {
-		$manager = $this->createMock(Manager::class);
-		$folderPath = '/bar/foo';
-		$view = $this->getRootViewMock();
-		/** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\Node\Root $root */
-		$root = $this->getMockBuilder(Root::class)
-			->onlyMethods(['getUser', 'getMountsIn', 'getMount'])
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		/** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\FileInfo $folderInfo */
-		$folderInfo = $this->getMockBuilder(FileInfo::class)
-			->disableOriginalConstructor()->getMock();
-
-		$baseTime = time();
-		$storage = new Temporary();
-		$jail = new Jail([
-			'storage' => $storage,
-			'root' => 'folder',
-		]);
-		$mount = new MountPoint($jail, '/bar/foo');
-
-		$folderInfo->expects($this->any())
-			->method('getMountPoint')
-			->willReturn($mount);
-		$root->method('getMount')
-			->willReturn($mount);
-		$root->method('getMountsIn')
-			->willReturn([]);
-
-		$cache = $storage->getCache();
-
-		$cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('folder', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$id1 = $cache->put('folder/inside.txt', [
-			'storage_mtime' => $baseTime,
-			'mtime' => $baseTime,
-			'mimetype' => 'text/plain',
-			'size' => 3,
-			'permissions' => \OCP\Constants::PERMISSION_ALL,
-		]);
-
-		$cache->put('outside.txt', [
-			'storage_mtime' => $baseTime - 100,
-			'mtime' => $baseTime - 100,
-			'mimetype' => 'text/plain',
-			'size' => 3,
-		]);
-
-		$node = new Folder($root, $view, $folderPath, $folderInfo);
-
-		$nodes = $node->getRecent(5);
-		$ids = array_map(function (Node $node) {
-			return (int)$node->getId();
-		}, $nodes);
-		$this->assertEquals([$id1], $ids);
-	}
-
-	public static function offsetLimitProvider(): array {
-		return [
-			[0, 10, ['/bar/foo/foo1', '/bar/foo/foo2', '/bar/foo/foo3', '/bar/foo/foo4', '/bar/foo/sub1/foo5', '/bar/foo/sub1/foo6', '/bar/foo/sub2/foo7', '/bar/foo/sub2/foo8'], []],
-			[0, 5, ['/bar/foo/foo1', '/bar/foo/foo2', '/bar/foo/foo3', '/bar/foo/foo4', '/bar/foo/sub1/foo5'], []],
-			[0, 2, ['/bar/foo/foo1', '/bar/foo/foo2'], []],
-			[3, 2, ['/bar/foo/foo4', '/bar/foo/sub1/foo5'], []],
-			[3, 5, ['/bar/foo/foo4', '/bar/foo/sub1/foo5', '/bar/foo/sub1/foo6', '/bar/foo/sub2/foo7', '/bar/foo/sub2/foo8'], []],
-			[5, 2, ['/bar/foo/sub1/foo6', '/bar/foo/sub2/foo7'], []],
-			[6, 2, ['/bar/foo/sub2/foo7', '/bar/foo/sub2/foo8'], []],
-			[7, 2, ['/bar/foo/sub2/foo8'], []],
-			[10, 2, [], []],
-			[0, 5, ['/bar/foo/sub2/foo7', '/bar/foo/foo1', '/bar/foo/sub1/foo5', '/bar/foo/foo2', '/bar/foo/foo3'], [new SearchOrder(ISearchOrder::DIRECTION_ASCENDING, 'mtime')]],
-			[3, 2, ['/bar/foo/foo2', '/bar/foo/foo3'], [new SearchOrder(ISearchOrder::DIRECTION_ASCENDING, 'mtime')]],
-			[0, 5, ['/bar/foo/sub1/foo5', '/bar/foo/sub1/foo6', '/bar/foo/sub2/foo7', '/bar/foo/foo1', '/bar/foo/foo2'], [
-				new SearchOrder(ISearchOrder::DIRECTION_DESCENDING, 'size'),
-				new SearchOrder(ISearchOrder::DIRECTION_ASCENDING, 'mtime')
-			]],
-		];
-	}
-
-	/**
-	 * @dataProvider offsetLimitProvider
-	 * @param int $offset
-	 * @param int $limit
-	 * @param string[] $expectedPaths
-	 * @param ISearchOrder[] $ordering
-	 * @throws NotFoundException
-	 * @throws \OCP\Files\InvalidPathException
-	 */
-	public function testSearchSubStoragesLimitOffset(int $offset, int $limit, array $expectedPaths, array $ordering): void {
-		if (!$ordering) {
-			$ordering = [new SearchOrder(ISearchOrder::DIRECTION_ASCENDING, 'fileid')];
-		}
-
-		$manager = $this->createMock(Manager::class);
-		$view = $this->getRootViewMock();
-		$root = $this->getMockBuilder(Root::class)
-			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
-			->getMock();
-		$root->expects($this->any())
-			->method('getUser')
-			->willReturn($this->user);
-		$storage = $this->createMock(IStorage::class);
-		$storage->method('getId')->willReturn('test::1');
-		$cache = new Cache($storage);
-		$subStorage1 = $this->createMock(IStorage::class);
-		$subStorage1->method('getId')->willReturn('test::2');
-		$subCache1 = new Cache($subStorage1);
-		$subMount1 = $this->getMockBuilder(MountPoint::class)->setConstructorArgs([Temporary::class, ''])->getMock();
-		$subStorage2 = $this->createMock(IStorage::class);
-		$subStorage2->method('getId')->willReturn('test::3');
-		$subCache2 = new Cache($subStorage2);
-		$subMount2 = $this->getMockBuilder(MountPoint::class)->setConstructorArgs([Temporary::class, ''])->getMock();
-
-		$mount = $this->createMock(IMountPoint::class);
-		$mount->method('getStorage')
-			->willReturn($storage);
-		$mount->method('getInternalPath')
-			->willReturn('foo');
-
-		$subMount1->method('getStorage')
-			->willReturn($subStorage1);
-
-		$subMount1->method('getMountPoint')
-			->willReturn('/bar/foo/sub1/');
-
-		$storage->method('getCache')
-			->willReturn($cache);
-		$storage->method('getOwner')
-			->willReturn('owner');
-
-		$subStorage1->method('getCache')
-			->willReturn($subCache1);
-		$subStorage1->method('getOwner')
-			->willReturn('owner');
-
-		$subMount2->method('getStorage')
-			->willReturn($subStorage2);
-
-		$subMount2->method('getMountPoint')
-			->willReturn('/bar/foo/sub2/');
-
-		$subStorage2->method('getCache')
-			->willReturn($subCache2);
-		$subStorage2->method('getOwner')
-			->willReturn('owner');
-
-
-		$cache->insert('', ['size' => 0, 'mtime' => 10, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('foo', ['size' => 0, 'mtime' => 10, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$cache->insert('foo/foo1', ['size' => 200, 'mtime' => 10, 'mimetype' => 'text/plain']);
-		$cache->insert('foo/foo2', ['size' => 200, 'mtime' => 20, 'mimetype' => 'text/plain']);
-		$cache->insert('foo/foo3', ['size' => 200, 'mtime' => 30, 'mimetype' => 'text/plain']);
-		$cache->insert('foo/foo4', ['size' => 200, 'mtime' => 40, 'mimetype' => 'text/plain']);
-
-		$subCache1->insert('', ['size' => 0, 'mtime' => 10, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$subCache1->insert('foo5', ['size' => 300, 'mtime' => 15, 'mimetype' => 'text/plain']);
-		$subCache1->insert('foo6', ['size' => 300, 'mtime' => 50, 'mimetype' => 'text/plain']);
-
-		$subCache2->insert('', ['size' => 0, 'mtime' => 10, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
-		$subCache2->insert('foo7', ['size' => 200, 'mtime' => 5, 'mimetype' => 'text/plain']);
-		$subCache2->insert('foo8', ['size' => 200, 'mtime' => 60, 'mimetype' => 'text/plain']);
-
-		$root->method('getMountsIn')
-			->with('/bar/foo')
-			->willReturn([$subMount1, $subMount2]);
-
-		$root->method('getMount')
-			->with('/bar/foo')
-			->willReturn($mount);
-
-		$node = new Folder($root, $view, '/bar/foo');
-		$comparison = new SearchComparison(ISearchComparison::COMPARE_LIKE, 'name', '%foo%');
-		$operator = new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_AND, [
-			$comparison,
-			new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_NOT, [new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE)]),
-		]);
-		$query = new SearchQuery($operator, $limit, $offset, $ordering);
-		$result = $node->search($query);
-		$cache->clear();
-		$subCache1->clear();
-		$subCache2->clear();
-		$ids = array_map(function (Node $info) {
-			return $info->getPath();
-		}, $result);
-		$this->assertEquals($expectedPaths, $ids);
-	}
+    protected function createTestNode($root, $view, $path, array $data = [], $internalPath = '', $storage = null) {
+        $view->expects($this->any())
+            ->method('getRoot')
+            ->willReturn('');
+        if ($data || $internalPath || $storage) {
+            return new Folder($root, $view, $path, $this->getFileInfo($data, $internalPath, $storage));
+        } else {
+            return new Folder($root, $view, $path);
+        }
+    }
+
+    protected function getNodeClass() {
+        return '\OC\Files\Node\Folder';
+    }
+
+    protected function getNonExistingNodeClass() {
+        return '\OC\Files\Node\NonExistingFolder';
+    }
+
+    protected function getViewDeleteMethod() {
+        return 'rmdir';
+    }
+
+    public function testGetDirectoryContent(): void {
+        $manager = $this->createMock(Manager::class);
+        /**
+         * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view
+         */
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->user);
+
+        $this->view->expects($this->any())
+            ->method('getDirectoryContent')
+            ->with('/bar/foo')
+            ->willReturn([
+                new FileInfo('/bar/foo/asd', null, 'foo/asd', ['fileid' => 2, 'path' => '/bar/foo/asd', 'name' => 'asd', 'size' => 100, 'mtime' => 50, 'mimetype' => 'text/plain'], null),
+                new FileInfo('/bar/foo/qwerty', null, 'foo/qwerty', ['fileid' => 3, 'path' => '/bar/foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'httpd/unix-directory'], null),
+            ]);
+        $this->view->method('getFileInfo')
+            ->willReturn($this->createMock(FileInfo::class));
+        $this->view->method('getRelativePath')
+            ->willReturn('/bar/foo');
+
+        $node = new Folder($root, $this->view, '/bar/foo');
+        $children = $node->getDirectoryListing();
+        $this->assertEquals(2, count($children));
+        $this->assertInstanceOf('\OC\Files\Node\File', $children[0]);
+        $this->assertInstanceOf('\OC\Files\Node\Folder', $children[1]);
+        $this->assertEquals('asd', $children[0]->getName());
+        $this->assertEquals('qwerty', $children[1]->getName());
+        $this->assertEquals(2, $children[0]->getId());
+        $this->assertEquals(3, $children[1]->getId());
+    }
+
+    public function testGet(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->user);
+
+        $node = new File($root, $view, '/bar/foo/asd');
+        $root->method('get')
+            ->with('/bar/foo/asd')
+            ->willReturn($node);
+
+        $parentNode = new Folder($root, $view, '/bar/foo');
+        self::assertEquals($node, $parentNode->get('asd'));
+    }
+
+    public function testNodeExists(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->user);
+
+        $child = new Folder($root, $view, '/bar/foo/asd');
+
+        $root->method('get')
+            ->with('/bar/foo/asd')
+            ->willReturn($child);
+
+        $node = new Folder($root, $view, '/bar/foo');
+        $this->assertTrue($node->nodeExists('asd'));
+    }
+
+    public function testNodeExistsNotExists(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->user);
+
+        $root->method('get')
+            ->with('/bar/foo/asd')
+            ->will($this->throwException(new NotFoundException()));
+
+        $node = new Folder($root, $view, '/bar/foo');
+        $this->assertFalse($node->nodeExists('asd'));
+    }
+
+    public function testNewFolder(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->user);
+
+        $view->method('getFileInfo')
+            ->with('/bar/foo')
+            ->willReturn($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_ALL]));
+
+        $view->method('mkdir')
+            ->with('/bar/foo/asd')
+            ->willReturn(true);
+
+        $node = new Folder($root, $view, '/bar/foo');
+        $child = new Folder($root, $view, '/bar/foo/asd', null, $node);
+        $result = $node->newFolder('asd');
+        $this->assertEquals($child, $result);
+    }
+
+    public function testNewFolderDeepParent(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->user);
+
+        $view->method('getFileInfo')
+            ->with('/foobar')
+            ->willReturn($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_ALL]));
+
+        $view->method('mkdir')
+            ->with('/foobar/asd/sdf')
+            ->willReturn(true);
+
+        $node = new Folder($root, $view, '/foobar');
+        $child = new Folder($root, $view, '/foobar/asd/sdf', null, null);
+        $result = $node->newFolder('asd/sdf');
+        $this->assertEquals($child, $result);
+    }
+
+
+    public function testNewFolderNotPermitted(): void {
+        $this->expectException(\OCP\Files\NotPermittedException::class);
+
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->method('getUser')
+            ->willReturn($this->user);
+
+        $view->method('getFileInfo')
+            ->with('/bar/foo')
+            ->willReturn($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_READ]));
+
+        $node = new Folder($root, $view, '/bar/foo');
+        $node->newFolder('asd');
+    }
+
+    public function testNewFile(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->user);
+
+        $view->method('getFileInfo')
+            ->with('/bar/foo')
+            ->willReturn($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_ALL]));
+
+        $view->method('touch')
+            ->with('/bar/foo/asd')
+            ->willReturn(true);
+
+        $node = new Folder($root, $view, '/bar/foo');
+        $child = new \OC\Files\Node\File($root, $view, '/bar/foo/asd', null, $node);
+        $result = $node->newFile('asd');
+        $this->assertEquals($child, $result);
+    }
+
+
+    public function testNewFileNotPermitted(): void {
+        $this->expectException(\OCP\Files\NotPermittedException::class);
+
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->method('getUser')
+            ->willReturn($this->user);
+
+        $view->method('getFileInfo')
+            ->with('/bar/foo')
+            ->willReturn($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_READ]));
+
+        $node = new Folder($root, $view, '/bar/foo');
+        $node->newFile('asd');
+    }
+
+    public function testGetFreeSpace(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->method('getUser')
+            ->willReturn($this->user);
+
+        $view->method('free_space')
+            ->with('/bar/foo')
+            ->willReturn(100);
+
+        $node = new Folder($root, $view, '/bar/foo');
+        $this->assertEquals(100, $node->getFreeSpace());
+    }
+
+    public function testSearch(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->method('getUser')
+            ->willReturn($this->user);
+        /** @var Storage\IStorage&MockObject $storage */
+        $storage = $this->createMock(IStorage::class);
+        $storage->method('getId')->willReturn('test::1');
+        $cache = new Cache($storage);
+
+        $storage->method('getCache')
+            ->willReturn($cache);
+
+        $storage->expects($this->atLeastOnce())
+            ->method('getOwner')
+            ->with('qwerty')
+            ->willReturn(false);
+
+        $mount = $this->createMock(IMountPoint::class);
+        $mount->expects($this->atLeastOnce())
+            ->method('getStorage')
+            ->willReturn($storage);
+        $mount->expects($this->atLeastOnce())
+            ->method('getInternalPath')
+            ->willReturn('foo');
+
+        $cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('foo', ['size' => 200, 'mtime' => 55, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('foo/qwerty', ['size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain']);
+
+        $root->method('getMountsIn')
+            ->with('/bar/foo')
+            ->willReturn([]);
+
+        $root->method('getMount')
+            ->with('/bar/foo')
+            ->willReturn($mount);
+
+        $node = new Folder($root, $view, '/bar/foo');
+        $result = $node->search('qw');
+        $cache->clear();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals('/bar/foo/qwerty', $result[0]->getPath());
+    }
+
+    public function testSearchInRoot(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->onlyMethods(['getUser', 'getMountsIn', 'getMount'])
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->user);
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Storage $storage */
+        $storage = $this->createMock(IStorage::class);
+        $storage->method('getId')->willReturn('test::2');
+        $cache = new Cache($storage);
+
+        $mount = $this->createMock(IMountPoint::class);
+        $mount->method('getStorage')
+            ->willReturn($storage);
+        $mount->method('getInternalPath')
+            ->willReturn('files');
+
+        $storage->method('getCache')
+            ->willReturn($cache);
+        $storage->method('getOwner')
+            ->willReturn('owner');
+
+        $cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('files', ['size' => 200, 'mtime' => 55, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('files/foo', ['size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain']);
+
+        $root->method('getMountsIn')
+            ->with('')
+            ->willReturn([]);
+
+        $root->method('getMount')
+            ->with('')
+            ->willReturn($mount);
+
+        $result = $root->search('foo');
+        $cache->clear();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals('/foo', $result[0]->getPath());
+    }
+
+    public function testSearchInStorageRoot(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->method('getUser')
+            ->willReturn($this->user);
+        $storage = $this->createMock(IStorage::class);
+        $storage->method('getId')->willReturn('test::1');
+        $cache = new Cache($storage);
+
+        $mount = $this->createMock(IMountPoint::class);
+        $mount->method('getStorage')
+            ->willReturn($storage);
+        $mount->method('getInternalPath')
+            ->willReturn('');
+
+        $storage->method('getCache')
+            ->willReturn($cache);
+        $storage->method('getOwner')
+            ->willReturn('owner');
+
+        $cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('foo', ['size' => 200, 'mtime' => 55, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('foo/qwerty', ['size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain']);
+
+
+        $root->method('getMountsIn')
+            ->with('/bar')
+            ->willReturn([]);
+
+        $root->method('getMount')
+            ->with('/bar')
+            ->willReturn($mount);
+
+        $node = new Folder($root, $view, '/bar');
+        $result = $node->search('qw');
+        $cache->clear();
+        $this->assertEquals(1, count($result));
+        $this->assertEquals('/bar/foo/qwerty', $result[0]->getPath());
+    }
+
+    public function testSearchSubStorages(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->user);
+        $storage = $this->createMock(IStorage::class);
+        $storage->method('getId')->willReturn('test::1');
+        $cache = new Cache($storage);
+        $subStorage = $this->createMock(IStorage::class);
+        $subStorage->method('getId')->willReturn('test::2');
+        $subCache = new Cache($subStorage);
+        $subMount = $this->getMockBuilder(MountPoint::class)->setConstructorArgs([Temporary::class, ''])->getMock();
+
+        $mount = $this->createMock(IMountPoint::class);
+        $mount->method('getStorage')
+            ->willReturn($storage);
+        $mount->method('getInternalPath')
+            ->willReturn('foo');
+
+        $subMount->method('getStorage')
+            ->willReturn($subStorage);
+
+        $subMount->method('getMountPoint')
+            ->willReturn('/bar/foo/bar/');
+
+        $storage->method('getCache')
+            ->willReturn($cache);
+        $storage->method('getOwner')
+            ->willReturn('owner');
+
+        $subStorage->method('getCache')
+            ->willReturn($subCache);
+        $subStorage->method('getOwner')
+            ->willReturn('owner');
+
+        $cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('foo', ['size' => 200, 'mtime' => 55, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('foo/qwerty', ['size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain']);
+
+        $subCache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $subCache->insert('asd', ['size' => 200, 'mtime' => 55, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $subCache->insert('asd/qwerty', ['size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain']);
+
+
+        $root->method('getMountsIn')
+            ->with('/bar/foo')
+            ->willReturn([$subMount]);
+
+        $root->method('getMount')
+            ->with('/bar/foo')
+            ->willReturn($mount);
+
+
+        $node = new Folder($root, $view, '/bar/foo');
+        $result = $node->search('qw');
+        $cache->clear();
+        $subCache->clear();
+        $this->assertEquals(2, count($result));
+    }
+
+    public function testIsSubNode(): void {
+        $rootFolderMock = $this->createMock(IRootFolder::class);
+        $file = new Node($rootFolderMock, $this->view, '/foo/bar');
+        $folder = new Folder($rootFolderMock, $this->view, '/foo');
+        $this->assertTrue($folder->isSubNode($file));
+        $this->assertFalse($folder->isSubNode($folder));
+
+        $file = new Node($rootFolderMock, $this->view, '/foobar');
+        $this->assertFalse($folder->isSubNode($file));
+    }
+
+    public function testGetById(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->onlyMethods(['getMountsIn', 'getMount'])
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $storage = $this->createMock(\OC\Files\Storage\Storage::class);
+        $mount = new MountPoint($storage, '/bar');
+        $storage->method('getId')->willReturn('');
+        $cache = $this->getMockBuilder(Cache::class)->setConstructorArgs([$storage])->getMock();
+
+        $fileInfo = new CacheEntry(['path' => 'foo/qwerty', 'mimetype' => 'text/plain'], null);
+
+        $storage->method('getCache')
+            ->willReturn($cache);
+        $storage->method('getOwner')
+            ->willReturn('owner');
+
+        $this->userMountCache->expects($this->any())
+            ->method('getMountsForFileId')
+            ->with(1)
+            ->willReturn([new CachedMountInfo(
+                $this->user,
+                1,
+                0,
+                '/bar/',
+                'test',
+                1,
+                ''
+            )]);
+
+        $cache->method('get')
+            ->with(1)
+            ->willReturn($fileInfo);
+
+        $root->method('getMountsIn')
+            ->with('/bar/foo')
+            ->willReturn([]);
+
+        $manager->method('getMountsByMountProvider')
+            ->willReturn([$mount]);
+
+        $node = new Folder($root, $view, '/bar/foo');
+        $result = $node->getById(1);
+        $this->assertEquals(1, count($result));
+        $this->assertEquals('/bar/foo/qwerty', $result[0]->getPath());
+    }
+
+    public function testGetByIdMountRoot(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->onlyMethods(['getMountsIn', 'getMount'])
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $storage = $this->createMock(\OC\Files\Storage\Storage::class);
+        $mount = new MountPoint($storage, '/bar');
+        $storage->method('getId')->willReturn('');
+        $cache = $this->getMockBuilder(Cache::class)->setConstructorArgs([$storage])->getMock();
+
+        $fileInfo = new CacheEntry(['path' => '', 'mimetype' => 'text/plain'], null);
+
+        $storage->method('getCache')
+            ->willReturn($cache);
+        $storage->method('getOwner')
+            ->willReturn('owner');
+
+        $this->userMountCache->expects($this->any())
+            ->method('getMountsForFileId')
+            ->with(1)
+            ->willReturn([new CachedMountInfo(
+                $this->user,
+                1,
+                0,
+                '/bar/',
+                'test',
+                1,
+                ''
+            )]);
+
+        $cache->method('get')
+            ->with(1)
+            ->willReturn($fileInfo);
+
+        $manager->method('getMountsByMountProvider')
+            ->willReturn([$mount]);
+
+        $node = new Folder($root, $view, '/bar');
+        $result = $node->getById(1);
+        $this->assertEquals(1, count($result));
+        $this->assertEquals('/bar', $result[0]->getPath());
+    }
+
+    public function testGetByIdOutsideFolder(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->onlyMethods(['getMountsIn', 'getMount'])
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $storage = $this->createMock(\OC\Files\Storage\Storage::class);
+        $mount = new MountPoint($storage, '/bar');
+        $storage->method('getId')->willReturn('');
+        $cache = $this->getMockBuilder(Cache::class)->setConstructorArgs([$storage])->getMock();
+
+        $fileInfo = new CacheEntry(['path' => 'foobar', 'mimetype' => 'text/plain'], null);
+
+        $storage->method('getCache')
+            ->willReturn($cache);
+        $storage->method('getOwner')
+            ->willReturn('owner');
+
+        $this->userMountCache->expects($this->any())
+            ->method('getMountsForFileId')
+            ->with(1)
+            ->willReturn([new CachedMountInfo(
+                $this->user,
+                1,
+                0,
+                '/bar/',
+                'test',
+                1,
+                ''
+            )]);
+
+        $cache->method('get')
+            ->with(1)
+            ->willReturn($fileInfo);
+
+        $manager->method('getMountsByMountProvider')
+            ->willReturn([$mount]);
+
+        $node = new Folder($root, $view, '/bar/foo');
+        $result = $node->getById(1);
+        $this->assertEquals(0, count($result));
+    }
+
+    public function testGetByIdMultipleStorages(): void {
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->onlyMethods(['getMountsIn', 'getMount'])
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $storage = $this->createMock(\OC\Files\Storage\Storage::class);
+        $mount1 = new MountPoint($storage, '/bar');
+        $mount2 = new MountPoint($storage, '/bar/foo/asd');
+        $storage->method('getId')->willReturn('');
+        $cache = $this->getMockBuilder(Cache::class)->setConstructorArgs([$storage])->getMock();
+
+        $fileInfo = new CacheEntry(['path' => 'foo/qwerty', 'mimetype' => 'text/plain'], null);
+
+        $storage->method('getCache')
+            ->willReturn($cache);
+        $storage->method('getOwner')
+            ->willReturn('owner');
+
+        $this->userMountCache->method('getMountsForFileId')
+            ->with(1)
+            ->willReturn([
+                new CachedMountInfo(
+                    $this->user,
+                    1,
+                    0,
+                    '/bar/',
+                    'test',
+                    1,
+                    ''
+                ),
+            ]);
+
+        $cache->method('get')
+            ->with(1)
+            ->willReturn($fileInfo);
+
+        $manager->method('getMountsByMountProvider')
+            ->willReturn([$mount1, $mount2]);
+
+        $node = new Folder($root, $view, '/bar/foo');
+        $result = $node->getById(1);
+        $this->assertEquals(2, count($result));
+        $this->assertEquals('/bar/foo/qwerty', $result[0]->getPath());
+        $this->assertEquals('/bar/foo/asd/foo/qwerty', $result[1]->getPath());
+    }
+
+    public static function uniqueNameProvider(): array {
+        return [
+            // input, existing, expected
+            ['foo', [], 'foo'],
+            ['foo', ['foo'], 'foo (2)'],
+            ['foo', ['foo', 'foo (2)'], 'foo (3)'],
+        ];
+    }
+
+    /**
+     * @dataProvider uniqueNameProvider
+     */
+    public function testGetUniqueName($name, $existingFiles, $expected): void {
+        $manager = $this->createMock(Manager::class);
+        $folderPath = '/bar/foo';
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->onlyMethods(['getUser', 'getMountsIn', 'getMount'])
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+
+        $view->expects($this->any())
+            ->method('file_exists')
+            ->willReturnCallback(function ($path) use ($existingFiles, $folderPath) {
+                foreach ($existingFiles as $existing) {
+                    if ($folderPath . '/' . $existing === $path) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+
+        $node = new Folder($root, $view, $folderPath);
+        $this->assertEquals($expected, $node->getNonExistingName($name));
+    }
+
+    public function testRecent(): void {
+        $manager = $this->createMock(Manager::class);
+        $folderPath = '/bar/foo';
+        $view = $this->getRootViewMock();
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\Node\Root $root */
+        $root = $this->getMockBuilder(Root::class)
+            ->onlyMethods(['getUser', 'getMountsIn', 'getMount'])
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\FileInfo $folderInfo */
+        $folderInfo = $this->getMockBuilder(FileInfo::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $baseTime = time();
+        $storage = new Temporary();
+        $mount = new MountPoint($storage, '');
+
+        $folderInfo->expects($this->any())
+            ->method('getMountPoint')
+            ->willReturn($mount);
+        $root->method('getMount')
+            ->willReturn($mount);
+        $root->method('getMountsIn')
+            ->willReturn([]);
+
+        $cache = $storage->getCache();
+
+        $cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('bar', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('bar/foo', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('bar/asd', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $id1 = $cache->put('bar/foo/inside.txt', [
+            'storage_mtime' => $baseTime,
+            'mtime' => $baseTime,
+            'mimetype' => 'text/plain',
+            'size' => 3,
+            'permissions' => \OCP\Constants::PERMISSION_ALL,
+        ]);
+        $id2 = $cache->put('bar/foo/old.txt', [
+            'storage_mtime' => $baseTime - 100,
+            'mtime' => $baseTime - 100,
+            'mimetype' => 'text/plain',
+            'size' => 3,
+            'permissions' => \OCP\Constants::PERMISSION_READ,
+        ]);
+        $cache->put('bar/asd/outside.txt', [
+            'storage_mtime' => $baseTime,
+            'mtime' => $baseTime,
+            'mimetype' => 'text/plain',
+            'size' => 3,
+        ]);
+        $id3 = $cache->put('bar/foo/older.txt', [
+            'storage_mtime' => $baseTime - 600,
+            'mtime' => $baseTime - 600,
+            'mimetype' => 'text/plain',
+            'size' => 3,
+            'permissions' => \OCP\Constants::PERMISSION_ALL,
+        ]);
+
+        $node = new Folder($root, $view, $folderPath, $folderInfo);
+
+
+        $nodes = $node->getRecent(5);
+        $ids = array_map(function (Node $node) {
+            return (int)$node->getId();
+        }, $nodes);
+        $this->assertEquals([$id1, $id2, $id3], $ids);
+    }
+
+    public function testRecentFolder(): void {
+        $manager = $this->createMock(Manager::class);
+        $folderPath = '/bar/foo';
+        $view = $this->getRootViewMock();
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\Node\Root $root */
+        $root = $this->getMockBuilder(Root::class)
+            ->onlyMethods(['getUser', 'getMountsIn', 'getMount'])
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\FileInfo $folderInfo */
+        $folderInfo = $this->getMockBuilder(FileInfo::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $baseTime = time();
+        $storage = new Temporary();
+        $mount = new MountPoint($storage, '');
+
+        $folderInfo->expects($this->any())
+            ->method('getMountPoint')
+            ->willReturn($mount);
+
+        $root->method('getMount')
+            ->willReturn($mount);
+        $root->method('getMountsIn')
+            ->willReturn([]);
+
+        $cache = $storage->getCache();
+
+        $cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('bar', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('bar/foo', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $id1 = $cache->put('bar/foo/folder', [
+            'storage_mtime' => $baseTime,
+            'mtime' => $baseTime,
+            'mimetype' => \OCP\Files\FileInfo::MIMETYPE_FOLDER,
+            'size' => 3,
+            'permissions' => 0,
+        ]);
+        $id2 = $cache->put('bar/foo/folder/bar.txt', [
+            'storage_mtime' => $baseTime,
+            'mtime' => $baseTime,
+            'mimetype' => 'text/plain',
+            'size' => 3,
+            'parent' => $id1,
+            'permissions' => \OCP\Constants::PERMISSION_ALL,
+        ]);
+        $id3 = $cache->put('bar/foo/folder/asd.txt', [
+            'storage_mtime' => $baseTime - 100,
+            'mtime' => $baseTime - 100,
+            'mimetype' => 'text/plain',
+            'size' => 3,
+            'parent' => $id1,
+            'permissions' => \OCP\Constants::PERMISSION_ALL,
+        ]);
+
+        $node = new Folder($root, $view, $folderPath, $folderInfo);
+
+
+        $nodes = $node->getRecent(5);
+        $ids = array_map(function (Node $node) {
+            return (int)$node->getId();
+        }, $nodes);
+        $this->assertEquals([$id2, $id3], $ids);
+        $this->assertEquals($baseTime, $nodes[0]->getMTime());
+        $this->assertEquals($baseTime - 100, $nodes[1]->getMTime());
+    }
+
+    public function testRecentJail(): void {
+        $manager = $this->createMock(Manager::class);
+        $folderPath = '/bar/foo';
+        $view = $this->getRootViewMock();
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\Node\Root $root */
+        $root = $this->getMockBuilder(Root::class)
+            ->onlyMethods(['getUser', 'getMountsIn', 'getMount'])
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\FileInfo $folderInfo */
+        $folderInfo = $this->getMockBuilder(FileInfo::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $baseTime = time();
+        $storage = new Temporary();
+        $jail = new Jail([
+            'storage' => $storage,
+            'root' => 'folder',
+        ]);
+        $mount = new MountPoint($jail, '/bar/foo');
+
+        $folderInfo->expects($this->any())
+            ->method('getMountPoint')
+            ->willReturn($mount);
+        $root->method('getMount')
+            ->willReturn($mount);
+        $root->method('getMountsIn')
+            ->willReturn([]);
+
+        $cache = $storage->getCache();
+
+        $cache->insert('', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('folder', ['size' => 0, 'mtime' => 0, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $id1 = $cache->put('folder/inside.txt', [
+            'storage_mtime' => $baseTime,
+            'mtime' => $baseTime,
+            'mimetype' => 'text/plain',
+            'size' => 3,
+            'permissions' => \OCP\Constants::PERMISSION_ALL,
+        ]);
+
+        $cache->put('outside.txt', [
+            'storage_mtime' => $baseTime - 100,
+            'mtime' => $baseTime - 100,
+            'mimetype' => 'text/plain',
+            'size' => 3,
+        ]);
+
+        $node = new Folder($root, $view, $folderPath, $folderInfo);
+
+        $nodes = $node->getRecent(5);
+        $ids = array_map(function (Node $node) {
+            return (int)$node->getId();
+        }, $nodes);
+        $this->assertEquals([$id1], $ids);
+    }
+
+    public static function offsetLimitProvider(): array {
+        return [
+            [0, 10, ['/bar/foo/foo1', '/bar/foo/foo2', '/bar/foo/foo3', '/bar/foo/foo4', '/bar/foo/sub1/foo5', '/bar/foo/sub1/foo6', '/bar/foo/sub2/foo7', '/bar/foo/sub2/foo8'], []],
+            [0, 5, ['/bar/foo/foo1', '/bar/foo/foo2', '/bar/foo/foo3', '/bar/foo/foo4', '/bar/foo/sub1/foo5'], []],
+            [0, 2, ['/bar/foo/foo1', '/bar/foo/foo2'], []],
+            [3, 2, ['/bar/foo/foo4', '/bar/foo/sub1/foo5'], []],
+            [3, 5, ['/bar/foo/foo4', '/bar/foo/sub1/foo5', '/bar/foo/sub1/foo6', '/bar/foo/sub2/foo7', '/bar/foo/sub2/foo8'], []],
+            [5, 2, ['/bar/foo/sub1/foo6', '/bar/foo/sub2/foo7'], []],
+            [6, 2, ['/bar/foo/sub2/foo7', '/bar/foo/sub2/foo8'], []],
+            [7, 2, ['/bar/foo/sub2/foo8'], []],
+            [10, 2, [], []],
+            [0, 5, ['/bar/foo/sub2/foo7', '/bar/foo/foo1', '/bar/foo/sub1/foo5', '/bar/foo/foo2', '/bar/foo/foo3'], [new SearchOrder(ISearchOrder::DIRECTION_ASCENDING, 'mtime')]],
+            [3, 2, ['/bar/foo/foo2', '/bar/foo/foo3'], [new SearchOrder(ISearchOrder::DIRECTION_ASCENDING, 'mtime')]],
+            [0, 5, ['/bar/foo/sub1/foo5', '/bar/foo/sub1/foo6', '/bar/foo/sub2/foo7', '/bar/foo/foo1', '/bar/foo/foo2'], [
+                new SearchOrder(ISearchOrder::DIRECTION_DESCENDING, 'size'),
+                new SearchOrder(ISearchOrder::DIRECTION_ASCENDING, 'mtime')
+            ]],
+        ];
+    }
+
+    /**
+     * @dataProvider offsetLimitProvider
+     * @param int $offset
+     * @param int $limit
+     * @param string[] $expectedPaths
+     * @param ISearchOrder[] $ordering
+     * @throws NotFoundException
+     * @throws \OCP\Files\InvalidPathException
+     */
+    public function testSearchSubStoragesLimitOffset(int $offset, int $limit, array $expectedPaths, array $ordering): void {
+        if (!$ordering) {
+            $ordering = [new SearchOrder(ISearchOrder::DIRECTION_ASCENDING, 'fileid')];
+        }
+
+        $manager = $this->createMock(Manager::class);
+        $view = $this->getRootViewMock();
+        $root = $this->getMockBuilder(Root::class)
+            ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+            ->getMock();
+        $root->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->user);
+        $storage = $this->createMock(IStorage::class);
+        $storage->method('getId')->willReturn('test::1');
+        $cache = new Cache($storage);
+        $subStorage1 = $this->createMock(IStorage::class);
+        $subStorage1->method('getId')->willReturn('test::2');
+        $subCache1 = new Cache($subStorage1);
+        $subMount1 = $this->getMockBuilder(MountPoint::class)->setConstructorArgs([Temporary::class, ''])->getMock();
+        $subStorage2 = $this->createMock(IStorage::class);
+        $subStorage2->method('getId')->willReturn('test::3');
+        $subCache2 = new Cache($subStorage2);
+        $subMount2 = $this->getMockBuilder(MountPoint::class)->setConstructorArgs([Temporary::class, ''])->getMock();
+
+        $mount = $this->createMock(IMountPoint::class);
+        $mount->method('getStorage')
+            ->willReturn($storage);
+        $mount->method('getInternalPath')
+            ->willReturn('foo');
+
+        $subMount1->method('getStorage')
+            ->willReturn($subStorage1);
+
+        $subMount1->method('getMountPoint')
+            ->willReturn('/bar/foo/sub1/');
+
+        $storage->method('getCache')
+            ->willReturn($cache);
+        $storage->method('getOwner')
+            ->willReturn('owner');
+
+        $subStorage1->method('getCache')
+            ->willReturn($subCache1);
+        $subStorage1->method('getOwner')
+            ->willReturn('owner');
+
+        $subMount2->method('getStorage')
+            ->willReturn($subStorage2);
+
+        $subMount2->method('getMountPoint')
+            ->willReturn('/bar/foo/sub2/');
+
+        $subStorage2->method('getCache')
+            ->willReturn($subCache2);
+        $subStorage2->method('getOwner')
+            ->willReturn('owner');
+
+
+        $cache->insert('', ['size' => 0, 'mtime' => 10, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('foo', ['size' => 0, 'mtime' => 10, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $cache->insert('foo/foo1', ['size' => 200, 'mtime' => 10, 'mimetype' => 'text/plain']);
+        $cache->insert('foo/foo2', ['size' => 200, 'mtime' => 20, 'mimetype' => 'text/plain']);
+        $cache->insert('foo/foo3', ['size' => 200, 'mtime' => 30, 'mimetype' => 'text/plain']);
+        $cache->insert('foo/foo4', ['size' => 200, 'mtime' => 40, 'mimetype' => 'text/plain']);
+
+        $subCache1->insert('', ['size' => 0, 'mtime' => 10, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $subCache1->insert('foo5', ['size' => 300, 'mtime' => 15, 'mimetype' => 'text/plain']);
+        $subCache1->insert('foo6', ['size' => 300, 'mtime' => 50, 'mimetype' => 'text/plain']);
+
+        $subCache2->insert('', ['size' => 0, 'mtime' => 10, 'mimetype' => ICacheEntry::DIRECTORY_MIMETYPE]);
+        $subCache2->insert('foo7', ['size' => 200, 'mtime' => 5, 'mimetype' => 'text/plain']);
+        $subCache2->insert('foo8', ['size' => 200, 'mtime' => 60, 'mimetype' => 'text/plain']);
+
+        $root->method('getMountsIn')
+            ->with('/bar/foo')
+            ->willReturn([$subMount1, $subMount2]);
+
+        $root->method('getMount')
+            ->with('/bar/foo')
+            ->willReturn($mount);
+
+        $node = new Folder($root, $view, '/bar/foo');
+        $comparison = new SearchComparison(ISearchComparison::COMPARE_LIKE, 'name', '%foo%');
+        $operator = new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_AND, [
+            $comparison,
+            new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_NOT, [new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE)]),
+        ]);
+        $query = new SearchQuery($operator, $limit, $offset, $ordering);
+        $result = $node->search($query);
+        $cache->clear();
+        $subCache1->clear();
+        $subCache2->clear();
+        $ids = array_map(function (Node $info) {
+            return $info->getPath();
+        }, $result);
+        $this->assertEquals($expectedPaths, $ids);
+    }
 }

tests/lib/Files/Node/HookConnectorTest.php

Indentation +275 added lines, -275 removed lines

@@ -46,279 +46,279 @@
  * @package Test\Files\Node
  */
 class HookConnectorTest extends TestCase {
-	use UserTrait;
-	use MountProviderTrait;
-
-	/** @var IEventDispatcher */
-	protected $eventDispatcher;
-
-	private LoggerInterface $logger;
-
-	/** @var View */
-	private $view;
-
-	/** @var Root */
-	private $root;
-
-	/** @var string */
-	private $userId;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->userId = $this->getUniqueID();
-		$this->createUser($this->userId, 'pass');
-		// this will setup the FS
-		$this->loginAsUser($this->userId);
-		$this->registerMount($this->userId, new Temporary(), '/' . $this->userId . '/files/');
-		$cacheFactory = $this->createMock(ICacheFactory::class);
-		$cacheFactory->method('createLocal')
-			->willReturnCallback(function () {
-				return new ArrayCache();
-			});
-		$this->view = new View();
-		$this->root = new Root(
-			Filesystem::getMountManager(),
-			$this->view,
-			\OC::$server->getUserManager()->get($this->userId),
-			\OC::$server->getUserMountCache(),
-			$this->createMock(LoggerInterface::class),
-			$this->createMock(IUserManager::class),
-			$this->createMock(IEventDispatcher::class),
-			$cacheFactory,
-		);
-		$this->eventDispatcher = \OC::$server->query(IEventDispatcher::class);
-		$this->logger = \OC::$server->query(LoggerInterface::class);
-	}
-
-	protected function tearDown(): void {
-		parent::tearDown();
-		\OC_Hook::clear('OC_Filesystem');
-		\OC_Util::tearDownFS();
-	}
-
-	public static function viewToNodeProvider(): array {
-		return [
-			[function () {
-				Filesystem::file_put_contents('test.txt', 'asd');
-			}, 'preWrite', '\OCP\Files::preWrite', BeforeNodeWrittenEvent::class],
-			[function () {
-				Filesystem::file_put_contents('test.txt', 'asd');
-			}, 'postWrite', '\OCP\Files::postWrite', NodeWrittenEvent::class],
-			[function () {
-				Filesystem::file_put_contents('test.txt', 'asd');
-			}, 'preCreate', '\OCP\Files::preCreate', BeforeNodeCreatedEvent::class],
-			[function () {
-				Filesystem::file_put_contents('test.txt', 'asd');
-			}, 'postCreate', '\OCP\Files::postCreate', NodeCreatedEvent::class],
-			[function () {
-				Filesystem::mkdir('test.txt');
-			}, 'preCreate', '\OCP\Files::preCreate', BeforeNodeCreatedEvent::class],
-			[function () {
-				Filesystem::mkdir('test.txt');
-			}, 'postCreate', '\OCP\Files::postCreate', NodeCreatedEvent::class],
-			[function () {
-				Filesystem::touch('test.txt');
-			}, 'preTouch', '\OCP\Files::preTouch', BeforeNodeTouchedEvent::class],
-			[function () {
-				Filesystem::touch('test.txt');
-			}, 'postTouch', '\OCP\Files::postTouch', NodeTouchedEvent::class],
-			[function () {
-				Filesystem::touch('test.txt');
-			}, 'preCreate', '\OCP\Files::preCreate', BeforeNodeCreatedEvent::class],
-			[function () {
-				Filesystem::touch('test.txt');
-			}, 'postCreate', '\OCP\Files::postCreate', NodeCreatedEvent::class],
-			[function () {
-				Filesystem::file_put_contents('test.txt', 'asd');
-				Filesystem::unlink('test.txt');
-			}, 'preDelete', '\OCP\Files::preDelete', BeforeNodeDeletedEvent::class],
-			[function () {
-				Filesystem::file_put_contents('test.txt', 'asd');
-				Filesystem::unlink('test.txt');
-			}, 'postDelete', '\OCP\Files::postDelete', NodeDeletedEvent::class],
-			[function () {
-				Filesystem::mkdir('test.txt');
-				Filesystem::rmdir('test.txt');
-			}, 'preDelete', '\OCP\Files::preDelete', BeforeNodeDeletedEvent::class],
-			[function () {
-				Filesystem::mkdir('test.txt');
-				Filesystem::rmdir('test.txt');
-			}, 'postDelete', '\OCP\Files::postDelete', NodeDeletedEvent::class],
-		];
-	}
-
-	/**
-	 * @param callable $operation
-	 * @param string $expectedHook
-	 * @dataProvider viewToNodeProvider
-	 */
-	public function testViewToNode(callable $operation, $expectedHook, $expectedLegacyEvent, $expectedEvent): void {
-		$connector = new HookConnector($this->root, $this->view, $this->eventDispatcher, $this->logger);
-		$connector->viewToNode();
-		$hookCalled = false;
-		/** @var Node $hookNode */
-		$hookNode = null;
-
-		$this->root->listen('\OC\Files', $expectedHook, function ($node) use (&$hookNode, &$hookCalled) {
-			$hookCalled = true;
-			$hookNode = $node;
-		});
-
-		$dispatcherCalled = false;
-		/** @var Node $dispatcherNode */
-		$dispatcherNode = null;
-		$this->eventDispatcher->addListener($expectedLegacyEvent, function ($event) use (&$dispatcherCalled, &$dispatcherNode) {
-			/** @var GenericEvent|APIGenericEvent $event */
-			$dispatcherCalled = true;
-			$dispatcherNode = $event->getSubject();
-		});
-
-		$newDispatcherCalled = false;
-		$newDispatcherNode = null;
-		$this->eventDispatcher->addListener($expectedEvent, function ($event) use ($expectedEvent, &$newDispatcherCalled, &$newDispatcherNode) {
-			if ($event instanceof  $expectedEvent) {
-				/** @var AbstractNodeEvent $event */
-				$newDispatcherCalled = true;
-				$newDispatcherNode = $event->getNode();
-			}
-		});
-
-		$operation();
-
-		$this->assertTrue($hookCalled);
-		$this->assertEquals('/' . $this->userId . '/files/test.txt', $hookNode->getPath());
-
-		$this->assertTrue($dispatcherCalled);
-		$this->assertEquals('/' . $this->userId . '/files/test.txt', $dispatcherNode->getPath());
-
-		$this->assertTrue($newDispatcherCalled);
-		$this->assertEquals('/' . $this->userId . '/files/test.txt', $newDispatcherNode->getPath());
-	}
-
-	public static function viewToNodeProviderCopyRename(): array {
-		return [
-			[function () {
-				Filesystem::file_put_contents('source', 'asd');
-				Filesystem::rename('source', 'target');
-			}, 'preRename', '\OCP\Files::preRename', BeforeNodeRenamedEvent::class],
-			[function () {
-				Filesystem::file_put_contents('source', 'asd');
-				Filesystem::rename('source', 'target');
-			}, 'postRename', '\OCP\Files::postRename', NodeRenamedEvent::class],
-			[function () {
-				Filesystem::file_put_contents('source', 'asd');
-				Filesystem::copy('source', 'target');
-			}, 'preCopy', '\OCP\Files::preCopy', BeforeNodeCopiedEvent::class],
-			[function () {
-				Filesystem::file_put_contents('source', 'asd');
-				Filesystem::copy('source', 'target');
-			}, 'postCopy', '\OCP\Files::postCopy', NodeCopiedEvent::class],
-		];
-	}
-
-	/**
-	 * @param callable $operation
-	 * @param string $expectedHook
-	 * @dataProvider viewToNodeProviderCopyRename
-	 */
-	public function testViewToNodeCopyRename(callable $operation, $expectedHook, $expectedLegacyEvent, $expectedEvent): void {
-		$connector = new HookConnector($this->root, $this->view, $this->eventDispatcher, $this->logger);
-		$connector->viewToNode();
-		$hookCalled = false;
-		/** @var Node $hookSourceNode */
-		$hookSourceNode = null;
-		/** @var Node $hookTargetNode */
-		$hookTargetNode = null;
-
-		$this->root->listen('\OC\Files', $expectedHook, function ($sourceNode, $targetNode) use (&$hookCalled, &$hookSourceNode, &$hookTargetNode) {
-			$hookCalled = true;
-			$hookSourceNode = $sourceNode;
-			$hookTargetNode = $targetNode;
-		});
-
-		$dispatcherCalled = false;
-		/** @var Node $dispatcherSourceNode */
-		$dispatcherSourceNode = null;
-		/** @var Node $dispatcherTargetNode */
-		$dispatcherTargetNode = null;
-		$this->eventDispatcher->addListener($expectedLegacyEvent, function ($event) use (&$dispatcherSourceNode, &$dispatcherTargetNode, &$dispatcherCalled) {
-			/** @var GenericEvent|APIGenericEvent $event */
-			$dispatcherCalled = true;
-			[$dispatcherSourceNode, $dispatcherTargetNode] = $event->getSubject();
-		});
-
-		$newDispatcherCalled = false;
-		/** @var Node $dispatcherSourceNode */
-		$newDispatcherSourceNode = null;
-		/** @var Node $dispatcherTargetNode */
-		$newDispatcherTargetNode = null;
-		$this->eventDispatcher->addListener($expectedEvent, function ($event) use ($expectedEvent, &$newDispatcherSourceNode, &$newDispatcherTargetNode, &$newDispatcherCalled) {
-			if ($event instanceof $expectedEvent) {
-				/** @var AbstractNodesEvent$event */
-				$newDispatcherCalled = true;
-				$newDispatcherSourceNode = $event->getSource();
-				$newDispatcherTargetNode = $event->getTarget();
-			}
-		});
-
-		$operation();
-
-		$this->assertTrue($hookCalled);
-		$this->assertEquals('/' . $this->userId . '/files/source', $hookSourceNode->getPath());
-		$this->assertEquals('/' . $this->userId . '/files/target', $hookTargetNode->getPath());
-
-		$this->assertTrue($dispatcherCalled);
-		$this->assertEquals('/' . $this->userId . '/files/source', $dispatcherSourceNode->getPath());
-		$this->assertEquals('/' . $this->userId . '/files/target', $dispatcherTargetNode->getPath());
-
-		$this->assertTrue($newDispatcherCalled);
-		$this->assertEquals('/' . $this->userId . '/files/source', $newDispatcherSourceNode->getPath());
-		$this->assertEquals('/' . $this->userId . '/files/target', $newDispatcherTargetNode->getPath());
-	}
-
-	public function testPostDeleteMeta(): void {
-		$connector = new HookConnector($this->root, $this->view, $this->eventDispatcher, $this->logger);
-		$connector->viewToNode();
-		$hookCalled = false;
-		/** @var Node $hookNode */
-		$hookNode = null;
-
-		$this->root->listen('\OC\Files', 'postDelete', function ($node) use (&$hookNode, &$hookCalled) {
-			$hookCalled = true;
-			$hookNode = $node;
-		});
-
-		$dispatcherCalled = false;
-		/** @var Node $dispatcherNode */
-		$dispatcherNode = null;
-		$this->eventDispatcher->addListener('\OCP\Files::postDelete', function ($event) use (&$dispatcherCalled, &$dispatcherNode) {
-			/** @var GenericEvent|APIGenericEvent $event */
-			$dispatcherCalled = true;
-			$dispatcherNode = $event->getSubject();
-		});
-
-		$newDispatcherCalled = false;
-		/** @var Node $dispatcherNode */
-		$newDispatcherNode = null;
-		$this->eventDispatcher->addListener(NodeDeletedEvent::class, function ($event) use (&$newDispatcherCalled, &$newDispatcherNode) {
-			if ($event instanceof NodeDeletedEvent) {
-				/** @var AbstractNodeEvent $event */
-				$newDispatcherCalled = true;
-				$newDispatcherNode = $event->getNode();
-			}
-		});
-
-		Filesystem::file_put_contents('test.txt', 'asd');
-		$info = Filesystem::getFileInfo('test.txt');
-		Filesystem::unlink('test.txt');
-
-		$this->assertTrue($hookCalled);
-		$this->assertEquals($hookNode->getId(), $info->getId());
-
-		$this->assertTrue($dispatcherCalled);
-		$this->assertEquals($dispatcherNode->getId(), $info->getId());
-
-		$this->assertTrue($newDispatcherCalled);
-		$this->assertEquals($newDispatcherNode->getId(), $info->getId());
-	}
+    use UserTrait;
+    use MountProviderTrait;
+
+    /** @var IEventDispatcher */
+    protected $eventDispatcher;
+
+    private LoggerInterface $logger;
+
+    /** @var View */
+    private $view;
+
+    /** @var Root */
+    private $root;
+
+    /** @var string */
+    private $userId;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->userId = $this->getUniqueID();
+        $this->createUser($this->userId, 'pass');
+        // this will setup the FS
+        $this->loginAsUser($this->userId);
+        $this->registerMount($this->userId, new Temporary(), '/' . $this->userId . '/files/');
+        $cacheFactory = $this->createMock(ICacheFactory::class);
+        $cacheFactory->method('createLocal')
+            ->willReturnCallback(function () {
+                return new ArrayCache();
+            });
+        $this->view = new View();
+        $this->root = new Root(
+            Filesystem::getMountManager(),
+            $this->view,
+            \OC::$server->getUserManager()->get($this->userId),
+            \OC::$server->getUserMountCache(),
+            $this->createMock(LoggerInterface::class),
+            $this->createMock(IUserManager::class),
+            $this->createMock(IEventDispatcher::class),
+            $cacheFactory,
+        );
+        $this->eventDispatcher = \OC::$server->query(IEventDispatcher::class);
+        $this->logger = \OC::$server->query(LoggerInterface::class);
+    }
+
+    protected function tearDown(): void {
+        parent::tearDown();
+        \OC_Hook::clear('OC_Filesystem');
+        \OC_Util::tearDownFS();
+    }
+
+    public static function viewToNodeProvider(): array {
+        return [
+            [function () {
+                Filesystem::file_put_contents('test.txt', 'asd');
+            }, 'preWrite', '\OCP\Files::preWrite', BeforeNodeWrittenEvent::class],
+            [function () {
+                Filesystem::file_put_contents('test.txt', 'asd');
+            }, 'postWrite', '\OCP\Files::postWrite', NodeWrittenEvent::class],
+            [function () {
+                Filesystem::file_put_contents('test.txt', 'asd');
+            }, 'preCreate', '\OCP\Files::preCreate', BeforeNodeCreatedEvent::class],
+            [function () {
+                Filesystem::file_put_contents('test.txt', 'asd');
+            }, 'postCreate', '\OCP\Files::postCreate', NodeCreatedEvent::class],
+            [function () {
+                Filesystem::mkdir('test.txt');
+            }, 'preCreate', '\OCP\Files::preCreate', BeforeNodeCreatedEvent::class],
+            [function () {
+                Filesystem::mkdir('test.txt');
+            }, 'postCreate', '\OCP\Files::postCreate', NodeCreatedEvent::class],
+            [function () {
+                Filesystem::touch('test.txt');
+            }, 'preTouch', '\OCP\Files::preTouch', BeforeNodeTouchedEvent::class],
+            [function () {
+                Filesystem::touch('test.txt');
+            }, 'postTouch', '\OCP\Files::postTouch', NodeTouchedEvent::class],
+            [function () {
+                Filesystem::touch('test.txt');
+            }, 'preCreate', '\OCP\Files::preCreate', BeforeNodeCreatedEvent::class],
+            [function () {
+                Filesystem::touch('test.txt');
+            }, 'postCreate', '\OCP\Files::postCreate', NodeCreatedEvent::class],
+            [function () {
+                Filesystem::file_put_contents('test.txt', 'asd');
+                Filesystem::unlink('test.txt');
+            }, 'preDelete', '\OCP\Files::preDelete', BeforeNodeDeletedEvent::class],
+            [function () {
+                Filesystem::file_put_contents('test.txt', 'asd');
+                Filesystem::unlink('test.txt');
+            }, 'postDelete', '\OCP\Files::postDelete', NodeDeletedEvent::class],
+            [function () {
+                Filesystem::mkdir('test.txt');
+                Filesystem::rmdir('test.txt');
+            }, 'preDelete', '\OCP\Files::preDelete', BeforeNodeDeletedEvent::class],
+            [function () {
+                Filesystem::mkdir('test.txt');
+                Filesystem::rmdir('test.txt');
+            }, 'postDelete', '\OCP\Files::postDelete', NodeDeletedEvent::class],
+        ];
+    }
+
+    /**
+     * @param callable $operation
+     * @param string $expectedHook
+     * @dataProvider viewToNodeProvider
+     */
+    public function testViewToNode(callable $operation, $expectedHook, $expectedLegacyEvent, $expectedEvent): void {
+        $connector = new HookConnector($this->root, $this->view, $this->eventDispatcher, $this->logger);
+        $connector->viewToNode();
+        $hookCalled = false;
+        /** @var Node $hookNode */
+        $hookNode = null;
+
+        $this->root->listen('\OC\Files', $expectedHook, function ($node) use (&$hookNode, &$hookCalled) {
+            $hookCalled = true;
+            $hookNode = $node;
+        });
+
+        $dispatcherCalled = false;
+        /** @var Node $dispatcherNode */
+        $dispatcherNode = null;
+        $this->eventDispatcher->addListener($expectedLegacyEvent, function ($event) use (&$dispatcherCalled, &$dispatcherNode) {
+            /** @var GenericEvent|APIGenericEvent $event */
+            $dispatcherCalled = true;
+            $dispatcherNode = $event->getSubject();
+        });
+
+        $newDispatcherCalled = false;
+        $newDispatcherNode = null;
+        $this->eventDispatcher->addListener($expectedEvent, function ($event) use ($expectedEvent, &$newDispatcherCalled, &$newDispatcherNode) {
+            if ($event instanceof  $expectedEvent) {
+                /** @var AbstractNodeEvent $event */
+                $newDispatcherCalled = true;
+                $newDispatcherNode = $event->getNode();
+            }
+        });
+
+        $operation();
+
+        $this->assertTrue($hookCalled);
+        $this->assertEquals('/' . $this->userId . '/files/test.txt', $hookNode->getPath());
+
+        $this->assertTrue($dispatcherCalled);
+        $this->assertEquals('/' . $this->userId . '/files/test.txt', $dispatcherNode->getPath());
+
+        $this->assertTrue($newDispatcherCalled);
+        $this->assertEquals('/' . $this->userId . '/files/test.txt', $newDispatcherNode->getPath());
+    }
+
+    public static function viewToNodeProviderCopyRename(): array {
+        return [
+            [function () {
+                Filesystem::file_put_contents('source', 'asd');
+                Filesystem::rename('source', 'target');
+            }, 'preRename', '\OCP\Files::preRename', BeforeNodeRenamedEvent::class],
+            [function () {
+                Filesystem::file_put_contents('source', 'asd');
+                Filesystem::rename('source', 'target');
+            }, 'postRename', '\OCP\Files::postRename', NodeRenamedEvent::class],
+            [function () {
+                Filesystem::file_put_contents('source', 'asd');
+                Filesystem::copy('source', 'target');
+            }, 'preCopy', '\OCP\Files::preCopy', BeforeNodeCopiedEvent::class],
+            [function () {
+                Filesystem::file_put_contents('source', 'asd');
+                Filesystem::copy('source', 'target');
+            }, 'postCopy', '\OCP\Files::postCopy', NodeCopiedEvent::class],
+        ];
+    }
+
+    /**
+     * @param callable $operation
+     * @param string $expectedHook
+     * @dataProvider viewToNodeProviderCopyRename
+     */
+    public function testViewToNodeCopyRename(callable $operation, $expectedHook, $expectedLegacyEvent, $expectedEvent): void {
+        $connector = new HookConnector($this->root, $this->view, $this->eventDispatcher, $this->logger);
+        $connector->viewToNode();
+        $hookCalled = false;
+        /** @var Node $hookSourceNode */
+        $hookSourceNode = null;
+        /** @var Node $hookTargetNode */
+        $hookTargetNode = null;
+
+        $this->root->listen('\OC\Files', $expectedHook, function ($sourceNode, $targetNode) use (&$hookCalled, &$hookSourceNode, &$hookTargetNode) {
+            $hookCalled = true;
+            $hookSourceNode = $sourceNode;
+            $hookTargetNode = $targetNode;
+        });
+
+        $dispatcherCalled = false;
+        /** @var Node $dispatcherSourceNode */
+        $dispatcherSourceNode = null;
+        /** @var Node $dispatcherTargetNode */
+        $dispatcherTargetNode = null;
+        $this->eventDispatcher->addListener($expectedLegacyEvent, function ($event) use (&$dispatcherSourceNode, &$dispatcherTargetNode, &$dispatcherCalled) {
+            /** @var GenericEvent|APIGenericEvent $event */
+            $dispatcherCalled = true;
+            [$dispatcherSourceNode, $dispatcherTargetNode] = $event->getSubject();
+        });
+
+        $newDispatcherCalled = false;
+        /** @var Node $dispatcherSourceNode */
+        $newDispatcherSourceNode = null;
+        /** @var Node $dispatcherTargetNode */
+        $newDispatcherTargetNode = null;
+        $this->eventDispatcher->addListener($expectedEvent, function ($event) use ($expectedEvent, &$newDispatcherSourceNode, &$newDispatcherTargetNode, &$newDispatcherCalled) {
+            if ($event instanceof $expectedEvent) {
+                /** @var AbstractNodesEvent$event */
+                $newDispatcherCalled = true;
+                $newDispatcherSourceNode = $event->getSource();
+                $newDispatcherTargetNode = $event->getTarget();
+            }
+        });
+
+        $operation();
+
+        $this->assertTrue($hookCalled);
+        $this->assertEquals('/' . $this->userId . '/files/source', $hookSourceNode->getPath());
+        $this->assertEquals('/' . $this->userId . '/files/target', $hookTargetNode->getPath());
+
+        $this->assertTrue($dispatcherCalled);
+        $this->assertEquals('/' . $this->userId . '/files/source', $dispatcherSourceNode->getPath());
+        $this->assertEquals('/' . $this->userId . '/files/target', $dispatcherTargetNode->getPath());
+
+        $this->assertTrue($newDispatcherCalled);
+        $this->assertEquals('/' . $this->userId . '/files/source', $newDispatcherSourceNode->getPath());
+        $this->assertEquals('/' . $this->userId . '/files/target', $newDispatcherTargetNode->getPath());
+    }
+
+    public function testPostDeleteMeta(): void {
+        $connector = new HookConnector($this->root, $this->view, $this->eventDispatcher, $this->logger);
+        $connector->viewToNode();
+        $hookCalled = false;
+        /** @var Node $hookNode */
+        $hookNode = null;
+
+        $this->root->listen('\OC\Files', 'postDelete', function ($node) use (&$hookNode, &$hookCalled) {
+            $hookCalled = true;
+            $hookNode = $node;
+        });
+
+        $dispatcherCalled = false;
+        /** @var Node $dispatcherNode */
+        $dispatcherNode = null;
+        $this->eventDispatcher->addListener('\OCP\Files::postDelete', function ($event) use (&$dispatcherCalled, &$dispatcherNode) {
+            /** @var GenericEvent|APIGenericEvent $event */
+            $dispatcherCalled = true;
+            $dispatcherNode = $event->getSubject();
+        });
+
+        $newDispatcherCalled = false;
+        /** @var Node $dispatcherNode */
+        $newDispatcherNode = null;
+        $this->eventDispatcher->addListener(NodeDeletedEvent::class, function ($event) use (&$newDispatcherCalled, &$newDispatcherNode) {
+            if ($event instanceof NodeDeletedEvent) {
+                /** @var AbstractNodeEvent $event */
+                $newDispatcherCalled = true;
+                $newDispatcherNode = $event->getNode();
+            }
+        });
+
+        Filesystem::file_put_contents('test.txt', 'asd');
+        $info = Filesystem::getFileInfo('test.txt');
+        Filesystem::unlink('test.txt');
+
+        $this->assertTrue($hookCalled);
+        $this->assertEquals($hookNode->getId(), $info->getId());
+
+        $this->assertTrue($dispatcherCalled);
+        $this->assertEquals($dispatcherNode->getId(), $info->getId());
+
+        $this->assertTrue($newDispatcherCalled);
+        $this->assertEquals($newDispatcherNode->getId(), $info->getId());
+    }
 }

Spacing +38 added lines, -38 removed lines

@@ -69,10 +69,10 @@ 
 		$this->createUser($this->userId, 'pass');
 		// this will setup the FS
 		$this->loginAsUser($this->userId);
-		$this->registerMount($this->userId, new Temporary(), '/' . $this->userId . '/files/');
+		$this->registerMount($this->userId, new Temporary(), '/'.$this->userId.'/files/');
 		$cacheFactory = $this->createMock(ICacheFactory::class);
 		$cacheFactory->method('createLocal')
-			->willReturnCallback(function () {
+			->willReturnCallback(function() {
 				return new ArrayCache();
 			});
 		$this->view = new View();
@@ -98,49 +98,49 @@ 
 
 	public static function viewToNodeProvider(): array {
 		return [
-			[function () {
+			[function() {
 				Filesystem::file_put_contents('test.txt', 'asd');
 			}, 'preWrite', '\OCP\Files::preWrite', BeforeNodeWrittenEvent::class],
-			[function () {
+			[function() {
 				Filesystem::file_put_contents('test.txt', 'asd');
 			}, 'postWrite', '\OCP\Files::postWrite', NodeWrittenEvent::class],
-			[function () {
+			[function() {
 				Filesystem::file_put_contents('test.txt', 'asd');
 			}, 'preCreate', '\OCP\Files::preCreate', BeforeNodeCreatedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::file_put_contents('test.txt', 'asd');
 			}, 'postCreate', '\OCP\Files::postCreate', NodeCreatedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::mkdir('test.txt');
 			}, 'preCreate', '\OCP\Files::preCreate', BeforeNodeCreatedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::mkdir('test.txt');
 			}, 'postCreate', '\OCP\Files::postCreate', NodeCreatedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::touch('test.txt');
 			}, 'preTouch', '\OCP\Files::preTouch', BeforeNodeTouchedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::touch('test.txt');
 			}, 'postTouch', '\OCP\Files::postTouch', NodeTouchedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::touch('test.txt');
 			}, 'preCreate', '\OCP\Files::preCreate', BeforeNodeCreatedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::touch('test.txt');
 			}, 'postCreate', '\OCP\Files::postCreate', NodeCreatedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::file_put_contents('test.txt', 'asd');
 				Filesystem::unlink('test.txt');
 			}, 'preDelete', '\OCP\Files::preDelete', BeforeNodeDeletedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::file_put_contents('test.txt', 'asd');
 				Filesystem::unlink('test.txt');
 			}, 'postDelete', '\OCP\Files::postDelete', NodeDeletedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::mkdir('test.txt');
 				Filesystem::rmdir('test.txt');
 			}, 'preDelete', '\OCP\Files::preDelete', BeforeNodeDeletedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::mkdir('test.txt');
 				Filesystem::rmdir('test.txt');
 			}, 'postDelete', '\OCP\Files::postDelete', NodeDeletedEvent::class],
@@ -159,7 +159,7 @@ 
 		/** @var Node $hookNode */
 		$hookNode = null;
 
-		$this->root->listen('\OC\Files', $expectedHook, function ($node) use (&$hookNode, &$hookCalled) {
+		$this->root->listen('\OC\Files', $expectedHook, function($node) use (&$hookNode, &$hookCalled) {
 			$hookCalled = true;
 			$hookNode = $node;
 		});
@@ -167,7 +167,7 @@ 
 		$dispatcherCalled = false;
 		/** @var Node $dispatcherNode */
 		$dispatcherNode = null;
-		$this->eventDispatcher->addListener($expectedLegacyEvent, function ($event) use (&$dispatcherCalled, &$dispatcherNode) {
+		$this->eventDispatcher->addListener($expectedLegacyEvent, function($event) use (&$dispatcherCalled, &$dispatcherNode) {
 			/** @var GenericEvent|APIGenericEvent $event */
 			$dispatcherCalled = true;
 			$dispatcherNode = $event->getSubject();
@@ -175,7 +175,7 @@ 
 
 		$newDispatcherCalled = false;
 		$newDispatcherNode = null;
-		$this->eventDispatcher->addListener($expectedEvent, function ($event) use ($expectedEvent, &$newDispatcherCalled, &$newDispatcherNode) {
+		$this->eventDispatcher->addListener($expectedEvent, function($event) use ($expectedEvent, &$newDispatcherCalled, &$newDispatcherNode) {
 			if ($event instanceof  $expectedEvent) {
 				/** @var AbstractNodeEvent $event */
 				$newDispatcherCalled = true;
@@ -186,30 +186,30 @@ 
 		$operation();
 
 		$this->assertTrue($hookCalled);
-		$this->assertEquals('/' . $this->userId . '/files/test.txt', $hookNode->getPath());
+		$this->assertEquals('/'.$this->userId.'/files/test.txt', $hookNode->getPath());
 
 		$this->assertTrue($dispatcherCalled);
-		$this->assertEquals('/' . $this->userId . '/files/test.txt', $dispatcherNode->getPath());
+		$this->assertEquals('/'.$this->userId.'/files/test.txt', $dispatcherNode->getPath());
 
 		$this->assertTrue($newDispatcherCalled);
-		$this->assertEquals('/' . $this->userId . '/files/test.txt', $newDispatcherNode->getPath());
+		$this->assertEquals('/'.$this->userId.'/files/test.txt', $newDispatcherNode->getPath());
 	}
 
 	public static function viewToNodeProviderCopyRename(): array {
 		return [
-			[function () {
+			[function() {
 				Filesystem::file_put_contents('source', 'asd');
 				Filesystem::rename('source', 'target');
 			}, 'preRename', '\OCP\Files::preRename', BeforeNodeRenamedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::file_put_contents('source', 'asd');
 				Filesystem::rename('source', 'target');
 			}, 'postRename', '\OCP\Files::postRename', NodeRenamedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::file_put_contents('source', 'asd');
 				Filesystem::copy('source', 'target');
 			}, 'preCopy', '\OCP\Files::preCopy', BeforeNodeCopiedEvent::class],
-			[function () {
+			[function() {
 				Filesystem::file_put_contents('source', 'asd');
 				Filesystem::copy('source', 'target');
 			}, 'postCopy', '\OCP\Files::postCopy', NodeCopiedEvent::class],
@@ -230,7 +230,7 @@ 
 		/** @var Node $hookTargetNode */
 		$hookTargetNode = null;
 
-		$this->root->listen('\OC\Files', $expectedHook, function ($sourceNode, $targetNode) use (&$hookCalled, &$hookSourceNode, &$hookTargetNode) {
+		$this->root->listen('\OC\Files', $expectedHook, function($sourceNode, $targetNode) use (&$hookCalled, &$hookSourceNode, &$hookTargetNode) {
 			$hookCalled = true;
 			$hookSourceNode = $sourceNode;
 			$hookTargetNode = $targetNode;
@@ -241,7 +241,7 @@ 
 		$dispatcherSourceNode = null;
 		/** @var Node $dispatcherTargetNode */
 		$dispatcherTargetNode = null;
-		$this->eventDispatcher->addListener($expectedLegacyEvent, function ($event) use (&$dispatcherSourceNode, &$dispatcherTargetNode, &$dispatcherCalled) {
+		$this->eventDispatcher->addListener($expectedLegacyEvent, function($event) use (&$dispatcherSourceNode, &$dispatcherTargetNode, &$dispatcherCalled) {
 			/** @var GenericEvent|APIGenericEvent $event */
 			$dispatcherCalled = true;
 			[$dispatcherSourceNode, $dispatcherTargetNode] = $event->getSubject();
@@ -252,7 +252,7 @@ 
 		$newDispatcherSourceNode = null;
 		/** @var Node $dispatcherTargetNode */
 		$newDispatcherTargetNode = null;
-		$this->eventDispatcher->addListener($expectedEvent, function ($event) use ($expectedEvent, &$newDispatcherSourceNode, &$newDispatcherTargetNode, &$newDispatcherCalled) {
+		$this->eventDispatcher->addListener($expectedEvent, function($event) use ($expectedEvent, &$newDispatcherSourceNode, &$newDispatcherTargetNode, &$newDispatcherCalled) {
 			if ($event instanceof $expectedEvent) {
 				/** @var AbstractNodesEvent$event */
 				$newDispatcherCalled = true;
@@ -264,16 +264,16 @@ 
 		$operation();
 
 		$this->assertTrue($hookCalled);
-		$this->assertEquals('/' . $this->userId . '/files/source', $hookSourceNode->getPath());
-		$this->assertEquals('/' . $this->userId . '/files/target', $hookTargetNode->getPath());
+		$this->assertEquals('/'.$this->userId.'/files/source', $hookSourceNode->getPath());
+		$this->assertEquals('/'.$this->userId.'/files/target', $hookTargetNode->getPath());
 
 		$this->assertTrue($dispatcherCalled);
-		$this->assertEquals('/' . $this->userId . '/files/source', $dispatcherSourceNode->getPath());
-		$this->assertEquals('/' . $this->userId . '/files/target', $dispatcherTargetNode->getPath());
+		$this->assertEquals('/'.$this->userId.'/files/source', $dispatcherSourceNode->getPath());
+		$this->assertEquals('/'.$this->userId.'/files/target', $dispatcherTargetNode->getPath());
 
 		$this->assertTrue($newDispatcherCalled);
-		$this->assertEquals('/' . $this->userId . '/files/source', $newDispatcherSourceNode->getPath());
-		$this->assertEquals('/' . $this->userId . '/files/target', $newDispatcherTargetNode->getPath());
+		$this->assertEquals('/'.$this->userId.'/files/source', $newDispatcherSourceNode->getPath());
+		$this->assertEquals('/'.$this->userId.'/files/target', $newDispatcherTargetNode->getPath());
 	}
 
 	public function testPostDeleteMeta(): void {
@@ -283,7 +283,7 @@ 
 		/** @var Node $hookNode */
 		$hookNode = null;
 
-		$this->root->listen('\OC\Files', 'postDelete', function ($node) use (&$hookNode, &$hookCalled) {
+		$this->root->listen('\OC\Files', 'postDelete', function($node) use (&$hookNode, &$hookCalled) {
 			$hookCalled = true;
 			$hookNode = $node;
 		});
@@ -291,7 +291,7 @@ 
 		$dispatcherCalled = false;
 		/** @var Node $dispatcherNode */
 		$dispatcherNode = null;
-		$this->eventDispatcher->addListener('\OCP\Files::postDelete', function ($event) use (&$dispatcherCalled, &$dispatcherNode) {
+		$this->eventDispatcher->addListener('\OCP\Files::postDelete', function($event) use (&$dispatcherCalled, &$dispatcherNode) {
 			/** @var GenericEvent|APIGenericEvent $event */
 			$dispatcherCalled = true;
 			$dispatcherNode = $event->getSubject();
@@ -300,7 +300,7 @@ 
 		$newDispatcherCalled = false;
 		/** @var Node $dispatcherNode */
 		$newDispatcherNode = null;
-		$this->eventDispatcher->addListener(NodeDeletedEvent::class, function ($event) use (&$newDispatcherCalled, &$newDispatcherNode) {
+		$this->eventDispatcher->addListener(NodeDeletedEvent::class, function($event) use (&$newDispatcherCalled, &$newDispatcherNode) {
 			if ($event instanceof NodeDeletedEvent) {
 				/** @var AbstractNodeEvent $event */
 				$newDispatcherCalled = true;

tests/lib/Files/FilesystemTest.php

Indentation +448 added lines, -448 removed lines

@@ -17,25 +17,25 @@ 
 use OCP\Server;
 
 class DummyMountProvider implements IMountProvider {
-	private $mounts = [];
-
-	/**
-	 * @param array $mounts
-	 */
-	public function __construct(array $mounts) {
-		$this->mounts = $mounts;
-	}
-
-	/**
-	 * Get the pre-registered mount points
-	 *
-	 * @param IUser $user
-	 * @param IStorageFactory $loader
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		return isset($this->mounts[$user->getUID()]) ? $this->mounts[$user->getUID()] : [];
-	}
+    private $mounts = [];
+
+    /**
+     * @param array $mounts
+     */
+    public function __construct(array $mounts) {
+        $this->mounts = $mounts;
+    }
+
+    /**
+     * Get the pre-registered mount points
+     *
+     * @param IUser $user
+     * @param IStorageFactory $loader
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        return isset($this->mounts[$user->getUID()]) ? $this->mounts[$user->getUID()] : [];
+    }
 }
 
 /**
@@ -46,433 +46,433 @@ 
  * @package Test\Files
  */
 class FilesystemTest extends \Test\TestCase {
-	public const TEST_FILESYSTEM_USER1 = 'test-filesystem-user1';
-	public const TEST_FILESYSTEM_USER2 = 'test-filesystem-user1';
-
-	/**
-	 * @var array tmpDirs
-	 */
-	private $tmpDirs = [];
-
-	/**
-	 * @return array
-	 */
-	private function getStorageData() {
-		$dir = \OC::$server->getTempManager()->getTemporaryFolder();
-		$this->tmpDirs[] = $dir;
-		return ['datadir' => $dir];
-	}
-
-	protected function setUp(): void {
-		parent::setUp();
-		$userBackend = new \Test\Util\User\Dummy();
-		$userBackend->createUser(self::TEST_FILESYSTEM_USER1, self::TEST_FILESYSTEM_USER1);
-		$userBackend->createUser(self::TEST_FILESYSTEM_USER2, self::TEST_FILESYSTEM_USER2);
-		\OC::$server->getUserManager()->registerBackend($userBackend);
-		$this->loginAsUser();
-	}
-
-	protected function tearDown(): void {
-		foreach ($this->tmpDirs as $dir) {
-			\OC_Helper::rmdirr($dir);
-		}
-
-		$this->logout();
-		$this->invokePrivate('\OC\Files\Filesystem', 'normalizedPathCache', [null]);
-		parent::tearDown();
-	}
-
-	public function testMount(): void {
-		\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', self::getStorageData(), '/');
-		$this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/'));
-		$this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/some/folder'));
-		[, $internalPath] = \OC\Files\Filesystem::resolvePath('/');
-		$this->assertEquals('', $internalPath);
-		[, $internalPath] = \OC\Files\Filesystem::resolvePath('/some/folder');
-		$this->assertEquals('some/folder', $internalPath);
-
-		\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', self::getStorageData(), '/some');
-		$this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/'));
-		$this->assertEquals('/some/', \OC\Files\Filesystem::getMountPoint('/some/folder'));
-		$this->assertEquals('/some/', \OC\Files\Filesystem::getMountPoint('/some/'));
-		$this->assertEquals('/some/', \OC\Files\Filesystem::getMountPoint('/some'));
-		[, $internalPath] = \OC\Files\Filesystem::resolvePath('/some/folder');
-		$this->assertEquals('folder', $internalPath);
-	}
-
-	public static function normalizePathData(): array {
-		return [
-			['/', ''],
-			['/', '/'],
-			['/', '//'],
-			['/', '/', false],
-			['/', '//', false],
-
-			['/path', '/path/'],
-			['/path/', '/path/', false],
-			['/path', 'path'],
-
-			['/foo/bar', '/foo//bar/'],
-			['/foo/bar/', '/foo//bar/', false],
-			['/foo/bar', '/foo////bar'],
-			['/foo/bar', '/foo/////bar'],
-			['/foo/bar', '/foo/bar/.'],
-			['/foo/bar', '/foo/bar/./'],
-			['/foo/bar/', '/foo/bar/./', false],
-			['/foo/bar', '/foo/bar/./.'],
-			['/foo/bar', '/foo/bar/././'],
-			['/foo/bar/', '/foo/bar/././', false],
-			['/foo/bar', '/foo/./bar/'],
-			['/foo/bar/', '/foo/./bar/', false],
-			['/foo/.bar', '/foo/.bar/'],
-			['/foo/.bar/', '/foo/.bar/', false],
-			['/foo/.bar/tee', '/foo/.bar/tee'],
-			['/foo/bar.', '/foo/bar./'],
-			['/foo/bar./', '/foo/bar./', false],
-			['/foo/bar./tee', '/foo/bar./tee'],
-			['/foo/.bar.', '/foo/.bar./'],
-			['/foo/.bar./', '/foo/.bar./', false],
-			['/foo/.bar./tee', '/foo/.bar./tee'],
-
-			['/foo/bar', '/.////././//./foo/.///././//./bar/././/./.'],
-			['/foo/bar/', '/.////././//./foo/.///././//./bar/./././.', false],
-			['/foo/bar', '/.////././//./foo/.///././//./bar/././/././'],
-			['/foo/bar/', '/.////././//./foo/.///././//./bar/././/././', false],
-			['/foo/.bar', '/.////././//./foo/./././/./.bar/././/././'],
-			['/foo/.bar/', '/.////././//./foo/./././/./.bar/././/././', false],
-			['/foo/.bar/tee./', '/.////././//./foo/./././/./.bar/tee././/././', false],
-			['/foo/bar.', '/.////././//./foo/./././/./bar./././/././'],
-			['/foo/bar./', '/.////././//./foo/./././/./bar./././/././', false],
-			['/foo/bar./tee./', '/.////././//./foo/./././/./bar./tee././/././', false],
-			['/foo/.bar.', '/.////././//./foo/./././/./.bar./././/././'],
-			['/foo/.bar./', '/.////././//./foo/./././/./.bar./././././', false],
-			['/foo/.bar./tee./', '/.////././//./foo/./././/./.bar./tee././././', false],
-
-			// Windows paths
-			['/', ''],
-			['/', '\\'],
-			['/', '\\', false],
-			['/', '\\\\'],
-			['/', '\\\\', false],
-
-			['/path', '\\path'],
-			['/path', '\\path', false],
-			['/path', '\\path\\'],
-			['/path/', '\\path\\', false],
-
-			['/foo/bar', '\\foo\\\\bar\\'],
-			['/foo/bar/', '\\foo\\\\bar\\', false],
-			['/foo/bar', '\\foo\\\\\\\\bar'],
-			['/foo/bar', '\\foo\\\\\\\\\\bar'],
-			['/foo/bar', '\\foo\\bar\\.'],
-			['/foo/bar', '\\foo\\bar\\.\\'],
-			['/foo/bar/', '\\foo\\bar\\.\\', false],
-			['/foo/bar', '\\foo\\bar\\.\\.'],
-			['/foo/bar', '\\foo\\bar\\.\\.\\'],
-			['/foo/bar/', '\\foo\\bar\\.\\.\\', false],
-			['/foo/bar', '\\foo\\.\\bar\\'],
-			['/foo/bar/', '\\foo\\.\\bar\\', false],
-			['/foo/.bar', '\\foo\\.bar\\'],
-			['/foo/.bar/', '\\foo\\.bar\\', false],
-			['/foo/.bar/tee', '\\foo\\.bar\\tee'],
-
-			// Absolute windows paths NOT marked as absolute
-			['/C:', 'C:\\'],
-			['/C:/', 'C:\\', false],
-			['/C:/tests', 'C:\\tests'],
-			['/C:/tests', 'C:\\tests', false],
-			['/C:/tests', 'C:\\tests\\'],
-			['/C:/tests/', 'C:\\tests\\', false],
-			['/C:/tests/bar', 'C:\\tests\\.\\.\\bar'],
-			['/C:/tests/bar/', 'C:\\tests\\.\\.\\bar\\.\\', false],
-
-			// normalize does not resolve '..' (by design)
-			['/foo/..', '/foo/../'],
-			['/foo/../bar', '/foo/../bar/.'],
-			['/foo/..', '\\foo\\..\\'],
-			['/foo/../bar', '\\foo\\..\\bar'],
-		];
-	}
-
-	/**
-	 * @dataProvider normalizePathData
-	 */
-	public function testNormalizePath($expected, $path, $stripTrailingSlash = true): void {
-		$this->assertEquals($expected, \OC\Files\Filesystem::normalizePath($path, $stripTrailingSlash));
-	}
-
-	public static function normalizePathKeepUnicodeData(): array {
-		$nfdName = 'ümlaut';
-		$nfcName = 'ümlaut';
-		return [
-			['/' . $nfcName, $nfcName, true],
-			['/' . $nfcName, $nfcName, false],
-			['/' . $nfdName, $nfdName, true],
-			['/' . $nfcName, $nfdName, false],
-		];
-	}
-
-	/**
-	 * @dataProvider normalizePathKeepUnicodeData
-	 */
-	public function testNormalizePathKeepUnicode($expected, $path, $keepUnicode = false): void {
-		$this->assertEquals($expected, \OC\Files\Filesystem::normalizePath($path, true, false, $keepUnicode));
-	}
-
-	public function testNormalizePathKeepUnicodeCache(): void {
-		$nfdName = 'ümlaut';
-		$nfcName = 'ümlaut';
-		// call in succession due to cache
-		$this->assertEquals('/' . $nfcName, \OC\Files\Filesystem::normalizePath($nfdName, true, false, false));
-		$this->assertEquals('/' . $nfdName, \OC\Files\Filesystem::normalizePath($nfdName, true, false, true));
-	}
-
-	public static function isValidPathData(): array {
-		return [
-			['/', true],
-			['/path', true],
-			['/foo/bar', true],
-			['/foo//bar/', true],
-			['/foo////bar', true],
-			['/foo//\///bar', true],
-			['/foo/bar/.', true],
-			['/foo/bar/./', true],
-			['/foo/bar/./.', true],
-			['/foo/bar/././', true],
-			['/foo/bar/././..bar', true],
-			['/foo/bar/././..bar/a', true],
-			['/foo/bar/././..', false],
-			['/foo/bar/././../', false],
-			['/foo/bar/.././', false],
-			['/foo/bar/../../', false],
-			['/foo/bar/../..\\', false],
-			['..', false],
-			['../', false],
-			['../foo/bar', false],
-			['..\foo/bar', false],
-		];
-	}
-
-	/**
-	 * @dataProvider isValidPathData
-	 */
-	public function testIsValidPath($path, $expected): void {
-		$this->assertSame($expected, \OC\Files\Filesystem::isValidPath($path));
-	}
-
-	public static function isFileBlacklistedData(): array {
-		return [
-			['/etc/foo/bar/foo.txt', false],
-			['\etc\foo/bar\foo.txt', false],
-			['.htaccess', true],
-			['.htaccess/', true],
-			['.htaccess\\', true],
-			['/etc/foo\bar/.htaccess\\', true],
-			['/etc/foo\bar/.htaccess/', true],
-			['/etc/foo\bar/.htaccess/foo', false],
-			['//foo//bar/\.htaccess/', true],
-			['\foo\bar\.HTAccess', true],
-		];
-	}
-
-	/**
-	 * @dataProvider isFileBlacklistedData
-	 */
-	public function testIsFileBlacklisted($path, $expected): void {
-		$this->assertSame($expected, \OC\Files\Filesystem::isFileBlacklisted($path));
-	}
-
-	public function testNormalizePathUTF8(): void {
-		if (!class_exists('Patchwork\PHP\Shim\Normalizer')) {
-			$this->markTestSkipped('UTF8 normalizer Patchwork was not found');
-		}
-
-		$this->assertEquals("/foo/bar\xC3\xBC", \OC\Files\Filesystem::normalizePath("/foo/baru\xCC\x88"));
-		$this->assertEquals("/foo/bar\xC3\xBC", \OC\Files\Filesystem::normalizePath("\\foo\\baru\xCC\x88"));
-	}
-
-	public function testHooks(): void {
-		if (\OC\Files\Filesystem::getView()) {
-			$user = \OC_User::getUser();
-		} else {
-			$user = self::TEST_FILESYSTEM_USER1;
-			$backend = new \Test\Util\User\Dummy();
-			Server::get(IUserManager::class)->registerBackend($backend);
-			$backend->createUser($user, $user);
-			$userObj = \OC::$server->getUserManager()->get($user);
-			\OC::$server->getUserSession()->setUser($userObj);
-			\OC\Files\Filesystem::init($user, '/' . $user . '/files');
-		}
-		\OC_Hook::clear('OC_Filesystem');
-		\OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
-
-		\OC\Files\Filesystem::mount('OC\Files\Storage\Temporary', [], '/');
-
-		$rootView = new \OC\Files\View('');
-		$rootView->mkdir('/' . $user);
-		$rootView->mkdir('/' . $user . '/files');
-
-		//		\OC\Files\Filesystem::file_put_contents('/foo', 'foo');
-		\OC\Files\Filesystem::mkdir('/bar');
-		//		\OC\Files\Filesystem::file_put_contents('/bar//foo', 'foo');
-
-		$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
-		file_put_contents($tmpFile, 'foo');
-		$fh = fopen($tmpFile, 'r');
-		//		\OC\Files\Filesystem::file_put_contents('/bar//foo', $fh);
-	}
-
-	/**
-	 * Tests that an exception is thrown when passed user does not exist.
-	 *
-	 */
-	public function testLocalMountWhenUserDoesNotExist(): void {
-		$this->expectException(\OC\User\NoUserException::class);
-
-		$userId = $this->getUniqueID('user_');
-
-		\OC\Files\Filesystem::initMountPoints($userId);
-	}
-
-
-	public function testNullUserThrows(): void {
-		$this->expectException(\OC\User\NoUserException::class);
-
-		\OC\Files\Filesystem::initMountPoints(null);
-	}
-
-	public function testNullUserThrowsTwice(): void {
-		$thrown = 0;
-		try {
-			\OC\Files\Filesystem::initMountPoints(null);
-		} catch (NoUserException $e) {
-			$thrown++;
-		}
-		try {
-			\OC\Files\Filesystem::initMountPoints(null);
-		} catch (NoUserException $e) {
-			$thrown++;
-		}
-		$this->assertEquals(2, $thrown);
-	}
-
-	/**
-	 * Tests that an exception is thrown when passed user does not exist.
-	 */
-	public function testLocalMountWhenUserDoesNotExistTwice(): void {
-		$thrown = 0;
-		$userId = $this->getUniqueID('user_');
-
-		try {
-			\OC\Files\Filesystem::initMountPoints($userId);
-		} catch (NoUserException $e) {
-			$thrown++;
-		}
-
-		try {
-			\OC\Files\Filesystem::initMountPoints($userId);
-		} catch (NoUserException $e) {
-			$thrown++;
-		}
-
-		$this->assertEquals(2, $thrown);
-	}
-
-	/**
-	 * Tests that the home storage is used for the user's mount point
-	 */
-	public function testHomeMount(): void {
-		$userId = $this->getUniqueID('user_');
-
-		\OC::$server->getUserManager()->createUser($userId, $userId);
-
-		\OC\Files\Filesystem::initMountPoints($userId);
-
-		$homeMount = \OC\Files\Filesystem::getStorage('/' . $userId . '/');
-
-		$this->assertTrue($homeMount->instanceOfStorage('\OCP\Files\IHomeStorage'));
-		if ($homeMount->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')) {
-			$this->assertEquals('object::user:' . $userId, $homeMount->getId());
-		} elseif ($homeMount->instanceOfStorage('\OC\Files\Storage\Home')) {
-			$this->assertEquals('home::' . $userId, $homeMount->getId());
-		}
-
-		$user = \OC::$server->getUserManager()->get($userId);
-		if ($user !== null) {
-			$user->delete();
-		}
-	}
-
-	public function dummyHook($arguments) {
-		$path = $arguments['path'];
-		$this->assertEquals($path, \OC\Files\Filesystem::normalizePath($path)); //the path passed to the hook should already be normalized
-	}
-
-	/**
-	 * Test that the default cache dir is part of the user's home
-	 */
-	public function testMountDefaultCacheDir(): void {
-		$userId = $this->getUniqueID('user_');
-		$config = \OC::$server->getConfig();
-		$oldCachePath = $config->getSystemValueString('cache_path', '');
-		// no cache path configured
-		$config->setSystemValue('cache_path', '');
-
-		\OC::$server->getUserManager()->createUser($userId, $userId);
-		\OC\Files\Filesystem::initMountPoints($userId);
-
-		$this->assertEquals(
-			'/' . $userId . '/',
-			\OC\Files\Filesystem::getMountPoint('/' . $userId . '/cache')
-		);
-		[$storage, $internalPath] = \OC\Files\Filesystem::resolvePath('/' . $userId . '/cache');
-		$this->assertTrue($storage->instanceOfStorage('\OCP\Files\IHomeStorage'));
-		$this->assertEquals('cache', $internalPath);
-		$user = \OC::$server->getUserManager()->get($userId);
-		if ($user !== null) {
-			$user->delete();
-		}
-
-		$config->setSystemValue('cache_path', $oldCachePath);
-	}
-
-	/**
-	 * Test that an external cache is mounted into
-	 * the user's home
-	 */
-	public function testMountExternalCacheDir(): void {
-		$userId = $this->getUniqueID('user_');
-
-		$config = \OC::$server->getConfig();
-		$oldCachePath = $config->getSystemValueString('cache_path', '');
-		// set cache path to temp dir
-		$cachePath = \OC::$server->getTempManager()->getTemporaryFolder() . '/extcache';
-		$config->setSystemValue('cache_path', $cachePath);
-
-		\OC::$server->getUserManager()->createUser($userId, $userId);
-		\OC\Files\Filesystem::initMountPoints($userId);
-
-		$this->assertEquals(
-			'/' . $userId . '/cache/',
-			\OC\Files\Filesystem::getMountPoint('/' . $userId . '/cache')
-		);
-		[$storage, $internalPath] = \OC\Files\Filesystem::resolvePath('/' . $userId . '/cache');
-		$this->assertTrue($storage->instanceOfStorage('\OC\Files\Storage\Local'));
-		$this->assertEquals('', $internalPath);
-		$user = \OC::$server->getUserManager()->get($userId);
-		if ($user !== null) {
-			$user->delete();
-		}
-
-		$config->setSystemValue('cache_path', $oldCachePath);
-	}
-
-	public function testRegisterMountProviderAfterSetup(): void {
-		\OC\Files\Filesystem::initMountPoints(self::TEST_FILESYSTEM_USER2);
-		$this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/foo/bar'));
-		$mount = new MountPoint(new Temporary([]), '/foo/bar');
-		$mountProvider = new DummyMountProvider([self::TEST_FILESYSTEM_USER2 => [$mount]]);
-		\OC::$server->getMountProviderCollection()->registerProvider($mountProvider);
-		$this->assertEquals('/foo/bar/', \OC\Files\Filesystem::getMountPoint('/foo/bar'));
-	}
+    public const TEST_FILESYSTEM_USER1 = 'test-filesystem-user1';
+    public const TEST_FILESYSTEM_USER2 = 'test-filesystem-user1';
+
+    /**
+     * @var array tmpDirs
+     */
+    private $tmpDirs = [];
+
+    /**
+     * @return array
+     */
+    private function getStorageData() {
+        $dir = \OC::$server->getTempManager()->getTemporaryFolder();
+        $this->tmpDirs[] = $dir;
+        return ['datadir' => $dir];
+    }
+
+    protected function setUp(): void {
+        parent::setUp();
+        $userBackend = new \Test\Util\User\Dummy();
+        $userBackend->createUser(self::TEST_FILESYSTEM_USER1, self::TEST_FILESYSTEM_USER1);
+        $userBackend->createUser(self::TEST_FILESYSTEM_USER2, self::TEST_FILESYSTEM_USER2);
+        \OC::$server->getUserManager()->registerBackend($userBackend);
+        $this->loginAsUser();
+    }
+
+    protected function tearDown(): void {
+        foreach ($this->tmpDirs as $dir) {
+            \OC_Helper::rmdirr($dir);
+        }
+
+        $this->logout();
+        $this->invokePrivate('\OC\Files\Filesystem', 'normalizedPathCache', [null]);
+        parent::tearDown();
+    }
+
+    public function testMount(): void {
+        \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', self::getStorageData(), '/');
+        $this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/'));
+        $this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/some/folder'));
+        [, $internalPath] = \OC\Files\Filesystem::resolvePath('/');
+        $this->assertEquals('', $internalPath);
+        [, $internalPath] = \OC\Files\Filesystem::resolvePath('/some/folder');
+        $this->assertEquals('some/folder', $internalPath);
+
+        \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', self::getStorageData(), '/some');
+        $this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/'));
+        $this->assertEquals('/some/', \OC\Files\Filesystem::getMountPoint('/some/folder'));
+        $this->assertEquals('/some/', \OC\Files\Filesystem::getMountPoint('/some/'));
+        $this->assertEquals('/some/', \OC\Files\Filesystem::getMountPoint('/some'));
+        [, $internalPath] = \OC\Files\Filesystem::resolvePath('/some/folder');
+        $this->assertEquals('folder', $internalPath);
+    }
+
+    public static function normalizePathData(): array {
+        return [
+            ['/', ''],
+            ['/', '/'],
+            ['/', '//'],
+            ['/', '/', false],
+            ['/', '//', false],
+
+            ['/path', '/path/'],
+            ['/path/', '/path/', false],
+            ['/path', 'path'],
+
+            ['/foo/bar', '/foo//bar/'],
+            ['/foo/bar/', '/foo//bar/', false],
+            ['/foo/bar', '/foo////bar'],
+            ['/foo/bar', '/foo/////bar'],
+            ['/foo/bar', '/foo/bar/.'],
+            ['/foo/bar', '/foo/bar/./'],
+            ['/foo/bar/', '/foo/bar/./', false],
+            ['/foo/bar', '/foo/bar/./.'],
+            ['/foo/bar', '/foo/bar/././'],
+            ['/foo/bar/', '/foo/bar/././', false],
+            ['/foo/bar', '/foo/./bar/'],
+            ['/foo/bar/', '/foo/./bar/', false],
+            ['/foo/.bar', '/foo/.bar/'],
+            ['/foo/.bar/', '/foo/.bar/', false],
+            ['/foo/.bar/tee', '/foo/.bar/tee'],
+            ['/foo/bar.', '/foo/bar./'],
+            ['/foo/bar./', '/foo/bar./', false],
+            ['/foo/bar./tee', '/foo/bar./tee'],
+            ['/foo/.bar.', '/foo/.bar./'],
+            ['/foo/.bar./', '/foo/.bar./', false],
+            ['/foo/.bar./tee', '/foo/.bar./tee'],
+
+            ['/foo/bar', '/.////././//./foo/.///././//./bar/././/./.'],
+            ['/foo/bar/', '/.////././//./foo/.///././//./bar/./././.', false],
+            ['/foo/bar', '/.////././//./foo/.///././//./bar/././/././'],
+            ['/foo/bar/', '/.////././//./foo/.///././//./bar/././/././', false],
+            ['/foo/.bar', '/.////././//./foo/./././/./.bar/././/././'],
+            ['/foo/.bar/', '/.////././//./foo/./././/./.bar/././/././', false],
+            ['/foo/.bar/tee./', '/.////././//./foo/./././/./.bar/tee././/././', false],
+            ['/foo/bar.', '/.////././//./foo/./././/./bar./././/././'],
+            ['/foo/bar./', '/.////././//./foo/./././/./bar./././/././', false],
+            ['/foo/bar./tee./', '/.////././//./foo/./././/./bar./tee././/././', false],
+            ['/foo/.bar.', '/.////././//./foo/./././/./.bar./././/././'],
+            ['/foo/.bar./', '/.////././//./foo/./././/./.bar./././././', false],
+            ['/foo/.bar./tee./', '/.////././//./foo/./././/./.bar./tee././././', false],
+
+            // Windows paths
+            ['/', ''],
+            ['/', '\\'],
+            ['/', '\\', false],
+            ['/', '\\\\'],
+            ['/', '\\\\', false],
+
+            ['/path', '\\path'],
+            ['/path', '\\path', false],
+            ['/path', '\\path\\'],
+            ['/path/', '\\path\\', false],
+
+            ['/foo/bar', '\\foo\\\\bar\\'],
+            ['/foo/bar/', '\\foo\\\\bar\\', false],
+            ['/foo/bar', '\\foo\\\\\\\\bar'],
+            ['/foo/bar', '\\foo\\\\\\\\\\bar'],
+            ['/foo/bar', '\\foo\\bar\\.'],
+            ['/foo/bar', '\\foo\\bar\\.\\'],
+            ['/foo/bar/', '\\foo\\bar\\.\\', false],
+            ['/foo/bar', '\\foo\\bar\\.\\.'],
+            ['/foo/bar', '\\foo\\bar\\.\\.\\'],
+            ['/foo/bar/', '\\foo\\bar\\.\\.\\', false],
+            ['/foo/bar', '\\foo\\.\\bar\\'],
+            ['/foo/bar/', '\\foo\\.\\bar\\', false],
+            ['/foo/.bar', '\\foo\\.bar\\'],
+            ['/foo/.bar/', '\\foo\\.bar\\', false],
+            ['/foo/.bar/tee', '\\foo\\.bar\\tee'],
+
+            // Absolute windows paths NOT marked as absolute
+            ['/C:', 'C:\\'],
+            ['/C:/', 'C:\\', false],
+            ['/C:/tests', 'C:\\tests'],
+            ['/C:/tests', 'C:\\tests', false],
+            ['/C:/tests', 'C:\\tests\\'],
+            ['/C:/tests/', 'C:\\tests\\', false],
+            ['/C:/tests/bar', 'C:\\tests\\.\\.\\bar'],
+            ['/C:/tests/bar/', 'C:\\tests\\.\\.\\bar\\.\\', false],
+
+            // normalize does not resolve '..' (by design)
+            ['/foo/..', '/foo/../'],
+            ['/foo/../bar', '/foo/../bar/.'],
+            ['/foo/..', '\\foo\\..\\'],
+            ['/foo/../bar', '\\foo\\..\\bar'],
+        ];
+    }
+
+    /**
+     * @dataProvider normalizePathData
+     */
+    public function testNormalizePath($expected, $path, $stripTrailingSlash = true): void {
+        $this->assertEquals($expected, \OC\Files\Filesystem::normalizePath($path, $stripTrailingSlash));
+    }
+
+    public static function normalizePathKeepUnicodeData(): array {
+        $nfdName = 'ümlaut';
+        $nfcName = 'ümlaut';
+        return [
+            ['/' . $nfcName, $nfcName, true],
+            ['/' . $nfcName, $nfcName, false],
+            ['/' . $nfdName, $nfdName, true],
+            ['/' . $nfcName, $nfdName, false],
+        ];
+    }
+
+    /**
+     * @dataProvider normalizePathKeepUnicodeData
+     */
+    public function testNormalizePathKeepUnicode($expected, $path, $keepUnicode = false): void {
+        $this->assertEquals($expected, \OC\Files\Filesystem::normalizePath($path, true, false, $keepUnicode));
+    }
+
+    public function testNormalizePathKeepUnicodeCache(): void {
+        $nfdName = 'ümlaut';
+        $nfcName = 'ümlaut';
+        // call in succession due to cache
+        $this->assertEquals('/' . $nfcName, \OC\Files\Filesystem::normalizePath($nfdName, true, false, false));
+        $this->assertEquals('/' . $nfdName, \OC\Files\Filesystem::normalizePath($nfdName, true, false, true));
+    }
+
+    public static function isValidPathData(): array {
+        return [
+            ['/', true],
+            ['/path', true],
+            ['/foo/bar', true],
+            ['/foo//bar/', true],
+            ['/foo////bar', true],
+            ['/foo//\///bar', true],
+            ['/foo/bar/.', true],
+            ['/foo/bar/./', true],
+            ['/foo/bar/./.', true],
+            ['/foo/bar/././', true],
+            ['/foo/bar/././..bar', true],
+            ['/foo/bar/././..bar/a', true],
+            ['/foo/bar/././..', false],
+            ['/foo/bar/././../', false],
+            ['/foo/bar/.././', false],
+            ['/foo/bar/../../', false],
+            ['/foo/bar/../..\\', false],
+            ['..', false],
+            ['../', false],
+            ['../foo/bar', false],
+            ['..\foo/bar', false],
+        ];
+    }
+
+    /**
+     * @dataProvider isValidPathData
+     */
+    public function testIsValidPath($path, $expected): void {
+        $this->assertSame($expected, \OC\Files\Filesystem::isValidPath($path));
+    }
+
+    public static function isFileBlacklistedData(): array {
+        return [
+            ['/etc/foo/bar/foo.txt', false],
+            ['\etc\foo/bar\foo.txt', false],
+            ['.htaccess', true],
+            ['.htaccess/', true],
+            ['.htaccess\\', true],
+            ['/etc/foo\bar/.htaccess\\', true],
+            ['/etc/foo\bar/.htaccess/', true],
+            ['/etc/foo\bar/.htaccess/foo', false],
+            ['//foo//bar/\.htaccess/', true],
+            ['\foo\bar\.HTAccess', true],
+        ];
+    }
+
+    /**
+     * @dataProvider isFileBlacklistedData
+     */
+    public function testIsFileBlacklisted($path, $expected): void {
+        $this->assertSame($expected, \OC\Files\Filesystem::isFileBlacklisted($path));
+    }
+
+    public function testNormalizePathUTF8(): void {
+        if (!class_exists('Patchwork\PHP\Shim\Normalizer')) {
+            $this->markTestSkipped('UTF8 normalizer Patchwork was not found');
+        }
+
+        $this->assertEquals("/foo/bar\xC3\xBC", \OC\Files\Filesystem::normalizePath("/foo/baru\xCC\x88"));
+        $this->assertEquals("/foo/bar\xC3\xBC", \OC\Files\Filesystem::normalizePath("\\foo\\baru\xCC\x88"));
+    }
+
+    public function testHooks(): void {
+        if (\OC\Files\Filesystem::getView()) {
+            $user = \OC_User::getUser();
+        } else {
+            $user = self::TEST_FILESYSTEM_USER1;
+            $backend = new \Test\Util\User\Dummy();
+            Server::get(IUserManager::class)->registerBackend($backend);
+            $backend->createUser($user, $user);
+            $userObj = \OC::$server->getUserManager()->get($user);
+            \OC::$server->getUserSession()->setUser($userObj);
+            \OC\Files\Filesystem::init($user, '/' . $user . '/files');
+        }
+        \OC_Hook::clear('OC_Filesystem');
+        \OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
+
+        \OC\Files\Filesystem::mount('OC\Files\Storage\Temporary', [], '/');
+
+        $rootView = new \OC\Files\View('');
+        $rootView->mkdir('/' . $user);
+        $rootView->mkdir('/' . $user . '/files');
+
+        //		\OC\Files\Filesystem::file_put_contents('/foo', 'foo');
+        \OC\Files\Filesystem::mkdir('/bar');
+        //		\OC\Files\Filesystem::file_put_contents('/bar//foo', 'foo');
+
+        $tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
+        file_put_contents($tmpFile, 'foo');
+        $fh = fopen($tmpFile, 'r');
+        //		\OC\Files\Filesystem::file_put_contents('/bar//foo', $fh);
+    }
+
+    /**
+     * Tests that an exception is thrown when passed user does not exist.
+     *
+     */
+    public function testLocalMountWhenUserDoesNotExist(): void {
+        $this->expectException(\OC\User\NoUserException::class);
+
+        $userId = $this->getUniqueID('user_');
+
+        \OC\Files\Filesystem::initMountPoints($userId);
+    }
+
+
+    public function testNullUserThrows(): void {
+        $this->expectException(\OC\User\NoUserException::class);
+
+        \OC\Files\Filesystem::initMountPoints(null);
+    }
+
+    public function testNullUserThrowsTwice(): void {
+        $thrown = 0;
+        try {
+            \OC\Files\Filesystem::initMountPoints(null);
+        } catch (NoUserException $e) {
+            $thrown++;
+        }
+        try {
+            \OC\Files\Filesystem::initMountPoints(null);
+        } catch (NoUserException $e) {
+            $thrown++;
+        }
+        $this->assertEquals(2, $thrown);
+    }
+
+    /**
+     * Tests that an exception is thrown when passed user does not exist.
+     */
+    public function testLocalMountWhenUserDoesNotExistTwice(): void {
+        $thrown = 0;
+        $userId = $this->getUniqueID('user_');
+
+        try {
+            \OC\Files\Filesystem::initMountPoints($userId);
+        } catch (NoUserException $e) {
+            $thrown++;
+        }
+
+        try {
+            \OC\Files\Filesystem::initMountPoints($userId);
+        } catch (NoUserException $e) {
+            $thrown++;
+        }
+
+        $this->assertEquals(2, $thrown);
+    }
+
+    /**
+     * Tests that the home storage is used for the user's mount point
+     */
+    public function testHomeMount(): void {
+        $userId = $this->getUniqueID('user_');
+
+        \OC::$server->getUserManager()->createUser($userId, $userId);
+
+        \OC\Files\Filesystem::initMountPoints($userId);
+
+        $homeMount = \OC\Files\Filesystem::getStorage('/' . $userId . '/');
+
+        $this->assertTrue($homeMount->instanceOfStorage('\OCP\Files\IHomeStorage'));
+        if ($homeMount->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')) {
+            $this->assertEquals('object::user:' . $userId, $homeMount->getId());
+        } elseif ($homeMount->instanceOfStorage('\OC\Files\Storage\Home')) {
+            $this->assertEquals('home::' . $userId, $homeMount->getId());
+        }
+
+        $user = \OC::$server->getUserManager()->get($userId);
+        if ($user !== null) {
+            $user->delete();
+        }
+    }
+
+    public function dummyHook($arguments) {
+        $path = $arguments['path'];
+        $this->assertEquals($path, \OC\Files\Filesystem::normalizePath($path)); //the path passed to the hook should already be normalized
+    }
+
+    /**
+     * Test that the default cache dir is part of the user's home
+     */
+    public function testMountDefaultCacheDir(): void {
+        $userId = $this->getUniqueID('user_');
+        $config = \OC::$server->getConfig();
+        $oldCachePath = $config->getSystemValueString('cache_path', '');
+        // no cache path configured
+        $config->setSystemValue('cache_path', '');
+
+        \OC::$server->getUserManager()->createUser($userId, $userId);
+        \OC\Files\Filesystem::initMountPoints($userId);
+
+        $this->assertEquals(
+            '/' . $userId . '/',
+            \OC\Files\Filesystem::getMountPoint('/' . $userId . '/cache')
+        );
+        [$storage, $internalPath] = \OC\Files\Filesystem::resolvePath('/' . $userId . '/cache');
+        $this->assertTrue($storage->instanceOfStorage('\OCP\Files\IHomeStorage'));
+        $this->assertEquals('cache', $internalPath);
+        $user = \OC::$server->getUserManager()->get($userId);
+        if ($user !== null) {
+            $user->delete();
+        }
+
+        $config->setSystemValue('cache_path', $oldCachePath);
+    }
+
+    /**
+     * Test that an external cache is mounted into
+     * the user's home
+     */
+    public function testMountExternalCacheDir(): void {
+        $userId = $this->getUniqueID('user_');
+
+        $config = \OC::$server->getConfig();
+        $oldCachePath = $config->getSystemValueString('cache_path', '');
+        // set cache path to temp dir
+        $cachePath = \OC::$server->getTempManager()->getTemporaryFolder() . '/extcache';
+        $config->setSystemValue('cache_path', $cachePath);
+
+        \OC::$server->getUserManager()->createUser($userId, $userId);
+        \OC\Files\Filesystem::initMountPoints($userId);
+
+        $this->assertEquals(
+            '/' . $userId . '/cache/',
+            \OC\Files\Filesystem::getMountPoint('/' . $userId . '/cache')
+        );
+        [$storage, $internalPath] = \OC\Files\Filesystem::resolvePath('/' . $userId . '/cache');
+        $this->assertTrue($storage->instanceOfStorage('\OC\Files\Storage\Local'));
+        $this->assertEquals('', $internalPath);
+        $user = \OC::$server->getUserManager()->get($userId);
+        if ($user !== null) {
+            $user->delete();
+        }
+
+        $config->setSystemValue('cache_path', $oldCachePath);
+    }
+
+    public function testRegisterMountProviderAfterSetup(): void {
+        \OC\Files\Filesystem::initMountPoints(self::TEST_FILESYSTEM_USER2);
+        $this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/foo/bar'));
+        $mount = new MountPoint(new Temporary([]), '/foo/bar');
+        $mountProvider = new DummyMountProvider([self::TEST_FILESYSTEM_USER2 => [$mount]]);
+        \OC::$server->getMountProviderCollection()->registerProvider($mountProvider);
+        $this->assertEquals('/foo/bar/', \OC\Files\Filesystem::getMountPoint('/foo/bar'));
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -205,10 +205,10 @@ 
 		$nfdName = 'ümlaut';
 		$nfcName = 'ümlaut';
 		return [
-			['/' . $nfcName, $nfcName, true],
-			['/' . $nfcName, $nfcName, false],
-			['/' . $nfdName, $nfdName, true],
-			['/' . $nfcName, $nfdName, false],
+			['/'.$nfcName, $nfcName, true],
+			['/'.$nfcName, $nfcName, false],
+			['/'.$nfdName, $nfdName, true],
+			['/'.$nfcName, $nfdName, false],
 		];
 	}
 
@@ -223,8 +223,8 @@ 
 		$nfdName = 'ümlaut';
 		$nfcName = 'ümlaut';
 		// call in succession due to cache
-		$this->assertEquals('/' . $nfcName, \OC\Files\Filesystem::normalizePath($nfdName, true, false, false));
-		$this->assertEquals('/' . $nfdName, \OC\Files\Filesystem::normalizePath($nfdName, true, false, true));
+		$this->assertEquals('/'.$nfcName, \OC\Files\Filesystem::normalizePath($nfdName, true, false, false));
+		$this->assertEquals('/'.$nfdName, \OC\Files\Filesystem::normalizePath($nfdName, true, false, true));
 	}
 
 	public static function isValidPathData(): array {
@@ -301,7 +301,7 @@ 
 			$backend->createUser($user, $user);
 			$userObj = \OC::$server->getUserManager()->get($user);
 			\OC::$server->getUserSession()->setUser($userObj);
-			\OC\Files\Filesystem::init($user, '/' . $user . '/files');
+			\OC\Files\Filesystem::init($user, '/'.$user.'/files');
 		}
 		\OC_Hook::clear('OC_Filesystem');
 		\OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
@@ -309,8 +309,8 @@ 
 		\OC\Files\Filesystem::mount('OC\Files\Storage\Temporary', [], '/');
 
 		$rootView = new \OC\Files\View('');
-		$rootView->mkdir('/' . $user);
-		$rootView->mkdir('/' . $user . '/files');
+		$rootView->mkdir('/'.$user);
+		$rootView->mkdir('/'.$user.'/files');
 
 		//		\OC\Files\Filesystem::file_put_contents('/foo', 'foo');
 		\OC\Files\Filesystem::mkdir('/bar');
@@ -388,13 +388,13 @@ 
 
 		\OC\Files\Filesystem::initMountPoints($userId);
 
-		$homeMount = \OC\Files\Filesystem::getStorage('/' . $userId . '/');
+		$homeMount = \OC\Files\Filesystem::getStorage('/'.$userId.'/');
 
 		$this->assertTrue($homeMount->instanceOfStorage('\OCP\Files\IHomeStorage'));
 		if ($homeMount->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')) {
-			$this->assertEquals('object::user:' . $userId, $homeMount->getId());
+			$this->assertEquals('object::user:'.$userId, $homeMount->getId());
 		} elseif ($homeMount->instanceOfStorage('\OC\Files\Storage\Home')) {
-			$this->assertEquals('home::' . $userId, $homeMount->getId());
+			$this->assertEquals('home::'.$userId, $homeMount->getId());
 		}
 
 		$user = \OC::$server->getUserManager()->get($userId);
@@ -422,10 +422,10 @@ 
 		\OC\Files\Filesystem::initMountPoints($userId);
 
 		$this->assertEquals(
-			'/' . $userId . '/',
-			\OC\Files\Filesystem::getMountPoint('/' . $userId . '/cache')
+			'/'.$userId.'/',
+			\OC\Files\Filesystem::getMountPoint('/'.$userId.'/cache')
 		);
-		[$storage, $internalPath] = \OC\Files\Filesystem::resolvePath('/' . $userId . '/cache');
+		[$storage, $internalPath] = \OC\Files\Filesystem::resolvePath('/'.$userId.'/cache');
 		$this->assertTrue($storage->instanceOfStorage('\OCP\Files\IHomeStorage'));
 		$this->assertEquals('cache', $internalPath);
 		$user = \OC::$server->getUserManager()->get($userId);
@@ -446,17 +446,17 @@ 
 		$config = \OC::$server->getConfig();
 		$oldCachePath = $config->getSystemValueString('cache_path', '');
 		// set cache path to temp dir
-		$cachePath = \OC::$server->getTempManager()->getTemporaryFolder() . '/extcache';
+		$cachePath = \OC::$server->getTempManager()->getTemporaryFolder().'/extcache';
 		$config->setSystemValue('cache_path', $cachePath);
 
 		\OC::$server->getUserManager()->createUser($userId, $userId);
 		\OC\Files\Filesystem::initMountPoints($userId);
 
 		$this->assertEquals(
-			'/' . $userId . '/cache/',
-			\OC\Files\Filesystem::getMountPoint('/' . $userId . '/cache')
+			'/'.$userId.'/cache/',
+			\OC\Files\Filesystem::getMountPoint('/'.$userId.'/cache')
 		);
-		[$storage, $internalPath] = \OC\Files\Filesystem::resolvePath('/' . $userId . '/cache');
+		[$storage, $internalPath] = \OC\Files\Filesystem::resolvePath('/'.$userId.'/cache');
 		$this->assertTrue($storage->instanceOfStorage('\OC\Files\Storage\Local'));
 		$this->assertEquals('', $internalPath);
 		$user = \OC::$server->getUserManager()->get($userId);

tests/lib/Archive/ZIPTest.php

Indentation +11 added lines, -11 removed lines

@@ -10,16 +10,16 @@
 use OC\Archive\ZIP;
 
 class ZIPTest extends TestBase {
-	protected function getExisting() {
-		$dir = \OC::$SERVERROOT . '/tests/data';
-		return new ZIP($dir . '/data.zip');
-	}
+    protected function getExisting() {
+        $dir = \OC::$SERVERROOT . '/tests/data';
+        return new ZIP($dir . '/data.zip');
+    }
 
-	protected function getNew() {
-		$newZip = \OC::$server->getTempManager()->getTempBaseDir() . '/newArchive.zip';
-		if (file_exists($newZip)) {
-			unlink($newZip);
-		}
-		return new ZIP($newZip);
-	}
+    protected function getNew() {
+        $newZip = \OC::$server->getTempManager()->getTempBaseDir() . '/newArchive.zip';
+        if (file_exists($newZip)) {
+            unlink($newZip);
+        }
+        return new ZIP($newZip);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -11,12 +11,12 @@
 
 class ZIPTest extends TestBase {
 	protected function getExisting() {
-		$dir = \OC::$SERVERROOT . '/tests/data';
-		return new ZIP($dir . '/data.zip');
+		$dir = \OC::$SERVERROOT.'/tests/data';
+		return new ZIP($dir.'/data.zip');
 	}
 
 	protected function getNew() {
-		$newZip = \OC::$server->getTempManager()->getTempBaseDir() . '/newArchive.zip';
+		$newZip = \OC::$server->getTempManager()->getTempBaseDir().'/newArchive.zip';
 		if (file_exists($newZip)) {
 			unlink($newZip);
 		}

tests/lib/SetupTest.php

Indentation +151 added lines, -151 removed lines

@@ -18,155 +18,155 @@
 use Psr\Log\LoggerInterface;
 
 class SetupTest extends \Test\TestCase {
-	protected SystemConfig $config;
-	private IniGetWrapper $iniWrapper;
-	private IL10N $l10n;
-	private IL10NFactory $l10nFactory;
-	private Defaults $defaults;
-	protected Setup $setupClass;
-	protected LoggerInterface $logger;
-	protected ISecureRandom $random;
-	protected Installer $installer;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->config = $this->createMock(SystemConfig::class);
-		$this->iniWrapper = $this->createMock(IniGetWrapper::class);
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->l10nFactory = $this->createMock(IL10NFactory::class);
-		$this->l10nFactory->method('get')
-			->willReturn($this->l10n);
-		$this->defaults = $this->createMock(Defaults::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->random = $this->createMock(ISecureRandom::class);
-		$this->installer = $this->createMock(Installer::class);
-		$this->setupClass = $this->getMockBuilder(Setup::class)
-			->onlyMethods(['class_exists', 'is_callable', 'getAvailableDbDriversForPdo'])
-			->setConstructorArgs([$this->config, $this->iniWrapper, $this->l10nFactory, $this->defaults, $this->logger, $this->random, $this->installer])
-			->getMock();
-	}
-
-	public function testGetSupportedDatabasesWithOneWorking(): void {
-		$this->config
-			->expects($this->once())
-			->method('getValue')
-			->willReturn(
-				['sqlite', 'mysql', 'oci']
-			);
-		$this->setupClass
-			->expects($this->once())
-			->method('is_callable')
-			->willReturn(false);
-		$this->setupClass
-			->expects($this->any())
-			->method('getAvailableDbDriversForPdo')
-			->willReturn(['sqlite']);
-		$result = $this->setupClass->getSupportedDatabases();
-		$expectedResult = [
-			'sqlite' => 'SQLite'
-		];
-
-		$this->assertSame($expectedResult, $result);
-	}
-
-	public function testGetSupportedDatabasesWithNoWorking(): void {
-		$this->config
-			->expects($this->once())
-			->method('getValue')
-			->willReturn(
-				['sqlite', 'mysql', 'oci', 'pgsql']
-			);
-		$this->setupClass
-			->expects($this->any())
-			->method('is_callable')
-			->willReturn(false);
-		$this->setupClass
-			->expects($this->any())
-			->method('getAvailableDbDriversForPdo')
-			->willReturn([]);
-		$result = $this->setupClass->getSupportedDatabases();
-
-		$this->assertSame([], $result);
-	}
-
-	public function testGetSupportedDatabasesWithAllWorking(): void {
-		$this->config
-			->expects($this->once())
-			->method('getValue')
-			->willReturn(
-				['sqlite', 'mysql', 'pgsql', 'oci']
-			);
-		$this->setupClass
-			->expects($this->any())
-			->method('is_callable')
-			->willReturn(true);
-		$this->setupClass
-			->expects($this->any())
-			->method('getAvailableDbDriversForPdo')
-			->willReturn(['sqlite', 'mysql', 'pgsql']);
-		$result = $this->setupClass->getSupportedDatabases();
-		$expectedResult = [
-			'sqlite' => 'SQLite',
-			'mysql' => 'MySQL/MariaDB',
-			'pgsql' => 'PostgreSQL',
-			'oci' => 'Oracle'
-		];
-		$this->assertSame($expectedResult, $result);
-	}
-
-
-	public function testGetSupportedDatabaseException(): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('Supported databases are not properly configured.');
-
-		$this->config
-			->expects($this->once())
-			->method('getValue')
-			->willReturn('NotAnArray');
-		$this->setupClass->getSupportedDatabases();
-	}
-
-	/**
-	 * @dataProvider findWebRootProvider
-	 * @param $url
-	 * @param $expected
-	 */
-	public function testFindWebRootCli($url, $expected): void {
-		$cliState = \OC::$CLI;
-
-		$this->config
-			->expects($this->once())
-			->method('getValue')
-			->willReturn($url);
-		\OC::$CLI = true;
-
-		try {
-			$webRoot = self::invokePrivate($this->setupClass, 'findWebRoot', [$this->config]);
-		} catch (\InvalidArgumentException $e) {
-			$webRoot = false;
-		}
-
-		\OC::$CLI = $cliState;
-		$this->assertSame($webRoot, $expected);
-	}
-
-	public static function findWebRootProvider(): array {
-		return [
-			'https://www.example.com/nextcloud/' => ['https://www.example.com/nextcloud/', '/nextcloud'],
-			'https://www.example.com/nextcloud' => ['https://www.example.com/nextcloud', '/nextcloud'],
-			'https://www.example.com/' => ['https://www.example.com/', ''],
-			'https://www.example.com' => ['https://www.example.com', ''],
-			'https://nctest13pgsql.lan/test123/' => ['https://nctest13pgsql.lan/test123/', '/test123'],
-			'https://nctest13pgsql.lan/test123' => ['https://nctest13pgsql.lan/test123', '/test123'],
-			'https://nctest13pgsql.lan/' => ['https://nctest13pgsql.lan/', ''],
-			'https://nctest13pgsql.lan' => ['https://nctest13pgsql.lan', ''],
-			'https://192.168.10.10/nc/' => ['https://192.168.10.10/nc/', '/nc'],
-			'https://192.168.10.10/nc' => ['https://192.168.10.10/nc', '/nc'],
-			'https://192.168.10.10/' => ['https://192.168.10.10/', ''],
-			'https://192.168.10.10' => ['https://192.168.10.10', ''],
-			'invalid' => ['invalid', false],
-			'empty' => ['', false],
-		];
-	}
+    protected SystemConfig $config;
+    private IniGetWrapper $iniWrapper;
+    private IL10N $l10n;
+    private IL10NFactory $l10nFactory;
+    private Defaults $defaults;
+    protected Setup $setupClass;
+    protected LoggerInterface $logger;
+    protected ISecureRandom $random;
+    protected Installer $installer;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->config = $this->createMock(SystemConfig::class);
+        $this->iniWrapper = $this->createMock(IniGetWrapper::class);
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->l10nFactory = $this->createMock(IL10NFactory::class);
+        $this->l10nFactory->method('get')
+            ->willReturn($this->l10n);
+        $this->defaults = $this->createMock(Defaults::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->random = $this->createMock(ISecureRandom::class);
+        $this->installer = $this->createMock(Installer::class);
+        $this->setupClass = $this->getMockBuilder(Setup::class)
+            ->onlyMethods(['class_exists', 'is_callable', 'getAvailableDbDriversForPdo'])
+            ->setConstructorArgs([$this->config, $this->iniWrapper, $this->l10nFactory, $this->defaults, $this->logger, $this->random, $this->installer])
+            ->getMock();
+    }
+
+    public function testGetSupportedDatabasesWithOneWorking(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getValue')
+            ->willReturn(
+                ['sqlite', 'mysql', 'oci']
+            );
+        $this->setupClass
+            ->expects($this->once())
+            ->method('is_callable')
+            ->willReturn(false);
+        $this->setupClass
+            ->expects($this->any())
+            ->method('getAvailableDbDriversForPdo')
+            ->willReturn(['sqlite']);
+        $result = $this->setupClass->getSupportedDatabases();
+        $expectedResult = [
+            'sqlite' => 'SQLite'
+        ];
+
+        $this->assertSame($expectedResult, $result);
+    }
+
+    public function testGetSupportedDatabasesWithNoWorking(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getValue')
+            ->willReturn(
+                ['sqlite', 'mysql', 'oci', 'pgsql']
+            );
+        $this->setupClass
+            ->expects($this->any())
+            ->method('is_callable')
+            ->willReturn(false);
+        $this->setupClass
+            ->expects($this->any())
+            ->method('getAvailableDbDriversForPdo')
+            ->willReturn([]);
+        $result = $this->setupClass->getSupportedDatabases();
+
+        $this->assertSame([], $result);
+    }
+
+    public function testGetSupportedDatabasesWithAllWorking(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getValue')
+            ->willReturn(
+                ['sqlite', 'mysql', 'pgsql', 'oci']
+            );
+        $this->setupClass
+            ->expects($this->any())
+            ->method('is_callable')
+            ->willReturn(true);
+        $this->setupClass
+            ->expects($this->any())
+            ->method('getAvailableDbDriversForPdo')
+            ->willReturn(['sqlite', 'mysql', 'pgsql']);
+        $result = $this->setupClass->getSupportedDatabases();
+        $expectedResult = [
+            'sqlite' => 'SQLite',
+            'mysql' => 'MySQL/MariaDB',
+            'pgsql' => 'PostgreSQL',
+            'oci' => 'Oracle'
+        ];
+        $this->assertSame($expectedResult, $result);
+    }
+
+
+    public function testGetSupportedDatabaseException(): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Supported databases are not properly configured.');
+
+        $this->config
+            ->expects($this->once())
+            ->method('getValue')
+            ->willReturn('NotAnArray');
+        $this->setupClass->getSupportedDatabases();
+    }
+
+    /**
+     * @dataProvider findWebRootProvider
+     * @param $url
+     * @param $expected
+     */
+    public function testFindWebRootCli($url, $expected): void {
+        $cliState = \OC::$CLI;
+
+        $this->config
+            ->expects($this->once())
+            ->method('getValue')
+            ->willReturn($url);
+        \OC::$CLI = true;
+
+        try {
+            $webRoot = self::invokePrivate($this->setupClass, 'findWebRoot', [$this->config]);
+        } catch (\InvalidArgumentException $e) {
+            $webRoot = false;
+        }
+
+        \OC::$CLI = $cliState;
+        $this->assertSame($webRoot, $expected);
+    }
+
+    public static function findWebRootProvider(): array {
+        return [
+            'https://www.example.com/nextcloud/' => ['https://www.example.com/nextcloud/', '/nextcloud'],
+            'https://www.example.com/nextcloud' => ['https://www.example.com/nextcloud', '/nextcloud'],
+            'https://www.example.com/' => ['https://www.example.com/', ''],
+            'https://www.example.com' => ['https://www.example.com', ''],
+            'https://nctest13pgsql.lan/test123/' => ['https://nctest13pgsql.lan/test123/', '/test123'],
+            'https://nctest13pgsql.lan/test123' => ['https://nctest13pgsql.lan/test123', '/test123'],
+            'https://nctest13pgsql.lan/' => ['https://nctest13pgsql.lan/', ''],
+            'https://nctest13pgsql.lan' => ['https://nctest13pgsql.lan', ''],
+            'https://192.168.10.10/nc/' => ['https://192.168.10.10/nc/', '/nc'],
+            'https://192.168.10.10/nc' => ['https://192.168.10.10/nc', '/nc'],
+            'https://192.168.10.10/' => ['https://192.168.10.10/', ''],
+            'https://192.168.10.10' => ['https://192.168.10.10', ''],
+            'invalid' => ['invalid', false],
+            'empty' => ['', false],
+        ];
+    }
 }

tests/lib/Authentication/Token/ManagerTest.php

Indentation +391 added lines, -391 removed lines

@@ -19,396 +19,396 @@
 use Test\TestCase;
 
 class ManagerTest extends TestCase {
-	/** @var PublicKeyTokenProvider|MockObject */
-	private $publicKeyTokenProvider;
-	/** @var Manager */
-	private $manager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->publicKeyTokenProvider = $this->createMock(PublicKeyTokenProvider::class);
-		$this->manager = new Manager(
-			$this->publicKeyTokenProvider
-		);
-	}
-
-	public function testGenerateToken(): void {
-		$token = new PublicKeyToken();
-
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('generateToken')
-			->with(
-				'token',
-				'uid',
-				'loginName',
-				'password',
-				'name',
-				IToken::TEMPORARY_TOKEN,
-				IToken::REMEMBER
-			)->willReturn($token);
-
-		$actual = $this->manager->generateToken(
-			'token',
-			'uid',
-			'loginName',
-			'password',
-			'name',
-			IToken::TEMPORARY_TOKEN,
-			IToken::REMEMBER
-		);
-
-		$this->assertSame($token, $actual);
-	}
-
-	public function testGenerateConflictingToken(): void {
-		/** @var MockObject|UniqueConstraintViolationException $exception */
-		$exception = $this->createMock(UniqueConstraintViolationException::class);
-
-		$token = new PublicKeyToken();
-		$token->setUid('uid');
-
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('generateToken')
-			->with(
-				'token',
-				'uid',
-				'loginName',
-				'password',
-				'name',
-				IToken::TEMPORARY_TOKEN,
-				IToken::REMEMBER
-			)->willThrowException($exception);
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('getToken')
-			->with('token')
-			->willReturn($token);
-
-		$actual = $this->manager->generateToken(
-			'token',
-			'uid',
-			'loginName',
-			'password',
-			'name',
-			IToken::TEMPORARY_TOKEN,
-			IToken::REMEMBER
-		);
-
-		$this->assertSame($token, $actual);
-	}
-
-	public function testGenerateTokenTooLongName(): void {
-		$token = $this->createMock(IToken::class);
-		$token->method('getName')
-			->willReturn(str_repeat('a', 120) . '…');
-
-
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('generateToken')
-			->with(
-				'token',
-				'uid',
-				'loginName',
-				'password',
-				str_repeat('a', 120) . '…',
-				IToken::TEMPORARY_TOKEN,
-				IToken::REMEMBER
-			)->willReturn($token);
-
-		$actual = $this->manager->generateToken(
-			'token',
-			'uid',
-			'loginName',
-			'password',
-			str_repeat('a', 200),
-			IToken::TEMPORARY_TOKEN,
-			IToken::REMEMBER
-		);
-
-		$this->assertSame(121, mb_strlen($actual->getName()));
-	}
-
-	public static function tokenData(): array {
-		return [
-			[new PublicKeyToken()],
-			[IToken::class],
-		];
-	}
-
-	protected function setNoCall(IToken $token) {
-		if (!($token instanceof PublicKeyToken)) {
-			$this->publicKeyTokenProvider->expects($this->never())
-				->method($this->anything());
-		}
-	}
-
-	protected function setCall(IToken $token, string $function, $return = null) {
-		if ($token instanceof PublicKeyToken) {
-			$this->publicKeyTokenProvider->expects($this->once())
-				->method($function)
-				->with($token)
-				->willReturn($return);
-		}
-	}
-
-	protected function setException(IToken $token) {
-		if (!($token instanceof PublicKeyToken)) {
-			$this->expectException(InvalidTokenException::class);
-		}
-	}
-
-	/**
-	 * @dataProvider tokenData
-	 */
-	public function testUpdateToken(IToken|string $token): void {
-		if (is_string($token)) {
-			$token = $this->createMock($token);
-		}
-
-		$this->setNoCall($token);
-		$this->setCall($token, 'updateToken');
-		$this->setException($token);
-
-		$this->manager->updateToken($token);
-	}
-
-	/**
-	 * @dataProvider tokenData
-	 */
-	public function testUpdateTokenActivity(IToken|string $token): void {
-		if (is_string($token)) {
-			$token = $this->createMock($token);
-		}
-
-		$this->setNoCall($token);
-		$this->setCall($token, 'updateTokenActivity');
-		$this->setException($token);
-
-		$this->manager->updateTokenActivity($token);
-	}
-
-	/**
-	 * @dataProvider tokenData
-	 */
-	public function testGetPassword(IToken|string $token): void {
-		if (is_string($token)) {
-			$token = $this->createMock($token);
-		}
-
-		$this->setNoCall($token);
-		$this->setCall($token, 'getPassword', 'password');
-		$this->setException($token);
-
-		$result = $this->manager->getPassword($token, 'tokenId', 'password');
-
-		$this->assertSame('password', $result);
-	}
-
-	/**
-	 * @dataProvider tokenData
-	 */
-	public function testSetPassword(IToken|string $token): void {
-		if (is_string($token)) {
-			$token = $this->createMock($token);
-		}
-
-		$this->setNoCall($token);
-		$this->setCall($token, 'setPassword');
-		$this->setException($token);
-
-		$this->manager->setPassword($token, 'tokenId', 'password');
-	}
-
-	public function testInvalidateTokens(): void {
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('invalidateToken')
-			->with('token');
-
-		$this->manager->invalidateToken('token');
-	}
-
-	public function testInvalidateTokenById(): void {
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('invalidateTokenById')
-			->with('uid', 42);
-
-		$this->manager->invalidateTokenById('uid', 42);
-	}
-
-	public function testInvalidateOldTokens(): void {
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('invalidateOldTokens');
-
-		$this->manager->invalidateOldTokens();
-	}
-
-	public function testInvalidateLastUsedBefore(): void {
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('invalidateLastUsedBefore')
-			->with('user', 946684800);
-
-		$this->manager->invalidateLastUsedBefore('user', 946684800);
-	}
-
-	public function testGetTokenByUser(): void {
-		$t1 = new PublicKeyToken();
-		$t2 = new PublicKeyToken();
-
-		$this->publicKeyTokenProvider
-			->method('getTokenByUser')
-			->willReturn([$t1, $t2]);
-
-		$result = $this->manager->getTokenByUser('uid');
-
-		$this->assertEquals([$t1, $t2], $result);
-	}
+    /** @var PublicKeyTokenProvider|MockObject */
+    private $publicKeyTokenProvider;
+    /** @var Manager */
+    private $manager;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->publicKeyTokenProvider = $this->createMock(PublicKeyTokenProvider::class);
+        $this->manager = new Manager(
+            $this->publicKeyTokenProvider
+        );
+    }
+
+    public function testGenerateToken(): void {
+        $token = new PublicKeyToken();
+
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('generateToken')
+            ->with(
+                'token',
+                'uid',
+                'loginName',
+                'password',
+                'name',
+                IToken::TEMPORARY_TOKEN,
+                IToken::REMEMBER
+            )->willReturn($token);
+
+        $actual = $this->manager->generateToken(
+            'token',
+            'uid',
+            'loginName',
+            'password',
+            'name',
+            IToken::TEMPORARY_TOKEN,
+            IToken::REMEMBER
+        );
+
+        $this->assertSame($token, $actual);
+    }
+
+    public function testGenerateConflictingToken(): void {
+        /** @var MockObject|UniqueConstraintViolationException $exception */
+        $exception = $this->createMock(UniqueConstraintViolationException::class);
+
+        $token = new PublicKeyToken();
+        $token->setUid('uid');
+
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('generateToken')
+            ->with(
+                'token',
+                'uid',
+                'loginName',
+                'password',
+                'name',
+                IToken::TEMPORARY_TOKEN,
+                IToken::REMEMBER
+            )->willThrowException($exception);
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('getToken')
+            ->with('token')
+            ->willReturn($token);
+
+        $actual = $this->manager->generateToken(
+            'token',
+            'uid',
+            'loginName',
+            'password',
+            'name',
+            IToken::TEMPORARY_TOKEN,
+            IToken::REMEMBER
+        );
+
+        $this->assertSame($token, $actual);
+    }
+
+    public function testGenerateTokenTooLongName(): void {
+        $token = $this->createMock(IToken::class);
+        $token->method('getName')
+            ->willReturn(str_repeat('a', 120) . '…');
+
+
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('generateToken')
+            ->with(
+                'token',
+                'uid',
+                'loginName',
+                'password',
+                str_repeat('a', 120) . '…',
+                IToken::TEMPORARY_TOKEN,
+                IToken::REMEMBER
+            )->willReturn($token);
+
+        $actual = $this->manager->generateToken(
+            'token',
+            'uid',
+            'loginName',
+            'password',
+            str_repeat('a', 200),
+            IToken::TEMPORARY_TOKEN,
+            IToken::REMEMBER
+        );
+
+        $this->assertSame(121, mb_strlen($actual->getName()));
+    }
+
+    public static function tokenData(): array {
+        return [
+            [new PublicKeyToken()],
+            [IToken::class],
+        ];
+    }
+
+    protected function setNoCall(IToken $token) {
+        if (!($token instanceof PublicKeyToken)) {
+            $this->publicKeyTokenProvider->expects($this->never())
+                ->method($this->anything());
+        }
+    }
+
+    protected function setCall(IToken $token, string $function, $return = null) {
+        if ($token instanceof PublicKeyToken) {
+            $this->publicKeyTokenProvider->expects($this->once())
+                ->method($function)
+                ->with($token)
+                ->willReturn($return);
+        }
+    }
+
+    protected function setException(IToken $token) {
+        if (!($token instanceof PublicKeyToken)) {
+            $this->expectException(InvalidTokenException::class);
+        }
+    }
+
+    /**
+     * @dataProvider tokenData
+     */
+    public function testUpdateToken(IToken|string $token): void {
+        if (is_string($token)) {
+            $token = $this->createMock($token);
+        }
+
+        $this->setNoCall($token);
+        $this->setCall($token, 'updateToken');
+        $this->setException($token);
+
+        $this->manager->updateToken($token);
+    }
+
+    /**
+     * @dataProvider tokenData
+     */
+    public function testUpdateTokenActivity(IToken|string $token): void {
+        if (is_string($token)) {
+            $token = $this->createMock($token);
+        }
+
+        $this->setNoCall($token);
+        $this->setCall($token, 'updateTokenActivity');
+        $this->setException($token);
+
+        $this->manager->updateTokenActivity($token);
+    }
+
+    /**
+     * @dataProvider tokenData
+     */
+    public function testGetPassword(IToken|string $token): void {
+        if (is_string($token)) {
+            $token = $this->createMock($token);
+        }
+
+        $this->setNoCall($token);
+        $this->setCall($token, 'getPassword', 'password');
+        $this->setException($token);
+
+        $result = $this->manager->getPassword($token, 'tokenId', 'password');
+
+        $this->assertSame('password', $result);
+    }
+
+    /**
+     * @dataProvider tokenData
+     */
+    public function testSetPassword(IToken|string $token): void {
+        if (is_string($token)) {
+            $token = $this->createMock($token);
+        }
+
+        $this->setNoCall($token);
+        $this->setCall($token, 'setPassword');
+        $this->setException($token);
+
+        $this->manager->setPassword($token, 'tokenId', 'password');
+    }
+
+    public function testInvalidateTokens(): void {
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('invalidateToken')
+            ->with('token');
+
+        $this->manager->invalidateToken('token');
+    }
+
+    public function testInvalidateTokenById(): void {
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('invalidateTokenById')
+            ->with('uid', 42);
+
+        $this->manager->invalidateTokenById('uid', 42);
+    }
+
+    public function testInvalidateOldTokens(): void {
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('invalidateOldTokens');
+
+        $this->manager->invalidateOldTokens();
+    }
+
+    public function testInvalidateLastUsedBefore(): void {
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('invalidateLastUsedBefore')
+            ->with('user', 946684800);
+
+        $this->manager->invalidateLastUsedBefore('user', 946684800);
+    }
+
+    public function testGetTokenByUser(): void {
+        $t1 = new PublicKeyToken();
+        $t2 = new PublicKeyToken();
+
+        $this->publicKeyTokenProvider
+            ->method('getTokenByUser')
+            ->willReturn([$t1, $t2]);
+
+        $result = $this->manager->getTokenByUser('uid');
+
+        $this->assertEquals([$t1, $t2], $result);
+    }
 
-	public function testRenewSessionTokenPublicKey(): void {
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('renewSessionToken')
-			->with('oldId', 'newId');
-
-		$this->manager->renewSessionToken('oldId', 'newId');
-	}
-
-	public function testRenewSessionInvalid(): void {
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('renewSessionToken')
-			->with('oldId', 'newId')
-			->willThrowException(new InvalidTokenException());
-
-		$this->expectException(InvalidTokenException::class);
-		$this->manager->renewSessionToken('oldId', 'newId');
-	}
-
-	public function testGetTokenByIdPublicKey(): void {
-		$token = $this->createMock(IToken::class);
-
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('getTokenById')
-			->with(42)
-			->willReturn($token);
-
-		$this->assertSame($token, $this->manager->getTokenById(42));
-	}
-
-	public function testGetTokenByIdInvalid(): void {
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('getTokenById')
-			->with(42)
-			->willThrowException(new InvalidTokenException());
-
-		$this->expectException(InvalidTokenException::class);
-		$this->manager->getTokenById(42);
-	}
-
-	public function testGetTokenPublicKey(): void {
-		$token = new PublicKeyToken();
-
-		$this->publicKeyTokenProvider
-			->method('getToken')
-			->with('tokenId')
-			->willReturn($token);
-
-		$this->assertSame($token, $this->manager->getToken('tokenId'));
-	}
-
-	public function testGetTokenInvalid(): void {
-		$this->publicKeyTokenProvider
-			->method('getToken')
-			->with('tokenId')
-			->willThrowException(new InvalidTokenException());
-
-		$this->expectException(InvalidTokenException::class);
-		$this->manager->getToken('tokenId');
-	}
-
-	public function testRotateInvalid(): void {
-		$this->expectException(InvalidTokenException::class);
-		$this->manager->rotate($this->createMock(IToken::class), 'oldId', 'newId');
-	}
-
-	public function testRotatePublicKey(): void {
-		$token = new PublicKeyToken();
-
-		$this->publicKeyTokenProvider
-			->method('rotate')
-			->with($token, 'oldId', 'newId')
-			->willReturn($token);
-
-		$this->assertSame($token, $this->manager->rotate($token, 'oldId', 'newId'));
-	}
-
-	public function testMarkPasswordInvalidPublicKey(): void {
-		$token = $this->createMock(PublicKeyToken::class);
-
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('markPasswordInvalid')
-			->with($token, 'tokenId');
-
-		$this->manager->markPasswordInvalid($token, 'tokenId');
-	}
-
-	public function testMarkPasswordInvalidInvalidToken(): void {
-		$this->expectException(InvalidTokenException::class);
-
-		$this->manager->markPasswordInvalid($this->createMock(IToken::class), 'tokenId');
-	}
-
-	public function testUpdatePasswords(): void {
-		$this->publicKeyTokenProvider->expects($this->once())
-			->method('updatePasswords')
-			->with('uid', 'pass');
-
-		$this->manager->updatePasswords('uid', 'pass');
-	}
-
-	public function testInvalidateTokensOfUserNoClientName(): void {
-		$t1 = new PublicKeyToken();
-		$t2 = new PublicKeyToken();
-		$t1->setId(123);
-		$t2->setId(456);
-
-		$this->publicKeyTokenProvider
-			->expects($this->once())
-			->method('getTokenByUser')
-			->with('theUser')
-			->willReturn([$t1, $t2]);
-
-		$calls = [
-			['theUser', 123],
-			['theUser', 456],
-		];
-		$this->publicKeyTokenProvider
-			->expects($this->exactly(2))
-			->method('invalidateTokenById')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-		$this->manager->invalidateTokensOfUser('theUser', null);
-	}
-
-	public function testInvalidateTokensOfUserClientNameGiven(): void {
-		$t1 = new PublicKeyToken();
-		$t2 = new PublicKeyToken();
-		$t3 = new PublicKeyToken();
-		$t1->setId(123);
-		$t1->setName('Firefox session');
-		$t2->setId(456);
-		$t2->setName('My Client Name');
-		$t3->setId(789);
-		$t3->setName('mobile client');
-
-		$this->publicKeyTokenProvider
-			->expects($this->once())
-			->method('getTokenByUser')
-			->with('theUser')
-			->willReturn([$t1, $t2, $t3]);
-		$this->publicKeyTokenProvider
-			->expects($this->once())
-			->method('invalidateTokenById')
-			->with('theUser', 456);
-		$this->manager->invalidateTokensOfUser('theUser', 'My Client Name');
-	}
+    public function testRenewSessionTokenPublicKey(): void {
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('renewSessionToken')
+            ->with('oldId', 'newId');
+
+        $this->manager->renewSessionToken('oldId', 'newId');
+    }
+
+    public function testRenewSessionInvalid(): void {
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('renewSessionToken')
+            ->with('oldId', 'newId')
+            ->willThrowException(new InvalidTokenException());
+
+        $this->expectException(InvalidTokenException::class);
+        $this->manager->renewSessionToken('oldId', 'newId');
+    }
+
+    public function testGetTokenByIdPublicKey(): void {
+        $token = $this->createMock(IToken::class);
+
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('getTokenById')
+            ->with(42)
+            ->willReturn($token);
+
+        $this->assertSame($token, $this->manager->getTokenById(42));
+    }
+
+    public function testGetTokenByIdInvalid(): void {
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('getTokenById')
+            ->with(42)
+            ->willThrowException(new InvalidTokenException());
+
+        $this->expectException(InvalidTokenException::class);
+        $this->manager->getTokenById(42);
+    }
+
+    public function testGetTokenPublicKey(): void {
+        $token = new PublicKeyToken();
+
+        $this->publicKeyTokenProvider
+            ->method('getToken')
+            ->with('tokenId')
+            ->willReturn($token);
+
+        $this->assertSame($token, $this->manager->getToken('tokenId'));
+    }
+
+    public function testGetTokenInvalid(): void {
+        $this->publicKeyTokenProvider
+            ->method('getToken')
+            ->with('tokenId')
+            ->willThrowException(new InvalidTokenException());
+
+        $this->expectException(InvalidTokenException::class);
+        $this->manager->getToken('tokenId');
+    }
+
+    public function testRotateInvalid(): void {
+        $this->expectException(InvalidTokenException::class);
+        $this->manager->rotate($this->createMock(IToken::class), 'oldId', 'newId');
+    }
+
+    public function testRotatePublicKey(): void {
+        $token = new PublicKeyToken();
+
+        $this->publicKeyTokenProvider
+            ->method('rotate')
+            ->with($token, 'oldId', 'newId')
+            ->willReturn($token);
+
+        $this->assertSame($token, $this->manager->rotate($token, 'oldId', 'newId'));
+    }
+
+    public function testMarkPasswordInvalidPublicKey(): void {
+        $token = $this->createMock(PublicKeyToken::class);
+
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('markPasswordInvalid')
+            ->with($token, 'tokenId');
+
+        $this->manager->markPasswordInvalid($token, 'tokenId');
+    }
+
+    public function testMarkPasswordInvalidInvalidToken(): void {
+        $this->expectException(InvalidTokenException::class);
+
+        $this->manager->markPasswordInvalid($this->createMock(IToken::class), 'tokenId');
+    }
+
+    public function testUpdatePasswords(): void {
+        $this->publicKeyTokenProvider->expects($this->once())
+            ->method('updatePasswords')
+            ->with('uid', 'pass');
+
+        $this->manager->updatePasswords('uid', 'pass');
+    }
+
+    public function testInvalidateTokensOfUserNoClientName(): void {
+        $t1 = new PublicKeyToken();
+        $t2 = new PublicKeyToken();
+        $t1->setId(123);
+        $t2->setId(456);
+
+        $this->publicKeyTokenProvider
+            ->expects($this->once())
+            ->method('getTokenByUser')
+            ->with('theUser')
+            ->willReturn([$t1, $t2]);
+
+        $calls = [
+            ['theUser', 123],
+            ['theUser', 456],
+        ];
+        $this->publicKeyTokenProvider
+            ->expects($this->exactly(2))
+            ->method('invalidateTokenById')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+        $this->manager->invalidateTokensOfUser('theUser', null);
+    }
+
+    public function testInvalidateTokensOfUserClientNameGiven(): void {
+        $t1 = new PublicKeyToken();
+        $t2 = new PublicKeyToken();
+        $t3 = new PublicKeyToken();
+        $t1->setId(123);
+        $t1->setName('Firefox session');
+        $t2->setId(456);
+        $t2->setName('My Client Name');
+        $t3->setId(789);
+        $t3->setName('mobile client');
+
+        $this->publicKeyTokenProvider
+            ->expects($this->once())
+            ->method('getTokenByUser')
+            ->with('theUser')
+            ->willReturn([$t1, $t2, $t3]);
+        $this->publicKeyTokenProvider
+            ->expects($this->once())
+            ->method('invalidateTokenById')
+            ->with('theUser', 456);
+        $this->manager->invalidateTokensOfUser('theUser', 'My Client Name');
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -100,7 +100,7 @@ 
 	public function testGenerateTokenTooLongName(): void {
 		$token = $this->createMock(IToken::class);
 		$token->method('getName')
-			->willReturn(str_repeat('a', 120) . '…');
+			->willReturn(str_repeat('a', 120).'…');
 
 
 		$this->publicKeyTokenProvider->expects($this->once())
@@ -110,7 +110,7 @@ 
 				'uid',
 				'loginName',
 				'password',
-				str_repeat('a', 120) . '…',
+				str_repeat('a', 120).'…',
 				IToken::TEMPORARY_TOKEN,
 				IToken::REMEMBER
 			)->willReturn($token);
@@ -160,7 +160,7 @@ 
 	/**
 	 * @dataProvider tokenData
 	 */
-	public function testUpdateToken(IToken|string $token): void {
+	public function testUpdateToken(IToken | string $token): void {
 		if (is_string($token)) {
 			$token = $this->createMock($token);
 		}
@@ -175,7 +175,7 @@ 
 	/**
 	 * @dataProvider tokenData
 	 */
-	public function testUpdateTokenActivity(IToken|string $token): void {
+	public function testUpdateTokenActivity(IToken | string $token): void {
 		if (is_string($token)) {
 			$token = $this->createMock($token);
 		}
@@ -190,7 +190,7 @@ 
 	/**
 	 * @dataProvider tokenData
 	 */
-	public function testGetPassword(IToken|string $token): void {
+	public function testGetPassword(IToken | string $token): void {
 		if (is_string($token)) {
 			$token = $this->createMock($token);
 		}
@@ -207,7 +207,7 @@ 
 	/**
 	 * @dataProvider tokenData
 	 */
-	public function testSetPassword(IToken|string $token): void {
+	public function testSetPassword(IToken | string $token): void {
 		if (is_string($token)) {
 			$token = $this->createMock($token);
 		}
@@ -382,7 +382,7 @@ 
 		$this->publicKeyTokenProvider
 			->expects($this->exactly(2))
 			->method('invalidateTokenById')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 			});

tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php

Indentation +613 added lines, -613 removed lines

@@ -28,617 +28,617 @@
 use Test\TestCase;
 
 class PublicKeyTokenProviderTest extends TestCase {
-	/** @var PublicKeyTokenProvider|\PHPUnit\Framework\MockObject\MockObject */
-	private $tokenProvider;
-	/** @var PublicKeyTokenMapper|\PHPUnit\Framework\MockObject\MockObject */
-	private $mapper;
-	/** @var IHasher|\PHPUnit\Framework\MockObject\MockObject */
-	private $hasher;
-	/** @var ICrypto */
-	private $crypto;
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	private $config;
-	/** @var IDBConnection|MockObject */
-	private IDBConnection $db;
-	/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $logger;
-	/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
-	private $timeFactory;
-	/** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */
-	private $cacheFactory;
-	/** @var int */
-	private $time;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->mapper = $this->createMock(PublicKeyTokenMapper::class);
-		$this->hasher = \OC::$server->get(IHasher::class);
-		$this->crypto = \OC::$server->getCrypto();
-		$this->config = $this->createMock(IConfig::class);
-		$this->config->method('getSystemValue')
-			->willReturnMap([
-				['openssl', [], []],
-			]);
-		$this->config->method('getSystemValueString')
-			->willReturnMap([
-				['secret', '', '1f4h9s'],
-			]);
-		$this->db = $this->createMock(IDBConnection::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->time = 1313131;
-		$this->timeFactory->method('getTime')
-			->willReturn($this->time);
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-
-		$this->tokenProvider = new PublicKeyTokenProvider(
-			$this->mapper,
-			$this->crypto,
-			$this->config,
-			$this->db,
-			$this->logger,
-			$this->timeFactory,
-			$this->hasher,
-			$this->cacheFactory,
-		);
-	}
-
-	public function testGenerateToken(): void {
-		$token = 'tokentokentokentokentoken';
-		$uid = 'user';
-		$user = 'User';
-		$password = 'passme';
-		$name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
-		$type = IToken::PERMANENT_TOKEN;
-
-		$this->config->method('getSystemValueBool')
-			->willReturnMap([
-				['auth.storeCryptedPassword', true, true],
-			]);
-		$actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
-
-		$this->assertInstanceOf(PublicKeyToken::class, $actual);
-		$this->assertSame($uid, $actual->getUID());
-		$this->assertSame($user, $actual->getLoginName());
-		$this->assertSame($name, $actual->getName());
-		$this->assertSame(IToken::DO_NOT_REMEMBER, $actual->getRemember());
-		$this->assertSame($password, $this->tokenProvider->getPassword($actual, $token));
-	}
-
-	public function testGenerateTokenNoPassword(): void {
-		$token = 'tokentokentokentokentoken';
-		$uid = 'user';
-		$user = 'User';
-		$password = 'passme';
-		$name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
-		$type = IToken::PERMANENT_TOKEN;
-		$this->config->method('getSystemValueBool')
-			->willReturnMap([
-				['auth.storeCryptedPassword', true, false],
-			]);
-		$this->expectException(PasswordlessTokenException::class);
-
-		$actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
-
-		$this->assertInstanceOf(PublicKeyToken::class, $actual);
-		$this->assertSame($uid, $actual->getUID());
-		$this->assertSame($user, $actual->getLoginName());
-		$this->assertSame($name, $actual->getName());
-		$this->assertSame(IToken::DO_NOT_REMEMBER, $actual->getRemember());
-		$this->tokenProvider->getPassword($actual, $token);
-	}
-
-	public function testGenerateTokenLongPassword(): void {
-		$token = 'tokentokentokentokentoken';
-		$uid = 'user';
-		$user = 'User';
-		$password = '';
-		for ($i = 0; $i < 500; $i++) {
-			$password .= 'e';
-		}
-		$name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
-		$type = IToken::PERMANENT_TOKEN;
-		$this->config->method('getSystemValueBool')
-			->willReturnMap([
-				['auth.storeCryptedPassword', true, true],
-			]);
-		$this->expectException(\RuntimeException::class);
-
-		$actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
-	}
-
-	public function testGenerateTokenInvalidName(): void {
-		$token = 'tokentokentokentokentoken';
-		$uid = 'user';
-		$user = 'User';
-		$password = 'passme';
-		$name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12'
-			. 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12'
-			. 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12'
-			. 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
-		$type = IToken::PERMANENT_TOKEN;
-		$this->config->method('getSystemValueBool')
-			->willReturnMap([
-				['auth.storeCryptedPassword', true, true],
-			]);
-
-		$actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
-
-		$this->assertInstanceOf(PublicKeyToken::class, $actual);
-		$this->assertSame($uid, $actual->getUID());
-		$this->assertSame($user, $actual->getLoginName());
-		$this->assertSame('User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12User-Agent: Mozill…', $actual->getName());
-		$this->assertSame(IToken::DO_NOT_REMEMBER, $actual->getRemember());
-		$this->assertSame($password, $this->tokenProvider->getPassword($actual, $token));
-	}
-
-	public function testUpdateToken(): void {
-		$tk = new PublicKeyToken();
-		$this->mapper->expects($this->once())
-			->method('updateActivity')
-			->with($tk, $this->time);
-		$tk->setLastActivity($this->time - 200);
-		$this->config->method('getSystemValueBool')
-			->willReturnMap([
-				['auth.storeCryptedPassword', true, true],
-			]);
-
-		$this->tokenProvider->updateTokenActivity($tk);
-
-		$this->assertEquals($this->time, $tk->getLastActivity());
-	}
-
-	public function testUpdateTokenDebounce(): void {
-		$tk = new PublicKeyToken();
-		$this->config->method('getSystemValueInt')
-			->willReturnCallback(function ($value, $default) {
-				return $default;
-			});
-		$tk->setLastActivity($this->time - 30);
-
-		$this->mapper->expects($this->never())
-			->method('updateActivity')
-			->with($tk, $this->time);
-
-		$this->tokenProvider->updateTokenActivity($tk);
-	}
-
-	public function testGetTokenByUser(): void {
-		$this->mapper->expects($this->once())
-			->method('getTokenByUser')
-			->with('uid')
-			->willReturn(['token']);
-
-		$this->assertEquals(['token'], $this->tokenProvider->getTokenByUser('uid'));
-	}
-
-	public function testGetPassword(): void {
-		$token = 'tokentokentokentokentoken';
-		$uid = 'user';
-		$user = 'User';
-		$password = 'passme';
-		$name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
-		$type = IToken::PERMANENT_TOKEN;
-		$this->config->method('getSystemValueBool')
-			->willReturnMap([
-				['auth.storeCryptedPassword', true, true],
-			]);
-
-		$actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
-
-		$this->assertSame($password, $this->tokenProvider->getPassword($actual, $token));
-	}
-
-
-	public function testGetPasswordPasswordLessToken(): void {
-		$this->expectException(\OC\Authentication\Exceptions\PasswordlessTokenException::class);
-
-		$token = 'token1234';
-		$tk = new PublicKeyToken();
-		$tk->setPassword(null);
-
-		$this->tokenProvider->getPassword($tk, $token);
-	}
-
-
-	public function testGetPasswordInvalidToken(): void {
-		$this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class);
-
-		$token = 'tokentokentokentokentoken';
-		$uid = 'user';
-		$user = 'User';
-		$password = 'passme';
-		$name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
-		$type = IToken::PERMANENT_TOKEN;
-
-		$this->config->method('getSystemValueBool')
-			->willReturnMap([
-				['auth.storeCryptedPassword', true, true],
-			]);
-		$actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
-
-		$this->tokenProvider->getPassword($actual, 'wrongtoken');
-	}
-
-	public function testSetPassword(): void {
-		$token = 'tokentokentokentokentoken';
-		$uid = 'user';
-		$user = 'User';
-		$password = 'passme';
-		$name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
-		$type = IToken::PERMANENT_TOKEN;
-		$this->config->method('getSystemValueBool')
-			->willReturnMap([
-				['auth.storeCryptedPassword', true, true],
-			]);
-
-		$actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
-
-		$this->mapper->method('getTokenByUser')
-			->with('user')
-			->willReturn([$actual]);
-
-		$newpass = 'newpass';
-		$this->mapper->expects($this->once())
-			->method('update')
-			->with($this->callback(function ($token) use ($newpass) {
-				return $newpass === $this->tokenProvider->getPassword($token, 'tokentokentokentokentoken');
-			}));
-
-
-		$this->tokenProvider->setPassword($actual, $token, $newpass);
-
-		$this->assertSame($newpass, $this->tokenProvider->getPassword($actual, 'tokentokentokentokentoken'));
-	}
-
-
-	public function testSetPasswordInvalidToken(): void {
-		$this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class);
-
-		$token = $this->createMock(IToken::class);
-		$tokenId = 'token123';
-		$password = '123456';
-
-		$this->tokenProvider->setPassword($token, $tokenId, $password);
-	}
-
-	public function testInvalidateToken(): void {
-		$calls = [
-			[hash('sha512', 'token7' . '1f4h9s')],
-			[hash('sha512', 'token7')]
-		];
-
-		$this->mapper->expects($this->exactly(2))
-			->method('invalidate')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		$this->tokenProvider->invalidateToken('token7');
-	}
-
-	public function testInvalidateTokenById(): void {
-		$id = 123;
-
-		$this->mapper->expects($this->once())
-			->method('getTokenById')
-			->with($id);
-
-		$this->tokenProvider->invalidateTokenById('uid', $id);
-	}
-
-	public function testInvalidateOldTokens(): void {
-		$defaultSessionLifetime = 60 * 60 * 24;
-		$defaultRememberMeLifetime = 60 * 60 * 24 * 15;
-		$wipeTokenLifetime = 60 * 60 * 24 * 60;
-		$this->config->expects($this->exactly(4))
-			->method('getSystemValueInt')
-			->willReturnMap([
-				['session_lifetime', $defaultSessionLifetime, 150],
-				['remember_login_cookie_lifetime', $defaultRememberMeLifetime, 300],
-				['token_auth_wipe_token_retention', $wipeTokenLifetime, 500],
-				['token_auth_token_retention', 60 * 60 * 24 * 365, 800],
-			]);
-
-		$calls = [
-			[$this->time - 150, IToken::TEMPORARY_TOKEN, IToken::DO_NOT_REMEMBER],
-			[$this->time - 300, IToken::TEMPORARY_TOKEN, IToken::REMEMBER],
-			[$this->time - 500, IToken::WIPE_TOKEN, null],
-			[$this->time - 800, IToken::PERMANENT_TOKEN, null],
-		];
-		$this->mapper->expects($this->exactly(4))
-			->method('invalidateOld')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		$this->tokenProvider->invalidateOldTokens();
-	}
-
-	public function testInvalidateLastUsedBefore(): void {
-		$this->mapper->expects($this->once())
-			->method('invalidateLastUsedBefore')
-			->with('user', 946684800);
-
-		$this->tokenProvider->invalidateLastUsedBefore('user', 946684800);
-	}
-
-	public function testRenewSessionTokenWithoutPassword(): void {
-		$token = 'oldIdtokentokentokentoken';
-		$uid = 'user';
-		$user = 'User';
-		$password = null;
-		$name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
-		$type = IToken::PERMANENT_TOKEN;
-
-		$oldToken = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
-
-		$this->mapper
-			->expects($this->once())
-			->method('getToken')
-			->with(hash('sha512', 'oldIdtokentokentokentoken' . '1f4h9s'))
-			->willReturn($oldToken);
-		$this->mapper
-			->expects($this->once())
-			->method('insert')
-			->with($this->callback(function (PublicKeyToken $token) use ($user, $uid, $name) {
-				return $token->getUID() === $uid &&
-					$token->getLoginName() === $user &&
-					$token->getName() === $name &&
-					$token->getType() === IToken::DO_NOT_REMEMBER &&
-					$token->getLastActivity() === $this->time &&
-					$token->getPassword() === null;
-			}));
-		$this->mapper
-			->expects($this->once())
-			->method('delete')
-			->with($this->callback(function ($token) use ($oldToken) {
-				return $token === $oldToken;
-			}));
-
-		$this->tokenProvider->renewSessionToken('oldIdtokentokentokentoken', 'newIdtokentokentokentoken');
-	}
-
-	public function testRenewSessionTokenWithPassword(): void {
-		$token = 'oldIdtokentokentokentoken';
-		$uid = 'user';
-		$user = 'User';
-		$password = 'password';
-		$name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
-		$type = IToken::PERMANENT_TOKEN;
-
-		$this->config->method('getSystemValueBool')
-			->willReturnMap([
-				['auth.storeCryptedPassword', true, true],
-			]);
-		$oldToken = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
-
-		$this->mapper
-			->expects($this->once())
-			->method('getToken')
-			->with(hash('sha512', 'oldIdtokentokentokentoken' . '1f4h9s'))
-			->willReturn($oldToken);
-		$this->mapper
-			->expects($this->once())
-			->method('insert')
-			->with($this->callback(function (PublicKeyToken $token) use ($user, $uid, $name): bool {
-				return $token->getUID() === $uid &&
-					$token->getLoginName() === $user &&
-					$token->getName() === $name &&
-					$token->getType() === IToken::DO_NOT_REMEMBER &&
-					$token->getLastActivity() === $this->time &&
-					$token->getPassword() !== null &&
-					$this->tokenProvider->getPassword($token, 'newIdtokentokentokentoken') === 'password';
-			}));
-		$this->mapper
-			->expects($this->once())
-			->method('delete')
-			->with($this->callback(function ($token) use ($oldToken): bool {
-				return $token === $oldToken;
-			}));
-
-		$this->tokenProvider->renewSessionToken('oldIdtokentokentokentoken', 'newIdtokentokentokentoken');
-	}
-
-	public function testGetToken(): void {
-		$token = new PublicKeyToken();
-
-		$this->config->method('getSystemValue')
-			->with('secret')
-			->willReturn('mysecret');
-
-		$this->mapper->method('getToken')
-			->with(
-				$this->callback(function (string $token) {
-					return hash('sha512', 'unhashedTokentokentokentokentoken' . '1f4h9s') === $token;
-				})
-			)->willReturn($token);
-
-		$this->assertSame($token, $this->tokenProvider->getToken('unhashedTokentokentokentokentoken'));
-	}
-
-	public function testGetInvalidToken(): void {
-		$this->expectException(InvalidTokenException::class);
-
-		$calls = [
-			'unhashedTokentokentokentokentoken' . '1f4h9s',
-			'unhashedTokentokentokentokentoken',
-		];
-		$this->mapper->expects($this->exactly(2))
-			->method('getToken')
-			->willReturnCallback(function (string $token) use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals(hash('sha512', $expected), $token);
-				throw new DoesNotExistException('nope');
-			});
-
-		$this->tokenProvider->getToken('unhashedTokentokentokentokentoken');
-	}
-
-	public function testGetExpiredToken(): void {
-		$token = 'tokentokentokentokentoken';
-		$uid = 'user';
-		$user = 'User';
-		$password = 'passme';
-		$name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
-		$type = IToken::PERMANENT_TOKEN;
-
-		$actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
-		$actual->setExpires(42);
-
-		$this->mapper->method('getToken')
-			->with(
-				$this->callback(function (string $token) {
-					return hash('sha512', 'tokentokentokentokentoken' . '1f4h9s') === $token;
-				})
-			)->willReturn($actual);
-
-		try {
-			$this->tokenProvider->getToken('tokentokentokentokentoken');
-			$this->fail();
-		} catch (ExpiredTokenException $e) {
-			$this->assertSame($actual, $e->getToken());
-		}
-	}
-
-	public function testGetTokenById(): void {
-		$token = $this->createMock(PublicKeyToken::class);
-
-		$this->mapper->expects($this->once())
-			->method('getTokenById')
-			->with($this->equalTo(42))
-			->willReturn($token);
-
-		$this->assertSame($token, $this->tokenProvider->getTokenById(42));
-	}
-
-	public function testGetInvalidTokenById(): void {
-		$this->expectException(InvalidTokenException::class);
-
-		$this->mapper->expects($this->once())
-			->method('getTokenById')
-			->with($this->equalTo(42))
-			->willThrowException(new DoesNotExistException('nope'));
-
-		$this->tokenProvider->getTokenById(42);
-	}
-
-	public function testGetExpiredTokenById(): void {
-		$token = new PublicKeyToken();
-		$token->setExpires(42);
-
-		$this->mapper->expects($this->once())
-			->method('getTokenById')
-			->with($this->equalTo(42))
-			->willReturn($token);
-
-		try {
-			$this->tokenProvider->getTokenById(42);
-			$this->fail();
-		} catch (ExpiredTokenException $e) {
-			$this->assertSame($token, $e->getToken());
-		}
-	}
-
-	public function testRotate(): void {
-		$token = 'oldtokentokentokentokentoken';
-		$uid = 'user';
-		$user = 'User';
-		$password = 'password';
-		$name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
-		$type = IToken::PERMANENT_TOKEN;
-
-		$this->config->method('getSystemValueBool')
-			->willReturnMap([
-				['auth.storeCryptedPassword', true, true],
-			]);
-		$actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
-
-		$new = $this->tokenProvider->rotate($actual, 'oldtokentokentokentokentoken', 'newtokentokentokentokentoken');
-
-		$this->assertSame('password', $this->tokenProvider->getPassword($new, 'newtokentokentokentokentoken'));
-	}
-
-	public function testRotateNoPassword(): void {
-		$token = 'oldtokentokentokentokentoken';
-		$uid = 'user';
-		$user = 'User';
-		$password = null;
-		$name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
-		$type = IToken::PERMANENT_TOKEN;
-
-		$actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
-
-		$oldPrivate = $actual->getPrivateKey();
-
-		$new = $this->tokenProvider->rotate($actual, 'oldtokentokentokentokentoken', 'newtokentokentokentokentoken');
-
-		$newPrivate = $new->getPrivateKey();
-
-		$this->assertNotSame($newPrivate, $oldPrivate);
-		$this->assertNull($new->getPassword());
-	}
-
-	public function testMarkPasswordInvalidInvalidToken(): void {
-		$token = $this->createMock(IToken::class);
-
-		$this->expectException(InvalidTokenException::class);
-
-		$this->tokenProvider->markPasswordInvalid($token, 'tokenId');
-	}
-
-	public function testMarkPasswordInvalid(): void {
-		$token = $this->createMock(PublicKeyToken::class);
-
-		$token->expects($this->once())
-			->method('setPasswordInvalid')
-			->with(true);
-		$this->mapper->expects($this->once())
-			->method('update')
-			->with($token);
-
-		$this->tokenProvider->markPasswordInvalid($token, 'tokenId');
-	}
-
-	public function testUpdatePasswords(): void {
-		$uid = 'myUID';
-		$token1 = $this->tokenProvider->generateToken(
-			'foobetokentokentokentoken',
-			$uid,
-			$uid,
-			'bar',
-			'random1',
-			IToken::PERMANENT_TOKEN,
-			IToken::REMEMBER);
-		$token2 = $this->tokenProvider->generateToken(
-			'foobartokentokentokentoken',
-			$uid,
-			$uid,
-			'bar',
-			'random2',
-			IToken::PERMANENT_TOKEN,
-			IToken::REMEMBER);
-		$this->config->method('getSystemValueBool')
-			->willReturnMap([
-				['auth.storeCryptedPassword', true, true],
-			]);
-
-		$this->mapper->method('hasExpiredTokens')
-			->with($uid)
-			->willReturn(true);
-		$this->mapper->expects($this->once())
-			->method('getTokenByUser')
-			->with($uid)
-			->willReturn([$token1, $token2]);
-		$this->mapper->expects($this->exactly(2))
-			->method('update')
-			->with($this->callback(function (PublicKeyToken $t) use ($token1, $token2) {
-				return $t === $token1 || $t === $token2;
-			}));
-
-		$this->tokenProvider->updatePasswords($uid, 'bar2');
-	}
+    /** @var PublicKeyTokenProvider|\PHPUnit\Framework\MockObject\MockObject */
+    private $tokenProvider;
+    /** @var PublicKeyTokenMapper|\PHPUnit\Framework\MockObject\MockObject */
+    private $mapper;
+    /** @var IHasher|\PHPUnit\Framework\MockObject\MockObject */
+    private $hasher;
+    /** @var ICrypto */
+    private $crypto;
+    /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
+    private $config;
+    /** @var IDBConnection|MockObject */
+    private IDBConnection $db;
+    /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
+    private $logger;
+    /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
+    private $timeFactory;
+    /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */
+    private $cacheFactory;
+    /** @var int */
+    private $time;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->mapper = $this->createMock(PublicKeyTokenMapper::class);
+        $this->hasher = \OC::$server->get(IHasher::class);
+        $this->crypto = \OC::$server->getCrypto();
+        $this->config = $this->createMock(IConfig::class);
+        $this->config->method('getSystemValue')
+            ->willReturnMap([
+                ['openssl', [], []],
+            ]);
+        $this->config->method('getSystemValueString')
+            ->willReturnMap([
+                ['secret', '', '1f4h9s'],
+            ]);
+        $this->db = $this->createMock(IDBConnection::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->time = 1313131;
+        $this->timeFactory->method('getTime')
+            ->willReturn($this->time);
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+
+        $this->tokenProvider = new PublicKeyTokenProvider(
+            $this->mapper,
+            $this->crypto,
+            $this->config,
+            $this->db,
+            $this->logger,
+            $this->timeFactory,
+            $this->hasher,
+            $this->cacheFactory,
+        );
+    }
+
+    public function testGenerateToken(): void {
+        $token = 'tokentokentokentokentoken';
+        $uid = 'user';
+        $user = 'User';
+        $password = 'passme';
+        $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
+        $type = IToken::PERMANENT_TOKEN;
+
+        $this->config->method('getSystemValueBool')
+            ->willReturnMap([
+                ['auth.storeCryptedPassword', true, true],
+            ]);
+        $actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
+
+        $this->assertInstanceOf(PublicKeyToken::class, $actual);
+        $this->assertSame($uid, $actual->getUID());
+        $this->assertSame($user, $actual->getLoginName());
+        $this->assertSame($name, $actual->getName());
+        $this->assertSame(IToken::DO_NOT_REMEMBER, $actual->getRemember());
+        $this->assertSame($password, $this->tokenProvider->getPassword($actual, $token));
+    }
+
+    public function testGenerateTokenNoPassword(): void {
+        $token = 'tokentokentokentokentoken';
+        $uid = 'user';
+        $user = 'User';
+        $password = 'passme';
+        $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
+        $type = IToken::PERMANENT_TOKEN;
+        $this->config->method('getSystemValueBool')
+            ->willReturnMap([
+                ['auth.storeCryptedPassword', true, false],
+            ]);
+        $this->expectException(PasswordlessTokenException::class);
+
+        $actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
+
+        $this->assertInstanceOf(PublicKeyToken::class, $actual);
+        $this->assertSame($uid, $actual->getUID());
+        $this->assertSame($user, $actual->getLoginName());
+        $this->assertSame($name, $actual->getName());
+        $this->assertSame(IToken::DO_NOT_REMEMBER, $actual->getRemember());
+        $this->tokenProvider->getPassword($actual, $token);
+    }
+
+    public function testGenerateTokenLongPassword(): void {
+        $token = 'tokentokentokentokentoken';
+        $uid = 'user';
+        $user = 'User';
+        $password = '';
+        for ($i = 0; $i < 500; $i++) {
+            $password .= 'e';
+        }
+        $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
+        $type = IToken::PERMANENT_TOKEN;
+        $this->config->method('getSystemValueBool')
+            ->willReturnMap([
+                ['auth.storeCryptedPassword', true, true],
+            ]);
+        $this->expectException(\RuntimeException::class);
+
+        $actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
+    }
+
+    public function testGenerateTokenInvalidName(): void {
+        $token = 'tokentokentokentokentoken';
+        $uid = 'user';
+        $user = 'User';
+        $password = 'passme';
+        $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12'
+            . 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12'
+            . 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12'
+            . 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
+        $type = IToken::PERMANENT_TOKEN;
+        $this->config->method('getSystemValueBool')
+            ->willReturnMap([
+                ['auth.storeCryptedPassword', true, true],
+            ]);
+
+        $actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
+
+        $this->assertInstanceOf(PublicKeyToken::class, $actual);
+        $this->assertSame($uid, $actual->getUID());
+        $this->assertSame($user, $actual->getLoginName());
+        $this->assertSame('User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12User-Agent: Mozill…', $actual->getName());
+        $this->assertSame(IToken::DO_NOT_REMEMBER, $actual->getRemember());
+        $this->assertSame($password, $this->tokenProvider->getPassword($actual, $token));
+    }
+
+    public function testUpdateToken(): void {
+        $tk = new PublicKeyToken();
+        $this->mapper->expects($this->once())
+            ->method('updateActivity')
+            ->with($tk, $this->time);
+        $tk->setLastActivity($this->time - 200);
+        $this->config->method('getSystemValueBool')
+            ->willReturnMap([
+                ['auth.storeCryptedPassword', true, true],
+            ]);
+
+        $this->tokenProvider->updateTokenActivity($tk);
+
+        $this->assertEquals($this->time, $tk->getLastActivity());
+    }
+
+    public function testUpdateTokenDebounce(): void {
+        $tk = new PublicKeyToken();
+        $this->config->method('getSystemValueInt')
+            ->willReturnCallback(function ($value, $default) {
+                return $default;
+            });
+        $tk->setLastActivity($this->time - 30);
+
+        $this->mapper->expects($this->never())
+            ->method('updateActivity')
+            ->with($tk, $this->time);
+
+        $this->tokenProvider->updateTokenActivity($tk);
+    }
+
+    public function testGetTokenByUser(): void {
+        $this->mapper->expects($this->once())
+            ->method('getTokenByUser')
+            ->with('uid')
+            ->willReturn(['token']);
+
+        $this->assertEquals(['token'], $this->tokenProvider->getTokenByUser('uid'));
+    }
+
+    public function testGetPassword(): void {
+        $token = 'tokentokentokentokentoken';
+        $uid = 'user';
+        $user = 'User';
+        $password = 'passme';
+        $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
+        $type = IToken::PERMANENT_TOKEN;
+        $this->config->method('getSystemValueBool')
+            ->willReturnMap([
+                ['auth.storeCryptedPassword', true, true],
+            ]);
+
+        $actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
+
+        $this->assertSame($password, $this->tokenProvider->getPassword($actual, $token));
+    }
+
+
+    public function testGetPasswordPasswordLessToken(): void {
+        $this->expectException(\OC\Authentication\Exceptions\PasswordlessTokenException::class);
+
+        $token = 'token1234';
+        $tk = new PublicKeyToken();
+        $tk->setPassword(null);
+
+        $this->tokenProvider->getPassword($tk, $token);
+    }
+
+
+    public function testGetPasswordInvalidToken(): void {
+        $this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class);
+
+        $token = 'tokentokentokentokentoken';
+        $uid = 'user';
+        $user = 'User';
+        $password = 'passme';
+        $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
+        $type = IToken::PERMANENT_TOKEN;
+
+        $this->config->method('getSystemValueBool')
+            ->willReturnMap([
+                ['auth.storeCryptedPassword', true, true],
+            ]);
+        $actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
+
+        $this->tokenProvider->getPassword($actual, 'wrongtoken');
+    }
+
+    public function testSetPassword(): void {
+        $token = 'tokentokentokentokentoken';
+        $uid = 'user';
+        $user = 'User';
+        $password = 'passme';
+        $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
+        $type = IToken::PERMANENT_TOKEN;
+        $this->config->method('getSystemValueBool')
+            ->willReturnMap([
+                ['auth.storeCryptedPassword', true, true],
+            ]);
+
+        $actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
+
+        $this->mapper->method('getTokenByUser')
+            ->with('user')
+            ->willReturn([$actual]);
+
+        $newpass = 'newpass';
+        $this->mapper->expects($this->once())
+            ->method('update')
+            ->with($this->callback(function ($token) use ($newpass) {
+                return $newpass === $this->tokenProvider->getPassword($token, 'tokentokentokentokentoken');
+            }));
+
+
+        $this->tokenProvider->setPassword($actual, $token, $newpass);
+
+        $this->assertSame($newpass, $this->tokenProvider->getPassword($actual, 'tokentokentokentokentoken'));
+    }
+
+
+    public function testSetPasswordInvalidToken(): void {
+        $this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class);
+
+        $token = $this->createMock(IToken::class);
+        $tokenId = 'token123';
+        $password = '123456';
+
+        $this->tokenProvider->setPassword($token, $tokenId, $password);
+    }
+
+    public function testInvalidateToken(): void {
+        $calls = [
+            [hash('sha512', 'token7' . '1f4h9s')],
+            [hash('sha512', 'token7')]
+        ];
+
+        $this->mapper->expects($this->exactly(2))
+            ->method('invalidate')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        $this->tokenProvider->invalidateToken('token7');
+    }
+
+    public function testInvalidateTokenById(): void {
+        $id = 123;
+
+        $this->mapper->expects($this->once())
+            ->method('getTokenById')
+            ->with($id);
+
+        $this->tokenProvider->invalidateTokenById('uid', $id);
+    }
+
+    public function testInvalidateOldTokens(): void {
+        $defaultSessionLifetime = 60 * 60 * 24;
+        $defaultRememberMeLifetime = 60 * 60 * 24 * 15;
+        $wipeTokenLifetime = 60 * 60 * 24 * 60;
+        $this->config->expects($this->exactly(4))
+            ->method('getSystemValueInt')
+            ->willReturnMap([
+                ['session_lifetime', $defaultSessionLifetime, 150],
+                ['remember_login_cookie_lifetime', $defaultRememberMeLifetime, 300],
+                ['token_auth_wipe_token_retention', $wipeTokenLifetime, 500],
+                ['token_auth_token_retention', 60 * 60 * 24 * 365, 800],
+            ]);
+
+        $calls = [
+            [$this->time - 150, IToken::TEMPORARY_TOKEN, IToken::DO_NOT_REMEMBER],
+            [$this->time - 300, IToken::TEMPORARY_TOKEN, IToken::REMEMBER],
+            [$this->time - 500, IToken::WIPE_TOKEN, null],
+            [$this->time - 800, IToken::PERMANENT_TOKEN, null],
+        ];
+        $this->mapper->expects($this->exactly(4))
+            ->method('invalidateOld')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        $this->tokenProvider->invalidateOldTokens();
+    }
+
+    public function testInvalidateLastUsedBefore(): void {
+        $this->mapper->expects($this->once())
+            ->method('invalidateLastUsedBefore')
+            ->with('user', 946684800);
+
+        $this->tokenProvider->invalidateLastUsedBefore('user', 946684800);
+    }
+
+    public function testRenewSessionTokenWithoutPassword(): void {
+        $token = 'oldIdtokentokentokentoken';
+        $uid = 'user';
+        $user = 'User';
+        $password = null;
+        $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
+        $type = IToken::PERMANENT_TOKEN;
+
+        $oldToken = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
+
+        $this->mapper
+            ->expects($this->once())
+            ->method('getToken')
+            ->with(hash('sha512', 'oldIdtokentokentokentoken' . '1f4h9s'))
+            ->willReturn($oldToken);
+        $this->mapper
+            ->expects($this->once())
+            ->method('insert')
+            ->with($this->callback(function (PublicKeyToken $token) use ($user, $uid, $name) {
+                return $token->getUID() === $uid &&
+                    $token->getLoginName() === $user &&
+                    $token->getName() === $name &&
+                    $token->getType() === IToken::DO_NOT_REMEMBER &&
+                    $token->getLastActivity() === $this->time &&
+                    $token->getPassword() === null;
+            }));
+        $this->mapper
+            ->expects($this->once())
+            ->method('delete')
+            ->with($this->callback(function ($token) use ($oldToken) {
+                return $token === $oldToken;
+            }));
+
+        $this->tokenProvider->renewSessionToken('oldIdtokentokentokentoken', 'newIdtokentokentokentoken');
+    }
+
+    public function testRenewSessionTokenWithPassword(): void {
+        $token = 'oldIdtokentokentokentoken';
+        $uid = 'user';
+        $user = 'User';
+        $password = 'password';
+        $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
+        $type = IToken::PERMANENT_TOKEN;
+
+        $this->config->method('getSystemValueBool')
+            ->willReturnMap([
+                ['auth.storeCryptedPassword', true, true],
+            ]);
+        $oldToken = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
+
+        $this->mapper
+            ->expects($this->once())
+            ->method('getToken')
+            ->with(hash('sha512', 'oldIdtokentokentokentoken' . '1f4h9s'))
+            ->willReturn($oldToken);
+        $this->mapper
+            ->expects($this->once())
+            ->method('insert')
+            ->with($this->callback(function (PublicKeyToken $token) use ($user, $uid, $name): bool {
+                return $token->getUID() === $uid &&
+                    $token->getLoginName() === $user &&
+                    $token->getName() === $name &&
+                    $token->getType() === IToken::DO_NOT_REMEMBER &&
+                    $token->getLastActivity() === $this->time &&
+                    $token->getPassword() !== null &&
+                    $this->tokenProvider->getPassword($token, 'newIdtokentokentokentoken') === 'password';
+            }));
+        $this->mapper
+            ->expects($this->once())
+            ->method('delete')
+            ->with($this->callback(function ($token) use ($oldToken): bool {
+                return $token === $oldToken;
+            }));
+
+        $this->tokenProvider->renewSessionToken('oldIdtokentokentokentoken', 'newIdtokentokentokentoken');
+    }
+
+    public function testGetToken(): void {
+        $token = new PublicKeyToken();
+
+        $this->config->method('getSystemValue')
+            ->with('secret')
+            ->willReturn('mysecret');
+
+        $this->mapper->method('getToken')
+            ->with(
+                $this->callback(function (string $token) {
+                    return hash('sha512', 'unhashedTokentokentokentokentoken' . '1f4h9s') === $token;
+                })
+            )->willReturn($token);
+
+        $this->assertSame($token, $this->tokenProvider->getToken('unhashedTokentokentokentokentoken'));
+    }
+
+    public function testGetInvalidToken(): void {
+        $this->expectException(InvalidTokenException::class);
+
+        $calls = [
+            'unhashedTokentokentokentokentoken' . '1f4h9s',
+            'unhashedTokentokentokentokentoken',
+        ];
+        $this->mapper->expects($this->exactly(2))
+            ->method('getToken')
+            ->willReturnCallback(function (string $token) use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals(hash('sha512', $expected), $token);
+                throw new DoesNotExistException('nope');
+            });
+
+        $this->tokenProvider->getToken('unhashedTokentokentokentokentoken');
+    }
+
+    public function testGetExpiredToken(): void {
+        $token = 'tokentokentokentokentoken';
+        $uid = 'user';
+        $user = 'User';
+        $password = 'passme';
+        $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
+        $type = IToken::PERMANENT_TOKEN;
+
+        $actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
+        $actual->setExpires(42);
+
+        $this->mapper->method('getToken')
+            ->with(
+                $this->callback(function (string $token) {
+                    return hash('sha512', 'tokentokentokentokentoken' . '1f4h9s') === $token;
+                })
+            )->willReturn($actual);
+
+        try {
+            $this->tokenProvider->getToken('tokentokentokentokentoken');
+            $this->fail();
+        } catch (ExpiredTokenException $e) {
+            $this->assertSame($actual, $e->getToken());
+        }
+    }
+
+    public function testGetTokenById(): void {
+        $token = $this->createMock(PublicKeyToken::class);
+
+        $this->mapper->expects($this->once())
+            ->method('getTokenById')
+            ->with($this->equalTo(42))
+            ->willReturn($token);
+
+        $this->assertSame($token, $this->tokenProvider->getTokenById(42));
+    }
+
+    public function testGetInvalidTokenById(): void {
+        $this->expectException(InvalidTokenException::class);
+
+        $this->mapper->expects($this->once())
+            ->method('getTokenById')
+            ->with($this->equalTo(42))
+            ->willThrowException(new DoesNotExistException('nope'));
+
+        $this->tokenProvider->getTokenById(42);
+    }
+
+    public function testGetExpiredTokenById(): void {
+        $token = new PublicKeyToken();
+        $token->setExpires(42);
+
+        $this->mapper->expects($this->once())
+            ->method('getTokenById')
+            ->with($this->equalTo(42))
+            ->willReturn($token);
+
+        try {
+            $this->tokenProvider->getTokenById(42);
+            $this->fail();
+        } catch (ExpiredTokenException $e) {
+            $this->assertSame($token, $e->getToken());
+        }
+    }
+
+    public function testRotate(): void {
+        $token = 'oldtokentokentokentokentoken';
+        $uid = 'user';
+        $user = 'User';
+        $password = 'password';
+        $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
+        $type = IToken::PERMANENT_TOKEN;
+
+        $this->config->method('getSystemValueBool')
+            ->willReturnMap([
+                ['auth.storeCryptedPassword', true, true],
+            ]);
+        $actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
+
+        $new = $this->tokenProvider->rotate($actual, 'oldtokentokentokentokentoken', 'newtokentokentokentokentoken');
+
+        $this->assertSame('password', $this->tokenProvider->getPassword($new, 'newtokentokentokentokentoken'));
+    }
+
+    public function testRotateNoPassword(): void {
+        $token = 'oldtokentokentokentokentoken';
+        $uid = 'user';
+        $user = 'User';
+        $password = null;
+        $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
+        $type = IToken::PERMANENT_TOKEN;
+
+        $actual = $this->tokenProvider->generateToken($token, $uid, $user, $password, $name, $type, IToken::DO_NOT_REMEMBER);
+
+        $oldPrivate = $actual->getPrivateKey();
+
+        $new = $this->tokenProvider->rotate($actual, 'oldtokentokentokentokentoken', 'newtokentokentokentokentoken');
+
+        $newPrivate = $new->getPrivateKey();
+
+        $this->assertNotSame($newPrivate, $oldPrivate);
+        $this->assertNull($new->getPassword());
+    }
+
+    public function testMarkPasswordInvalidInvalidToken(): void {
+        $token = $this->createMock(IToken::class);
+
+        $this->expectException(InvalidTokenException::class);
+
+        $this->tokenProvider->markPasswordInvalid($token, 'tokenId');
+    }
+
+    public function testMarkPasswordInvalid(): void {
+        $token = $this->createMock(PublicKeyToken::class);
+
+        $token->expects($this->once())
+            ->method('setPasswordInvalid')
+            ->with(true);
+        $this->mapper->expects($this->once())
+            ->method('update')
+            ->with($token);
+
+        $this->tokenProvider->markPasswordInvalid($token, 'tokenId');
+    }
+
+    public function testUpdatePasswords(): void {
+        $uid = 'myUID';
+        $token1 = $this->tokenProvider->generateToken(
+            'foobetokentokentokentoken',
+            $uid,
+            $uid,
+            'bar',
+            'random1',
+            IToken::PERMANENT_TOKEN,
+            IToken::REMEMBER);
+        $token2 = $this->tokenProvider->generateToken(
+            'foobartokentokentokentoken',
+            $uid,
+            $uid,
+            'bar',
+            'random2',
+            IToken::PERMANENT_TOKEN,
+            IToken::REMEMBER);
+        $this->config->method('getSystemValueBool')
+            ->willReturnMap([
+                ['auth.storeCryptedPassword', true, true],
+            ]);
+
+        $this->mapper->method('hasExpiredTokens')
+            ->with($uid)
+            ->willReturn(true);
+        $this->mapper->expects($this->once())
+            ->method('getTokenByUser')
+            ->with($uid)
+            ->willReturn([$token1, $token2]);
+        $this->mapper->expects($this->exactly(2))
+            ->method('update')
+            ->with($this->callback(function (PublicKeyToken $t) use ($token1, $token2) {
+                return $t === $token1 || $t === $token2;
+            }));
+
+        $this->tokenProvider->updatePasswords($uid, 'bar2');
+    }
 }

Spacing +18 added lines, -18 removed lines

@@ -192,7 +192,7 @@ 
 	public function testUpdateTokenDebounce(): void {
 		$tk = new PublicKeyToken();
 		$this->config->method('getSystemValueInt')
-			->willReturnCallback(function ($value, $default) {
+			->willReturnCallback(function($value, $default) {
 				return $default;
 			});
 		$tk->setLastActivity($this->time - 30);
@@ -282,7 +282,7 @@ 
 		$newpass = 'newpass';
 		$this->mapper->expects($this->once())
 			->method('update')
-			->with($this->callback(function ($token) use ($newpass) {
+			->with($this->callback(function($token) use ($newpass) {
 				return $newpass === $this->tokenProvider->getPassword($token, 'tokentokentokentokentoken');
 			}));
 
@@ -305,13 +305,13 @@ 
 
 	public function testInvalidateToken(): void {
 		$calls = [
-			[hash('sha512', 'token7' . '1f4h9s')],
+			[hash('sha512', 'token7'.'1f4h9s')],
 			[hash('sha512', 'token7')]
 		];
 
 		$this->mapper->expects($this->exactly(2))
 			->method('invalidate')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 			});
@@ -350,7 +350,7 @@ 
 		];
 		$this->mapper->expects($this->exactly(4))
 			->method('invalidateOld')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 			});
@@ -379,12 +379,12 @@ 
 		$this->mapper
 			->expects($this->once())
 			->method('getToken')
-			->with(hash('sha512', 'oldIdtokentokentokentoken' . '1f4h9s'))
+			->with(hash('sha512', 'oldIdtokentokentokentoken'.'1f4h9s'))
 			->willReturn($oldToken);
 		$this->mapper
 			->expects($this->once())
 			->method('insert')
-			->with($this->callback(function (PublicKeyToken $token) use ($user, $uid, $name) {
+			->with($this->callback(function(PublicKeyToken $token) use ($user, $uid, $name) {
 				return $token->getUID() === $uid &&
 					$token->getLoginName() === $user &&
 					$token->getName() === $name &&
@@ -395,7 +395,7 @@ 
 		$this->mapper
 			->expects($this->once())
 			->method('delete')
-			->with($this->callback(function ($token) use ($oldToken) {
+			->with($this->callback(function($token) use ($oldToken) {
 				return $token === $oldToken;
 			}));
 
@@ -419,12 +419,12 @@ 
 		$this->mapper
 			->expects($this->once())
 			->method('getToken')
-			->with(hash('sha512', 'oldIdtokentokentokentoken' . '1f4h9s'))
+			->with(hash('sha512', 'oldIdtokentokentokentoken'.'1f4h9s'))
 			->willReturn($oldToken);
 		$this->mapper
 			->expects($this->once())
 			->method('insert')
-			->with($this->callback(function (PublicKeyToken $token) use ($user, $uid, $name): bool {
+			->with($this->callback(function(PublicKeyToken $token) use ($user, $uid, $name): bool {
 				return $token->getUID() === $uid &&
 					$token->getLoginName() === $user &&
 					$token->getName() === $name &&
@@ -436,7 +436,7 @@ 
 		$this->mapper
 			->expects($this->once())
 			->method('delete')
-			->with($this->callback(function ($token) use ($oldToken): bool {
+			->with($this->callback(function($token) use ($oldToken): bool {
 				return $token === $oldToken;
 			}));
 
@@ -452,8 +452,8 @@ 
 
 		$this->mapper->method('getToken')
 			->with(
-				$this->callback(function (string $token) {
-					return hash('sha512', 'unhashedTokentokentokentokentoken' . '1f4h9s') === $token;
+				$this->callback(function(string $token) {
+					return hash('sha512', 'unhashedTokentokentokentokentoken'.'1f4h9s') === $token;
 				})
 			)->willReturn($token);
 
@@ -464,12 +464,12 @@ 
 		$this->expectException(InvalidTokenException::class);
 
 		$calls = [
-			'unhashedTokentokentokentokentoken' . '1f4h9s',
+			'unhashedTokentokentokentokentoken'.'1f4h9s',
 			'unhashedTokentokentokentokentoken',
 		];
 		$this->mapper->expects($this->exactly(2))
 			->method('getToken')
-			->willReturnCallback(function (string $token) use (&$calls) {
+			->willReturnCallback(function(string $token) use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals(hash('sha512', $expected), $token);
 				throw new DoesNotExistException('nope');
@@ -491,8 +491,8 @@ 
 
 		$this->mapper->method('getToken')
 			->with(
-				$this->callback(function (string $token) {
-					return hash('sha512', 'tokentokentokentokentoken' . '1f4h9s') === $token;
+				$this->callback(function(string $token) {
+					return hash('sha512', 'tokentokentokentokentoken'.'1f4h9s') === $token;
 				})
 			)->willReturn($actual);
 
@@ -635,7 +635,7 @@ 
 			->willReturn([$token1, $token2]);
 		$this->mapper->expects($this->exactly(2))
 			->method('update')
-			->with($this->callback(function (PublicKeyToken $t) use ($token1, $token2) {
+			->with($this->callback(function(PublicKeyToken $t) use ($token1, $token2) {
 				return $t === $token1 || $t === $token2;
 			}));
 

tests/lib/Authentication/Listeners/UserDeletedTokenCleanupListenerTest.php

Indentation +79 added lines, -79 removed lines

@@ -21,83 +21,83 @@
 use Test\TestCase;
 
 class UserDeletedTokenCleanupListenerTest extends TestCase {
-	/** @var Manager|MockObject */
-	private $manager;
-
-	/** @var LoggerInterface|MockObject */
-	private $logger;
-
-	/** @var UserDeletedTokenCleanupListener */
-	private $listener;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->manager = $this->createMock(Manager::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-
-		$this->listener = new UserDeletedTokenCleanupListener(
-			$this->manager,
-			$this->logger
-		);
-	}
-
-	public function testHandleUnrelated(): void {
-		$event = new Event();
-		$this->manager->expects($this->never())->method('getTokenByUser');
-		$this->logger->expects($this->never())->method('error');
-
-		$this->listener->handle($event);
-	}
-
-	public function testHandleWithErrors(): void {
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('user123');
-		$event = new UserDeletedEvent($user);
-		$exception = new Exception('nope');
-		$this->manager->expects($this->once())
-			->method('getTokenByUser')
-			->with('user123')
-			->willThrowException($exception);
-		$this->logger->expects($this->once())
-			->method('error');
-
-		$this->listener->handle($event);
-	}
-
-	public function testHandle(): void {
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('user123');
-		$event = new UserDeletedEvent($user);
-		$token1 = $this->createMock(IToken::class);
-		$token1->method('getId')->willReturn(1);
-		$token2 = $this->createMock(IToken::class);
-		$token2->method('getId')->willReturn(2);
-		$token3 = $this->createMock(IToken::class);
-		$token3->method('getId')->willReturn(3);
-		$this->manager->expects($this->once())
-			->method('getTokenByUser')
-			->with('user123')
-			->willReturn([
-				$token1,
-				$token2,
-				$token3,
-			]);
-
-		$calls = [
-			['user123', 1],
-			['user123', 2],
-			['user123', 3],
-		];
-		$this->manager->expects($this->exactly(3))
-			->method('invalidateTokenById')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-		$this->logger->expects($this->never())
-			->method('error');
-
-		$this->listener->handle($event);
-	}
+    /** @var Manager|MockObject */
+    private $manager;
+
+    /** @var LoggerInterface|MockObject */
+    private $logger;
+
+    /** @var UserDeletedTokenCleanupListener */
+    private $listener;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->manager = $this->createMock(Manager::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->listener = new UserDeletedTokenCleanupListener(
+            $this->manager,
+            $this->logger
+        );
+    }
+
+    public function testHandleUnrelated(): void {
+        $event = new Event();
+        $this->manager->expects($this->never())->method('getTokenByUser');
+        $this->logger->expects($this->never())->method('error');
+
+        $this->listener->handle($event);
+    }
+
+    public function testHandleWithErrors(): void {
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')->willReturn('user123');
+        $event = new UserDeletedEvent($user);
+        $exception = new Exception('nope');
+        $this->manager->expects($this->once())
+            ->method('getTokenByUser')
+            ->with('user123')
+            ->willThrowException($exception);
+        $this->logger->expects($this->once())
+            ->method('error');
+
+        $this->listener->handle($event);
+    }
+
+    public function testHandle(): void {
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')->willReturn('user123');
+        $event = new UserDeletedEvent($user);
+        $token1 = $this->createMock(IToken::class);
+        $token1->method('getId')->willReturn(1);
+        $token2 = $this->createMock(IToken::class);
+        $token2->method('getId')->willReturn(2);
+        $token3 = $this->createMock(IToken::class);
+        $token3->method('getId')->willReturn(3);
+        $this->manager->expects($this->once())
+            ->method('getTokenByUser')
+            ->with('user123')
+            ->willReturn([
+                $token1,
+                $token2,
+                $token3,
+            ]);
+
+        $calls = [
+            ['user123', 1],
+            ['user123', 2],
+            ['user123', 3],
+        ];
+        $this->manager->expects($this->exactly(3))
+            ->method('invalidateTokenById')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+        $this->logger->expects($this->never())
+            ->method('error');
+
+        $this->listener->handle($event);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 		];
 		$this->manager->expects($this->exactly(3))
 			->method('invalidateTokenById')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 			});

tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php

Indentation +44 added lines, -44 removed lines

@@ -15,58 +15,58 @@
 use PHPUnit\Framework\MockObject\MockObject;
 
 class SetUserTimezoneCommandTest extends ALoginTestCommand {
-	/** @var IConfig|MockObject */
-	private $config;
+    /** @var IConfig|MockObject */
+    private $config;
 
-	/** @var ISession|MockObject */
-	private $session;
+    /** @var ISession|MockObject */
+    private $session;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->config = $this->createMock(IConfig::class);
-		$this->session = $this->createMock(ISession::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->session = $this->createMock(ISession::class);
 
-		$this->cmd = new SetUserTimezoneCommand(
-			$this->config,
-			$this->session
-		);
-	}
+        $this->cmd = new SetUserTimezoneCommand(
+            $this->config,
+            $this->session
+        );
+    }
 
-	public function testProcessNoTimezoneSet(): void {
-		$data = $this->getLoggedInLoginData();
-		$this->config->expects($this->never())
-			->method('setUserValue');
-		$this->session->expects($this->never())
-			->method('set');
+    public function testProcessNoTimezoneSet(): void {
+        $data = $this->getLoggedInLoginData();
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+        $this->session->expects($this->never())
+            ->method('set');
 
-		$result = $this->cmd->process($data);
+        $result = $this->cmd->process($data);
 
-		$this->assertTrue($result->isSuccess());
-	}
+        $this->assertTrue($result->isSuccess());
+    }
 
-	public function testProcess(): void {
-		$data = $this->getLoggedInLoginDataWithTimezone();
-		$this->user->expects($this->once())
-			->method('getUID')
-			->willReturn($this->username);
-		$this->config->expects($this->once())
-			->method('setUserValue')
-			->with(
-				$this->username,
-				'core',
-				'timezone',
-				$this->timezone
-			);
-		$this->session->expects($this->once())
-			->method('set')
-			->with(
-				'timezone',
-				$this->timeZoneOffset
-			);
+    public function testProcess(): void {
+        $data = $this->getLoggedInLoginDataWithTimezone();
+        $this->user->expects($this->once())
+            ->method('getUID')
+            ->willReturn($this->username);
+        $this->config->expects($this->once())
+            ->method('setUserValue')
+            ->with(
+                $this->username,
+                'core',
+                'timezone',
+                $this->timezone
+            );
+        $this->session->expects($this->once())
+            ->method('set')
+            ->with(
+                'timezone',
+                $this->timeZoneOffset
+            );
 
-		$result = $this->cmd->process($data);
+        $result = $this->cmd->process($data);
 
-		$this->assertTrue($result->isSuccess());
-	}
+        $this->assertTrue($result->isSuccess());
+    }
 }