Merge pull request #55439 from nextcloud/backport/55420/stable31

[stable31] fix(appstore): Make appstore timeout configurable

Author: SystemKeeper

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

@@ -66,7 +66,7 @@ protected function fetch($ETag, $content) {
 		}
 
 		$options = [
-			'timeout' => 60,
+			'timeout' => (int)$this->config->getAppValue('settings', 'appstore-timeout', '120')
 		];
 
 		if ($ETag !== '') {

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

@@ -2132,7 +2132,7 @@ public function testGetAppsAllowlist(): void {
 			->expects($this->once())
 			->method('get')
 			->with('https://apps.nextcloud.com/api/v1/apps.json', [
-				'timeout' => 60,
+				'timeout' => 120,
 				'headers' => [
 					'X-NC-Subscription-Key' => 'subscription-key',
 				],
@@ -2190,6 +2190,12 @@ public function testGetAppsAllowlistCustomAppstore(): void {
 			->method('getSystemValueBool')
 			->willReturnArgument(1);
 
+		$this->config->method('getAppValue')
+			->willReturnMap([
+				['settings', 'appstore-fetcher-lastFailure', '0', '0'],
+				['settings', 'appstore-timeout', '120', '120'],
+			]);
+
 		$file = $this->createMock(ISimpleFile::class);
 		$folder = $this->createMock(ISimpleFolder::class);
 		$folder
@@ -2217,7 +2223,7 @@ public function testGetAppsAllowlistCustomAppstore(): void {
 			->expects($this->once())
 			->method('get')
 			->with('https://custom.appsstore.endpoint/api/v1/apps.json', [
-				'timeout' => 60,
+				'timeout' => 120,
 			])
 			->willReturn($response);
 		$response

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

@@ -442,6 +442,12 @@ public function testGetMatchingETag(): void {
 		$this->config->method('getSystemValueBool')
 			->willReturnArgument(1);
 
+		$this->config->method('getAppValue')
+			->willReturnMap([
+				['settings', 'appstore-fetcher-lastFailure', '0', '0'],
+				['settings', 'appstore-timeout', '120', '120'],
+			]);
+
 		$folder = $this->createMock(ISimpleFolder::class);
 		$file = $this->createMock(ISimpleFile::class);
 		$this->appData
@@ -487,7 +493,7 @@ public function testGetMatchingETag(): void {
 			->with(
 				$this->equalTo($this->endpoint),
 				$this->equalTo([
-					'timeout' => 60,
+					'timeout' => 120,
 					'headers' => [
 						'If-None-Match' => '"myETag"'
 					]
@@ -521,6 +527,12 @@ public function testGetNoMatchingETag(): void {
 		$this->config->method('getSystemValueBool')
 			->willReturnArgument(1);
 
+		$this->config->method('getAppValue')
+			->willReturnMap([
+				['settings', 'appstore-fetcher-lastFailure', '0', '0'],
+				['settings', 'appstore-timeout', '120', '120'],
+			]);
+
 		$folder = $this->createMock(ISimpleFolder::class);
 		$file = $this->createMock(ISimpleFile::class);
 		$this->appData
@@ -564,7 +576,7 @@ public function testGetNoMatchingETag(): void {
 			->with(
 				$this->equalTo($this->endpoint),
 				$this->equalTo([
-					'timeout' => 60,
+					'timeout' => 120,
 					'headers' => [
 						'If-None-Match' => '"myETag"',
 					]
@@ -606,6 +618,12 @@ public function testFetchAfterUpgradeNoETag(): void {
 		$this->config->method('getSystemValueBool')
 			->willReturnArgument(1);
 
+		$this->config->method('getAppValue')
+			->willReturnMap([
+				['settings', 'appstore-fetcher-lastFailure', '0', '0'],
+				['settings', 'appstore-timeout', '120', '120'],
+			]);
+
 		$folder = $this->createMock(ISimpleFolder::class);
 		$file = $this->createMock(ISimpleFile::class);
 		$this->appData
@@ -642,7 +660,7 @@ public function testFetchAfterUpgradeNoETag(): void {
 			->with(
 				$this->equalTo($this->endpoint),
 				$this->equalTo([
-					'timeout' => 60,
+					'timeout' => 120,
 				])
 			)
 			->willReturn($response);