upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-22 10:06:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

fix(appstore): catch GenericFileException when reading cache file in Fetcher

Browse source 
When the appstore cache file exists but getContent() throws a
GenericFileException (I/O error or OS-level permission failure), explicitly
delete the file and recreate it before writing fresh data — mirroring the
NotFoundException recovery path. If deletion itself fails, return [] cleanly.

Previously, the unhandled exception caused the entire apps settings page to
crash. The new test covers both the recovery path and deletion failure.

Signed-off-by: Anna Larch <anna@nextcloud.com>
AI-Assisted-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Anna Larch 2026-05-10 12:19:43 +02:00
parent f16c6c95c4
commit 5113b18739
2 changed files with 94 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/private/App/AppStore/Fetcher/Fetcher.php
View file

@ -12,6 +12,7 @@ use GuzzleHttp\Exception\ServerException;
use OC\Files\AppData\Factory;
use OCP\AppFramework\Http;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\GenericFileException;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\Http\Client\IClientService;
@ -167,7 +168,15 @@ abstract class Fetcher {
}
}
} catch (NotFoundException $e) {
// File does not already exists
// File does not already exist
$file = $rootFolder->newFile($this->fileName);
} catch (GenericFileException $e) {
$this->logger->warning('Could not read appstore cache file, it will be refreshed', ['app' => 'appstoreFetcher', 'exception' => $e]);
try {
$file->delete();
} catch (\Exception $deleteException) {
return [];
}
$file = $rootFolder->newFile($this->fileName);
}

84
tests/lib/App/AppStore/Fetcher/FetcherBase.php
View file

@ -13,6 +13,7 @@ use OC\App\AppStore\Fetcher\Fetcher;
use OC\Files\AppData\AppData;
use OC\Files\AppData\Factory;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\GenericFileException;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFile;
@ -684,4 +685,87 @@ abstract class FetcherBase extends TestCase {
];
$this->assertSame($expected, $this->fetcher->get());
}
public function testGetWithUnreadableCacheFileRecreatesAndFetches(): void {
$this->config
->method('getSystemValueString')
->willReturnCallback(function ($var, $default) {
if ($var === 'appstoreurl') {
return 'https://apps.nextcloud.com/api/v1';
} elseif ($var === 'version') {
return '11.0.0.2';
}
return $default;
});
$this->config->method('getSystemValueBool')
->willReturnArgument(1);
$folder = $this->createMock(ISimpleFolder::class);
$corruptedFile = $this->createMock(ISimpleFile::class);
$freshFile = $this->createMock(ISimpleFile::class);
$this->appData
->expects($this->once())
->method('getFolder')
->with('/')
->willReturn($folder);
$folder
->expects($this->once())
->method('getFile')
->with($this->fileName)
->willReturn($corruptedFile);
$corruptedFile
->expects($this->once())
->method('getContent')
->willThrowException(new GenericFileException());
$corruptedFile
->expects($this->once())
->method('delete');
$folder
->expects($this->once())
->method('newFile')
->with($this->fileName)
->willReturn($freshFile);
$client = $this->createMock(IClient::class);
$this->clientService
->expects($this->once())
->method('newClient')
->willReturn($client);
$response = $this->createMock(IResponse::class);
$client
->expects($this->once())
->method('get')
->with($this->endpoint)
->willReturn($response);
$response
->expects($this->once())
->method('getBody')
->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
$response->method('getHeader')
->with($this->equalTo('ETag'))
->willReturn('"myETag"');
$fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1502,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
$freshFile
->expects($this->once())
->method('putContent')
->with($fileData);
$freshFile
->expects($this->once())
->method('getContent')
->willReturn($fileData);
$this->timeFactory
->expects($this->once())
->method('getTime')
->willReturn(1502);
$expected = [
[
'id' => 'MyNewApp',
'foo' => 'foo',
],
[
'id' => 'bar',
],
];
$this->assertSame($expected, $this->fetcher->get());
}
}