Merge pull request #60594 from nextcloud/backport/60286/stable32

[stable32] fix(AppStore/Fetcher): catch GenericFileException when reading cache file in Fetcher

Author: miaulalala

lib/private/App/AppStore/Fetcher/Fetcher.php

@@ -12,6 +12,7 @@
 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;
@@ -161,7 +162,16 @@ public function get($allowUnstable = false) {
 				}
 			}
 		} catch (NotFoundException $e) {
-			// File does not already exists
+			// File does not already exist
+			$file = $rootFolder->newFile($this->fileName);
+		} catch (GenericFileException $e) {
+			try {
+				$file->delete();
+			} catch (\Exception) {
+				$this->logger->error('Could not read appstore cache file', ['app' => 'appstoreFetcher', 'exception' => $e]);
+				return [];
+			}
+			$this->logger->warning('Could not read appstore cache file, it will be refreshed', ['app' => 'appstoreFetcher', 'exception' => $e]);
 			$file = $rootFolder->newFile($this->fileName);
 		}
 

tests/lib/App/AppStore/Fetcher/FetcherBase.php

@@ -11,6 +11,7 @@
 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;
@@ -690,4 +691,89 @@ public function testFetchAfterUpgradeNoETag(): void {
 		];
 		$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')
+			->willReturn(true);
+
+		$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());
+	}
 }