Skip to content

fix(ocm): manage 4xx on ocm requests #57672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 1 commit into from
Jan 25, 2026
+3 −1
Merged

fix(ocm): manage 4xx on ocm requests #57672

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/private/OCM/OCMDiscoveryService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

use Exception;
use GuzzleHttp\Exception\ConnectException;
use GuzzleHttp\Exception\RequestException;
use JsonException;
use OC\Core\AppInfo\ConfigLexicon;
use OC\OCM\Model\OCMProvider;
Expand Down Expand Up @@ -286,6 +287,7 @@ public function getIncomingSignedRequest(): ?IIncomingSignedRequest {
*
* @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
*/
Expand Down Expand Up @@ -327,7 +329,7 @@ public function requestRemoteOcmEndpoint(
'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]);
Expand Down
Loading