Skip to content

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

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

Draft
nickvergessen wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −1
Draft

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

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
fix(OCM): Fix OCM provider discovery for servers without beautiful URLs 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Nov 2, 2023
commit 44249183133bcda3db4d75b6f6849b45fb689c9b
5 changes: 4 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 @@ -69,6 +69,9 @@ public function __construct(
*/
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 {
Expand All @@ -84,7 +87,7 @@ public function discover(string $remote, bool $skipCache = false): IOCMProvider
$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'),
Expand Down