Skip to content

[stable32] fix(ocm): align discovery process with OCM spec #56341

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
Nov 10, 2025
Merged

[stable32] fix(ocm): align discovery process with OCM spec #56341

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
46 changes: 35 additions & 11 deletions lib/private/OCM/OCMDiscoveryService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,22 +103,46 @@ public function discover(string $remote, bool $skipCache = false): ICapabilityAw
if ($this->config->getSystemValueBool('sharing.federation.allowSelfSignedCertificates') === true) {
$options['verify'] = false;
}
$response = $client->get($remote . '/ocm-provider/', $options);

$body = null;
if ($response->getStatusCode() === Http::STATUS_OK) {
$body = $response->getBody();
// update provider with data returned by the request
$provider->import(json_decode($body, true, 8, JSON_THROW_ON_ERROR) ?? []);
$this->cache->set($remote, $body, 60 * 60 * 24);
$this->remoteProviders[$remote] = $provider;
return $provider;
$urls = [
$remote . '/.well-known/ocm',
$remote . '/ocm-provider',
];


foreach ($urls as $url) {
$exception = null;
$body = null;
$status = null;
try {
$response = $client->get($url, $options);
if ($response->getStatusCode() === Http::STATUS_OK) {
$body = $response->getBody();
$status = $response->getStatusCode();
// update provider with data returned by the request
$provider->import(json_decode($body, true, 8, JSON_THROW_ON_ERROR) ?? []);
$this->cache->set($remote, $body, 60 * 60 * 24);
$this->remoteProviders[$remote] = $provider;
return $provider;
}
} catch (\Exception $e) {
$this->logger->debug("Tried unsuccesfully to do discovery at: {$url}", [
'exception' => $e,
'remote' => $remote
]);
// We want to throw only the last exception
$exception = $e;
continue;
}
}
if ($exception) {
throw $exception;
}


throw new OCMProviderException('invalid remote ocm endpoint');
} catch (JsonException|OCMProviderException) {
$this->cache->set($remote, false, 5 * 60);
throw new OCMProviderException('data returned by remote seems invalid - status:' . $response->getStatusCode() . ' - ' . ($body ?? ''));
throw new OCMProviderException('data returned by remote seems invalid - status: ' . ($status ?? '') . ' - body: ' . ($body ?? ''));
} catch (\Exception $e) {
$this->cache->set($remote, false, 5 * 60);
$this->logger->warning('error while discovering ocm provider', [
Expand Down
Loading