mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #26763 from nextcloud/enh/federation/improve_permissions 

Improve federated permission handling
This commit is contained in:
Roeland Jago Douma 2021-04-26 17:23:12 +02:00 committed by GitHub
parent 303d689001 70f12e7332
commit 10df6b93c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
View File

@ -31,6 +31,7 @@ namespace OCA\FederatedFileSharing\OCM;
use OC\AppFramework\Http;
use OC\Files\Filesystem;
use OC\HintException;
use OCA\FederatedFileSharing\AddressHandler;
use OCA\FederatedFileSharing\FederatedShareProvider;
use OCA\Files_Sharing\Activity\Providers\RemoteShares;
@ -678,24 +679,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
* @throws BadRequestException
*/
protected function updateResharePermissions($id, array $notification) {
if (!isset($notification['sharedSecret'])) {
throw new BadRequestException(['sharedSecret']);
}
$token = $notification['sharedSecret'];
if (!isset($notification['permission'])) {
throw new BadRequestException(['permission']);
}
$ocmPermissions = $notification['permission'];
$share = $this->federatedShareProvider->getShareById($id);
$ncPermission = $this->ocmPermissions2ncPermissions($ocmPermissions);
$this->verifyShare($share, $token);
$this->updatePermissionsInDatabase($share, $ncPermission);
return [];
throw new HintException('Updating reshares not allowed');
}
/**