open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #36214 from nextcloud/techdebt/noid/define-parameters-of-federated-file-sharing

Browse Source 
Specify the parameters of FederatedFileSharing controllers
pull/38823/head
Kate 3 years ago committed by GitHub
parent b8c3f6bd2d bf4c5bd556
commit bfeb741bb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 57 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 86
      apps/federatedfilesharing/lib/Controller/RequestHandlerController.php
  2. 19
      apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php

86
apps/federatedfilesharing/lib/Controller/RequestHandlerController.php
Unescape View File

@ -33,7 +33,6 @@ use OCA\FederatedFileSharing\Notifications;
use OCP\AppFramework\Http;
use OCP\AppFramework\OCS\OCSBadRequestException;
use OCP\AppFramework\OCS\OCSException;
use OCP\AppFramework\OCS\OCSForbiddenException;
use OCP\AppFramework\OCSController;
use OCP\App\IAppManager;
use OCP\Constants;
@ -124,20 +123,29 @@ class RequestHandlerController extends OCSController {
*
* create a new share
*
* @param string|null $remote
* @param string|null $token
* @param string|null $name
* @param string|null $owner
* @param string|null $sharedBy
* @param string|null $shareWith
* @param int|null $remoteId
* @param string|null $sharedByFederatedId
* @param string|null $ownerFederatedId
* @return Http\DataResponse
* @throws OCSException
*/
public function createShare() {
$remote = isset($_POST['remote']) ? $_POST['remote'] : null;
$token = isset($_POST['token']) ? $_POST['token'] : null;
$name = isset($_POST['name']) ? $_POST['name'] : null;
$owner = isset($_POST['owner']) ? $_POST['owner'] : null;
$sharedBy = isset($_POST['sharedBy']) ? $_POST['sharedBy'] : null;
$shareWith = isset($_POST['shareWith']) ? $_POST['shareWith'] : null;
$remoteId = isset($_POST['remoteId']) ? (int)$_POST['remoteId'] : null;
$sharedByFederatedId = isset($_POST['sharedByFederatedId']) ? $_POST['sharedByFederatedId'] : null;
$ownerFederatedId = isset($_POST['ownerFederatedId']) ? $_POST['ownerFederatedId'] : null;
public function createShare(
?string $remote = null,
?string $token = null,
?string $name = null,
?string $owner = null,
?string $sharedBy = null,
?string $shareWith = null,
?int $remoteId = null,
?string $sharedByFederatedId = null,
?string $ownerFederatedId = null,
) {
if ($ownerFederatedId === null) {
$ownerFederatedId = $this->cloudIdManager->getCloudId($owner, $this->cleanupRemote($remote))->getId();
}
@ -187,19 +195,16 @@ class RequestHandlerController extends OCSController {
* create re-share on behalf of another user
*
* @param int $id
* @param string|null $token
* @param string|null $shareWith
* @param int|null $permission
* @param int|null $remoteId
* @return Http\DataResponse
* @throws OCSBadRequestException
* @throws OCSException
* @throws OCSForbiddenException
*/
public function reShare($id) {
$token = $this->request->getParam('token', null);
$shareWith = $this->request->getParam('shareWith', null);
$permission = (int)$this->request->getParam('permission', null);
$remoteId = (int)$this->request->getParam('remoteId', null);
if ($id === null ||
$token === null ||
public function reShare(int $id, ?string $token = null, ?string $shareWith = null, ?int $permission = 0, ?int $remoteId = 0) {
if ($token === null ||
$shareWith === null ||
$permission === null ||
$remoteId === null
@ -240,14 +245,13 @@ class RequestHandlerController extends OCSController {
* accept server-to-server share
*
* @param int $id
* @param string|null $token
* @return Http\DataResponse
* @throws OCSException
* @throws ShareNotFound
* @throws \OCP\HintException
*/
public function acceptShare($id) {
$token = isset($_POST['token']) ? $_POST['token'] : null;
public function acceptShare(int $id, ?string $token = null) {
$notification = [
'sharedSecret' => $token,
'message' => 'Recipient accept the share'
@ -275,12 +279,11 @@ class RequestHandlerController extends OCSController {
* decline server-to-server share
*
* @param int $id
* @param string|null $token
* @return Http\DataResponse
* @throws OCSException
*/
public function declineShare($id) {
$token = isset($_POST['token']) ? $_POST['token'] : null;
public function declineShare(int $id, ?string $token = null) {
$notification = [
'sharedSecret' => $token,
'message' => 'Recipient declined the share'
@ -308,16 +311,15 @@ class RequestHandlerController extends OCSController {
* remove server-to-server share if it was unshared by the owner
*
* @param int $id
* @param string|null $token
* @return Http\DataResponse
* @throws OCSException
*/
public function unshare($id) {
public function unshare(int $id, ?string $token = null) {
if (!$this->isS2SEnabled()) {
throw new OCSException('Server does not support federated cloud sharing', 503);
}
$token = isset($_POST['token']) ? $_POST['token'] : null;
try {
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
$notification = ['sharedSecret' => $token];
@ -344,12 +346,11 @@ class RequestHandlerController extends OCSController {
* federated share was revoked, either by the owner or the re-sharer
*
* @param int $id
* @param string|null $token
* @return Http\DataResponse
* @throws OCSBadRequestException
*/
public function revoke($id) {
$token = $this->request->getParam('token');
public function revoke(int $id, ?string $token = null) {
try {
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
$notification = ['sharedSecret' => $token];
@ -385,12 +386,13 @@ class RequestHandlerController extends OCSController {
* update share information to keep federated re-shares in sync
*
* @param int $id
* @param string|null $token
* @param int|null $permissions
* @return Http\DataResponse
* @throws OCSBadRequestException
*/
public function updatePermissions($id) {
$token = $this->request->getParam('token', null);
$ncPermissions = $this->request->getParam('permissions', null);
public function updatePermissions(int $id, ?string $token = null, ?int $permissions = null) {
$ncPermissions = $permissions;
try {
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
@ -438,18 +440,20 @@ class RequestHandlerController extends OCSController {
* change the owner of a server-to-server share
*
* @param int $id
* @param string|null $token
* @param string|null $remote
* @param string|null $remote_id
* @return Http\DataResponse
* @throws \InvalidArgumentException
* @throws OCSBadRequestException
* @throws OCSException
* @throws \OCP\DB\Exception
*/
public function move($id) {
public function move(int $id, ?string $token = null, ?string $remote = null, ?string $remote_id = null) {
if (!$this->isS2SEnabled()) {
throw new OCSException('Server does not support federated cloud sharing', 503);
}
$token = $this->request->getParam('token');
$remote = $this->request->getParam('remote');
$newRemoteId = $this->request->getParam('remote_id', $id);
$newRemoteId = (string) ($remote_id ?? $id);
$cloudId = $this->cloudIdManager->resolveCloudId($remote);
$qb = $this->connection->getQueryBuilder();

19
apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php
Unescape View File

@ -151,17 +151,6 @@ class RequestHandlerControllerTest extends \Test\TestCase {
}
public function testCreateShare() {
// simulate a post request
$_POST['remote'] = 'localhost';
$_POST['token'] = 'token';
$_POST['name'] = 'name';
$_POST['owner'] = $this->owner;
$_POST['sharedBy'] = $this->user1;
$_POST['shareWith'] = $this->user2;
$_POST['remoteId'] = 1;
$_POST['sharedByFederatedId'] = $this->user1CloudId;
$_POST['ownerFederatedId'] = $this->ownerCloudId;
$this->cloudFederationFactory->expects($this->once())->method('getCloudFederationShare')
->with(
$this->user2,
@ -186,14 +175,13 @@ class RequestHandlerControllerTest extends \Test\TestCase {
$this->cloudFederationProvider->expects($this->once())->method('shareReceived')
->with($this->cloudFederationShare);
$result = $this->requestHandler->createShare();
$result = $this->requestHandler->createShare('localhost', 'token', 'name', $this->owner, $this->user1, $this->user2, 1, $this->user1CloudId, $this->ownerCloudId);
$this->assertInstanceOf(DataResponse::class, $result);
}
public function testDeclineShare() {
$id = 42;
$_POST['token'] = 'token';
$notification = [
'sharedSecret' => 'token',
@ -209,7 +197,7 @@ class RequestHandlerControllerTest extends \Test\TestCase {
->method('notificationReceived')
->with('SHARE_DECLINED', $id, $notification);
$result = $this->requestHandler->declineShare($id);
$result = $this->requestHandler->declineShare($id, 'token');
$this->assertInstanceOf(DataResponse::class, $result);
}
@ -217,7 +205,6 @@ class RequestHandlerControllerTest extends \Test\TestCase {
public function testAcceptShare() {
$id = 42;
$_POST['token'] = 'token';
$notification = [
'sharedSecret' => 'token',
@ -233,7 +220,7 @@ class RequestHandlerControllerTest extends \Test\TestCase {
->method('notificationReceived')
->with('SHARE_ACCEPTED', $id, $notification);
$result = $this->requestHandler->acceptShare($id);
$result = $this->requestHandler->acceptShare($id, 'token');
$this->assertInstanceOf(DataResponse::class, $result);
}

Write Preview
Loading…
Cancel
Save