Skip to content

[stable21] Improve federated permission handling #26770

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

Merged
rullzer merged 1 commit into from
Apr 26, 2021
Merged

[stable21] Improve federated permission handling #26770

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
Improve federated permission handling 
Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer @backportbot
rullzer authored and backportbot[bot] committed Apr 26, 2021
commit 5edb02dccfeceb501824a82ca9d68d26bd74c543
20 changes: 2 additions & 18 deletions apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

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;
Expand Down Expand Up @@ -678,24 +679,7 @@ protected function reshareRequested($id, array $notification) {
* @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');
}

/**
Expand Down