Skip to content

[OCM] Make webdav URL absolute according to spec #36043

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

Closed
VicDeo wants to merge 1 commit into from
Closed

[OCM] Make webdav URL absolute according to spec #36043

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion apps/federatedfilesharing/lib/Controller/OcmController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ public function processNotification($notificationType,
*/
protected function getProtocols() {
return [
'webdav' => '/public.php/webdav/'
'webdav' => $this->urlGenerator->getAbsoluteURL('/public.php/webdav/')
];
}

Expand Down
19 changes: 18 additions & 1 deletion apps/files_sharing/lib/External/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,25 @@ protected function init() {
$this->memcacheFactory,
\OC::$server->getHTTPClientService()
);
$webDavEndpoint = $discoveryManager->getWebDavEndpoint($this->remote);
// OCM endpoint is absolute, OC legacy is relative
$isOcmWebDavEndpoint = \preg_match('#https?://#', $webDavEndpoint) === 1;
if ($isOcmWebDavEndpoint) {
// proto is anything before ://
// host starts just after a proto and ends before the first slash
// root starts from the first slash until the end and could be empty
\preg_match_all(
'#^(?<proto>https?)://(?<host>[^/]*)(?<root>.*)$#',
$webDavEndpoint,
$matches
);
$this->secure = $matches['proto'][0] === 'https';
$this->host = $matches['host'][0];
$this->root = isset($matches['root'][0]) ? $matches['root'][0] : '/';
} else {
$this->root = \rtrim($this->root, '/') . $webDavEndpoint;
}

$this->root = \rtrim($this->root, '/') . $discoveryManager->getWebDavEndpoint($this->remote);
if (!$this->root || $this->root[0] !== '/') {
$this->root = '/' . $this->root;
}
Expand Down