summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/federatedfilesharing/appinfo/routes.php1
-rw-r--r--apps/federatedfilesharing/lib/Controller/RequestHandlerController.php79
2 files changed, 59 insertions, 21 deletions
diff --git a/apps/federatedfilesharing/appinfo/routes.php b/apps/federatedfilesharing/appinfo/routes.php
index 9caaa939348..3c1272840ed 100644
--- a/apps/federatedfilesharing/appinfo/routes.php
+++ b/apps/federatedfilesharing/appinfo/routes.php
@@ -35,5 +35,6 @@ return [
['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
+ ['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
],
];
diff --git a/apps/federatedfilesharing/lib/Controller/RequestHandlerController.php b/apps/federatedfilesharing/lib/Controller/RequestHandlerController.php
index a5e75e145c8..a41481afd2a 100644
--- a/apps/federatedfilesharing/lib/Controller/RequestHandlerController.php
+++ b/apps/federatedfilesharing/lib/Controller/RequestHandlerController.php
@@ -69,7 +69,7 @@ class RequestHandlerController extends OCSController {
/** @var string */
private $shareTable = 'share';
- /** @var ICloudIdManager */
+ /** @var ICloudIdManager */
private $cloudIdManager;
/**
@@ -133,7 +133,7 @@ class RequestHandlerController extends OCSController {
if ($remote && $token && $name && $owner && $remoteId && $shareWith) {
- if(!\OCP\Util::isValidFileName($name)) {
+ if (!\OCP\Util::isValidFileName($name)) {
throw new OCSException('The mountpoint name contains invalid characters.', 400);
}
@@ -157,14 +157,14 @@ class RequestHandlerController extends OCSController {
\OC::$server->getHTTPClientService()
);
$externalManager = new \OCA\Files_Sharing\External\Manager(
- \OC::$server->getDatabaseConnection(),
- \OC\Files\Filesystem::getMountManager(),
- \OC\Files\Filesystem::getLoader(),
- \OC::$server->getHTTPClientService(),
- \OC::$server->getNotificationManager(),
- $discoveryManager,
- $shareWith
- );
+ \OC::$server->getDatabaseConnection(),
+ \OC\Files\Filesystem::getMountManager(),
+ \OC\Files\Filesystem::getLoader(),
+ \OC::$server->getHTTPClientService(),
+ \OC::$server->getNotificationManager(),
+ $discoveryManager,
+ $shareWith
+ );
try {
$externalManager->addShare($remote, $token, '', $name, $owner, false, $shareWith, $remoteId);
@@ -184,7 +184,7 @@ class RequestHandlerController extends OCSController {
->setType('remote_share')
->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_RECEIVED, [$ownerFederatedId, trim($name, '/')])
->setAffectedUser($shareWith)
- ->setObject('remote_share', (int) $shareId, $name);
+ ->setObject('remote_share', (int)$shareId, $name);
\OC::$server->getActivityManager()->publish($event);
$urlGenerator = \OC::$server->getURLGenerator();
@@ -257,7 +257,7 @@ class RequestHandlerController extends OCSController {
list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
$owner = $share->getShareOwner();
$currentServer = $this->addressHandler->generateRemoteURL();
- if ($this->addressHandler->compareAddresses($user, $remote,$owner , $currentServer)) {
+ if ($this->addressHandler->compareAddresses($user, $remote, $owner, $currentServer)) {
throw new OCSForbiddenException();
}
@@ -330,7 +330,7 @@ class RequestHandlerController extends OCSController {
->setType('remote_share')
->setAffectedUser($this->getCorrectUid($share))
->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_ACCEPTED, [$share->getSharedWith(), $file])
- ->setObject('files', (int) $share->getNode()->getId(), $file)
+ ->setObject('files', (int)$share->getNode()->getId(), $file)
->setLink($link);
\OC::$server->getActivityManager()->publish($event);
}
@@ -359,7 +359,7 @@ class RequestHandlerController extends OCSController {
return new Http\DataResponse();
}
- if($this->verifyShare($share, $token)) {
+ if ($this->verifyShare($share, $token)) {
if ($share->getShareOwner() !== $share->getSharedBy()) {
list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
$remoteId = $this->federatedShareProvider->getRemoteId($share);
@@ -385,7 +385,7 @@ class RequestHandlerController extends OCSController {
->setType('remote_share')
->setAffectedUser($this->getCorrectUid($share))
->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_DECLINED, [$share->getSharedWith(), $file])
- ->setObject('files', (int) $share->getNode()->getId(), $file)
+ ->setObject('files', (int)$share->getNode()->getId(), $file)
->setLink($link);
\OC::$server->getActivityManager()->publish($event);
@@ -398,7 +398,7 @@ class RequestHandlerController extends OCSController {
* @return string
*/
protected function getCorrectUid(Share\IShare $share) {
- if($this->userManager->userExists($share->getShareOwner())) {
+ if ($this->userManager->userExists($share->getShareOwner())) {
return $share->getShareOwner();
}
@@ -448,7 +448,7 @@ class RequestHandlerController extends OCSController {
$notification = $notificationManager->createNotification();
$notification->setApp('files_sharing')
->setUser($share['user'])
- ->setObject('remote_share', (int) $share['id']);
+ ->setObject('remote_share', (int)$share['id']);
$notificationManager->markProcessed($notification);
$event = \OC::$server->getActivityManager()->generateEvent();
@@ -456,7 +456,7 @@ class RequestHandlerController extends OCSController {
->setType('remote_share')
->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_UNSHARED, [$owner, $path])
->setAffectedUser($user)
- ->setObject('remote_share', (int) $share['id'], $path);
+ ->setObject('remote_share', (int)$share['id'], $path);
\OC::$server->getActivityManager()->publish($event);
}
@@ -482,9 +482,9 @@ class RequestHandlerController extends OCSController {
*/
public function revoke($id) {
$token = $this->request->getParam('token');
-
+
$share = $this->federatedShareProvider->getShareById($id);
-
+
if ($this->verifyShare($share, $token)) {
$this->federatedShareProvider->removeShareFromTable($share);
return new Http\DataResponse();
@@ -492,7 +492,7 @@ class RequestHandlerController extends OCSController {
throw new OCSBadRequestException();
}
-
+
/**
* get share
*
@@ -620,4 +620,41 @@ class RequestHandlerController extends OCSController {
->execute();
}
+ /**
+ * @NoCSRFRequired
+ * @PublicPage
+ *
+ * change the owner of a server-to-server share
+ *
+ * @param int $id
+ * @return Http\DataResponse
+ * @throws \InvalidArgumentException
+ * @throws OCSException
+ */
+ public function move($id) {
+
+ 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);
+ $cloudId = $this->cloudIdManager->resolveCloudId($remote);
+
+ $qb = $this->connection->getQueryBuilder();
+ $query = $qb->update('share_external')
+ ->set('remote', $qb->createNamedParameter($cloudId->getRemote()))
+ ->set('owner', $qb->createNamedParameter($cloudId->getUser()))
+ ->set('remote_id', $qb->createNamedParameter($newRemoteId))
+ ->where($qb->expr()->eq('remote_id', $qb->createNamedParameter($id)))
+ ->andWhere($qb->expr()->eq('share_token', $qb->createNamedParameter($token)));
+ $affected = $query->execute();
+
+ if ($affected > 0) {
+ return new Http\DataResponse(['remote' => $cloudId->getRemote(), 'owner' => $cloudId->getUser()]);
+ } else {
+ throw new OCSBadRequestException('Share not found or token invalid');
+ }
+ }
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 14:44:33 +0000