upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Merge pull request #57801 from nextcloud/backport/57672/stable33

Browse source 
[stable33] fix(ocm): manage 4xx on ocm requests
This commit is contained in:
Andy Scherzinger 2026-01-26 09:51:01 +01:00 committed by GitHub
commit fbd4201f58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/OCM/OCMDiscoveryService.php
View file

@ -11,6 +11,7 @@ namespace OC\OCM;
use Exception;
use GuzzleHttp\Exception\ConnectException;
use GuzzleHttp\Exception\RequestException;
use JsonException;
use OC\Core\AppInfo\ConfigLexicon;
use OC\OCM\Model\OCMProvider;
@ -286,6 +287,7 @@ final class OCMDiscoveryService implements IOCMDiscoveryService {
*
* @throws OCMCapabilityException if remote does not support $capability
* @throws OCMProviderException if remote ocm provider is disabled or invalid data returned
* @throws RequestException on network issue or remote returns 4xx and 5xx status code
* @throws OCMRequestException on internal issue
* @since 33.0.0
*/
@ -327,7 +329,7 @@ final class OCMDiscoveryService implements IOCMDiscoveryService {
'delete' => $client->delete($uri, $this->prepareOcmPayload($uri, 'delete', $options, $body, $signed)),
default => throw new OCMRequestException('unknown method'),
};
} catch (OCMRequestException $e) {
} catch (OCMRequestException|RequestException $e) {
throw $e;
} catch (Exception $e) {
$this->logger->warning('error while requesting remote ocm endpoint', ['exception' => $e]);