upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-03 20:41:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 37

fix(OCM): Fix OCM provider discovery for servers without beautiful URLs

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2023-11-02 10:35:25 +01:00
parent 82f23fbfe1
commit 4424918313
No known key found for this signature in database
GPG key ID: 74434EFE0D2E2205
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,6 +69,9 @@ class OCMDiscoveryService implements IOCMDiscoveryService {
*/
public function discover(string $remote, bool $skipCache = false): IOCMProvider {
$remote = rtrim($remote, '/');
if (str_ends_with($remote, '/index.php')) {
$remote = substr($remote, 0, -10);
}
if (!$skipCache) {
try {
@ -84,7 +87,7 @@ class OCMDiscoveryService implements IOCMDiscoveryService {
$client = $this->clientService->newClient();
try {
$response = $client->get(
$remote . '/ocm-provider/',
$remote . '/index.php/ocm-provider/',
[
'timeout' => 10,
'verify' => !$this->config->getSystemValueBool('sharing.federation.allowSelfSignedCertificates'),