Skip to content

[stable21] Do not allow adding file drop shares to your own cloud #26621

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
MorrisJobke merged 1 commit into from
Apr 19, 2021
Merged

[stable21] Do not allow adding file drop shares to your own cloud #26621

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
Do not allow adding file drop shares to your own cloud 
There is no reason for this and you can't create such shares normally
anyway.

Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer @backportbot
rullzer authored and backportbot[bot] committed Apr 19, 2021
commit 6bc4561f097e0b3a14a6ad78bf5d9ab181d5311a
10 changes: 10 additions & 0 deletions apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\JSONResponse;
use OCP\Constants;
use OCP\Federation\ICloudIdManager;
use OCP\Http\Client\IClientService;
use OCP\IL10N;
Expand Down Expand Up @@ -157,6 +158,15 @@ public function createFederatedShare($shareWith, $token, $password = '') {
return $response;
}

if (($share->getPermissions() & Constants::PERMISSION_READ) === 0) {
$response = new JSONResponse(
['message' => 'Mounting file drop not supported'],
Http::STATUS_BAD_REQUEST
);
$response->throttle();
return $response;
}

$share->setSharedWith($shareWith);
$share->setShareType(IShare::TYPE_REMOTE);

Expand Down
23 changes: 13 additions & 10 deletions apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ public function testCreateFederatedShare($shareWith,
$token,
$validToken,
$createSuccessful,
$expectedReturnData
$expectedReturnData,
$permissions
) {
$this->federatedShareProvider->expects($this->any())
->method('isOutgoingServer2serverShareEnabled')
Expand All @@ -157,6 +158,7 @@ function ($shareWith) use ($validShareWith, $expectedReturnData) {
);

$share = $this->share;
$share->setPermissions($permissions);

$this->shareManager->expects($this->any())->method('getShareByToken')
->with($token)
Expand Down Expand Up @@ -199,15 +201,16 @@ function (IShare $share) use ($createSuccessful, $shareWith, $expectedReturnData
public function dataTestCreateFederatedShare() {
return [
//shareWith, outgoingSharesAllowed, validShareWith, token, validToken, createSuccessful, expectedReturnData
['user@server', true, true, 'token', true, true, 'server'],
['user@server', true, false, 'token', true, true, 'invalid federated cloud id'],
['user@server', true, false, 'token', false, true, 'invalid federated cloud id'],
['user@server', true, false, 'token', false, false, 'invalid federated cloud id'],
['user@server', true, false, 'token', true, false, 'invalid federated cloud id'],
['user@server', true, true, 'token', false, true, 'invalid token'],
['user@server', true, true, 'token', false, false, 'invalid token'],
['user@server', true, true, 'token', true, false, 'can not create share'],
['user@server', false, true, 'token', true, true, 'This server doesn\'t support outgoing federated shares'],
['user@server', true, true, 'token', true, true, 'server', 31],
['user@server', true, true, 'token', false, false, 'server', 4],
['user@server', true, false, 'token', true, true, 'invalid federated cloud id', 31],
['user@server', true, false, 'token', false, true, 'invalid federated cloud id', 31],
['user@server', true, false, 'token', false, false, 'invalid federated cloud id', 31],
['user@server', true, false, 'token', true, false, 'invalid federated cloud id', 31],
['user@server', true, true, 'token', false, true, 'invalid token', 31],
['user@server', true, true, 'token', false, false, 'invalid token', 31],
['user@server', true, true, 'token', true, false, 'can not create share', 31],
['user@server', false, true, 'token', true, true, 'This server doesn\'t support outgoing federated shares', 31],
];
}
}