upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 06:37:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

fix(ocm): normalize protocol to support multi with webdav option

Browse source 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
This commit is contained in:
Maxence Lange 2025-11-11 11:33:40 -01:00
parent aef64a814a
commit f1039df8ac
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/cloud_federation_api/lib/Controller/RequestHandlerController.php
View file

@ -106,6 +106,18 @@ class RequestHandlerController extends Controller {
#[NoCSRFRequired]
#[BruteForceProtection(action: 'receiveFederatedShare')]
public function addShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $protocol, $shareType, $resourceType) {
// quick patch to flatten the protocol entry 'multi' to the previous 'webdav'. this is 32 only and a better implementation is expected for 33
/** @psalm-suppress InvalidArrayOffset */
if ((($protocol['name'] ?? '') === 'multi') && (is_array($protocol['webdav'] ?? ''))) {
$protocol = [
'name' => 'webdav',
'options' => [
'sharedSecret' => $protocol['webdav']['sharedSecret'] ?? '',
'permissions' => '{http://open-cloud-mesh.org/ns}share-permissions',
],
];
}
try {
// if request is signed and well signed, no exception are thrown
// if request is not signed and host is known for not supporting signed request, no exception are thrown