diff options
| author | Dario Mehlich <d.mehlich@gmail.com> | 2025-01-27 10:16:08 +0100 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2025-01-27 15:11:26 +0000 |
| commit | 72a43a17f557a04d7b925d159c9dfccd20f20fef (patch) | |
| tree | 2e1d06bdc07240414477b4585f2613d987cc64d2 /tests | |
| parent | 62a74d82644bf5a06fbd208f697c6000c1e6dcf0 (diff) | |
| download | nextcloud-server-72a43a17f557a04d7b925d159c9dfccd20f20fef.tar.gz nextcloud-server-72a43a17f557a04d7b925d159c9dfccd20f20fef.zip | |
fix(preview): Filter for folders in cleanup old preview jobbackport/48581/stable31
Fixes #35936.
When running `OC\Preview\BackgroundCleanupJob`, the main iteration loop
in `run()` expects a folder, however, `getOldPreviewLocations()`
currently does not filter by mimetype and therefore can yield a
non-folder entry which causes an Exception when constructing the Folder
impl.
Filtering for `httpd/unix-directory`, as `getNewPreviewLocations()`
already does, fixes this issue.
Signed-off-by: Dario Mehlich <d.mehlich@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/Preview/BackgroundCleanupJobTest.php | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/tests/lib/Preview/BackgroundCleanupJobTest.php b/tests/lib/Preview/BackgroundCleanupJobTest.php index 9c521376af5..945366cde9f 100644 --- a/tests/lib/Preview/BackgroundCleanupJobTest.php +++ b/tests/lib/Preview/BackgroundCleanupJobTest.php @@ -191,13 +191,44 @@ class BackgroundCleanupJobTest extends \Test\TestCase { $f2 = $appdata->newFolder((string)PHP_INT_MAX - 1); $f2->newFile('foo.jpg', 'foo'); + /* + * Cleanup of OldPreviewLocations should only remove numeric folders on AppData level, + * therefore these files should stay untouched. + */ + $appdata->getFolder('/')->newFile('not-a-directory', 'foo'); + $appdata->getFolder('/')->newFile('133742', 'bar'); + $appdata = \OC::$server->getAppDataDir('preview'); + // AppData::getDirectoryListing filters all non-folders $this->assertSame(3, count($appdata->getDirectoryListing())); + try { + $appdata->getFolder('/')->getFile('not-a-directory'); + } catch (NotFoundException) { + $this->fail('Could not find file \'not-a-directory\''); + } + try { + $appdata->getFolder('/')->getFile('133742'); + } catch (NotFoundException) { + $this->fail('Could not find file \'133742\''); + } $job = new BackgroundCleanupJob($this->timeFactory, $this->connection, $this->getRoot(), $this->mimeTypeLoader, true); $job->run([]); $appdata = \OC::$server->getAppDataDir('preview'); + + // Check if the files created above are still present + // Remember: AppData::getDirectoryListing filters all non-folders $this->assertSame(0, count($appdata->getDirectoryListing())); + try { + $appdata->getFolder('/')->getFile('not-a-directory'); + } catch (NotFoundException) { + $this->fail('Could not find file \'not-a-directory\''); + } + try { + $appdata->getFolder('/')->getFile('133742'); + } catch (NotFoundException) { + $this->fail('Could not find file \'133742\''); + } } } |