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

Merge pull request #26621 from nextcloud/backport/26613/stable21 

[stable21] Do not allow adding file drop shares to your own cloud
This commit is contained in:
Morris Jobke 2021-04-19 21:48:41 +02:00 committed by GitHub
parent 3e1a6778c2 6bc4561f09
commit e590f44c4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php
View File

@ -37,6 +37,7 @@ use OCA\FederatedFileSharing\FederatedShareProvider;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http; use OCP\AppFramework\Http;
use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\JSONResponse;
use OCP\Constants;
use OCP\Federation\ICloudIdManager; use OCP\Federation\ICloudIdManager;
use OCP\Http\Client\IClientService; use OCP\Http\Client\IClientService;
use OCP\IL10N; use OCP\IL10N;
@ -157,6 +158,15 @@ class MountPublicLinkController extends Controller {
return $response; 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->setSharedWith($shareWith);
$share->setShareType(IShare::TYPE_REMOTE); $share->setShareType(IShare::TYPE_REMOTE);

23
apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php
View File

@ -139,7 +139,8 @@ class MountPublicLinkControllerTest extends \Test\TestCase {
$token, $token,
$validToken, $validToken,
$createSuccessful, $createSuccessful,
$expectedReturnData $expectedReturnData,
$permissions
) { ) {
$this->federatedShareProvider->expects($this->any()) $this->federatedShareProvider->expects($this->any())
->method('isOutgoingServer2serverShareEnabled') ->method('isOutgoingServer2serverShareEnabled')
@ -157,6 +158,7 @@ class MountPublicLinkControllerTest extends \Test\TestCase {
); );
$share = $this->share; $share = $this->share;
$share->setPermissions($permissions);
$this->shareManager->expects($this->any())->method('getShareByToken') $this->shareManager->expects($this->any())->method('getShareByToken')
->with($token) ->with($token)
@ -199,15 +201,16 @@ class MountPublicLinkControllerTest extends \Test\TestCase {
public function dataTestCreateFederatedShare() { public function dataTestCreateFederatedShare() {
return [ return [
//shareWith, outgoingSharesAllowed, validShareWith, token, validToken, createSuccessful, expectedReturnData //shareWith, outgoingSharesAllowed, validShareWith, token, validToken, createSuccessful, expectedReturnData
['user@server', true, true, 'token', true, true, 'server'], ['user@server', true, true, 'token', true, true, 'server', 31],
['user@server', true, false, 'token', true, true, 'invalid federated cloud id'], ['user@server', true, true, 'token', false, false, 'server', 4],
['user@server', true, false, 'token', false, true, 'invalid federated cloud id'], ['user@server', true, false, 'token', true, true, 'invalid federated cloud id', 31],
['user@server', true, false, 'token', false, false, 'invalid federated cloud id'], ['user@server', true, false, 'token', false, true, 'invalid federated cloud id', 31],
['user@server', true, false, 'token', true, false, 'invalid federated cloud id'], ['user@server', true, false, 'token', false, false, 'invalid federated cloud id', 31],
['user@server', true, true, 'token', false, true, 'invalid token'], ['user@server', true, false, 'token', true, false, 'invalid federated cloud id', 31],
['user@server', true, true, 'token', false, false, 'invalid token'], ['user@server', true, true, 'token', false, true, 'invalid token', 31],
['user@server', true, true, 'token', true, false, 'can not create share'], ['user@server', true, true, 'token', false, false, 'invalid token', 31],
['user@server', false, true, 'token', true, true, 'This server doesn\'t support outgoing federated shares'], ['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],
]; ];
} }
} }