sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(ocm): align discovery process with OCM spec 

Signed-off-by: Micke Nordin <kano@sunet.se>
pull/56341/head
Micke Nordin 2025-10-09 13:59:48 +07:00 committed by backportbot[bot]
parent 337290c5d2
commit 0db7d64e50
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/private/OCM/OCMDiscoveryService.php
Unescape Escape View File

@ -103,22 +103,46 @@ class OCMDiscoveryService implements IOCMDiscoveryService {
if ($this->config->getSystemValueBool('sharing.federation.allowSelfSignedCertificates') === true) { if ($this->config->getSystemValueBool('sharing.federation.allowSelfSignedCertificates') === true) {
$options['verify'] = false; $options['verify'] = false;
} }
$response = $client->get($remote . '/ocm-provider/', $options); $urls = [
$remote . '/.well-known/ocm',
$body = null; $remote . '/ocm-provider',
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) ?? []); foreach ($urls as $url) {
$this->cache->set($remote, $body, 60 * 60 * 24); $exception = null;
$this->remoteProviders[$remote] = $provider; $body = null;
return $provider; $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'); throw new OCMProviderException('invalid remote ocm endpoint');
} catch (JsonException|OCMProviderException) { } catch (JsonException|OCMProviderException) {
$this->cache->set($remote, false, 5 * 60); $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) { } catch (\Exception $e) {
$this->cache->set($remote, false, 5 * 60); $this->cache->set($remote, false, 5 * 60);
$this->logger->warning('error while discovering ocm provider', [ $this->logger->warning('error while discovering ocm provider', [