summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2016-03-23 14:08:40 +0100
committerRoeland Jago Douma <rullzer@owncloud.com>2016-03-30 22:55:03 +0200
commit2f4294e7819c5cb298407b7e6101fd4f076969f9 (patch)
tree675f24310b6b9417faf002b342e9d39af21e02ad /lib
parent00c9974d945f7d50d7d10d7de5fc5a16f4d7421e (diff)
downloadnextcloud-server-2f4294e7819c5cb298407b7e6101fd4f076969f9.tar.gz
nextcloud-server-2f4294e7819c5cb298407b7e6101fd4f076969f9.zip
Add setId and setProviderID to the public interface
Fixes #23337 We only allow the id to be set once!
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Share20/Share.php25
-rw-r--r--lib/public/share/exceptions/illegalidchangeexception.php27
-rw-r--r--lib/public/share/ishare.php27
3 files changed, 77 insertions, 2 deletions
diff --git a/lib/private/Share20/Share.php b/lib/private/Share20/Share.php
index 6edd0e6886a..c361f01216f 100644
--- a/lib/private/Share20/Share.php
+++ b/lib/private/Share20/Share.php
@@ -26,6 +26,7 @@ use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\IUser;
use OCP\IGroup;
+use OCP\Share\Exceptions\IllegalIDChangeException;
class Share implements \OCP\Share\IShare {
@@ -75,7 +76,19 @@ class Share implements \OCP\Share\IShare {
* @inheritdoc
*/
public function setId($id) {
- $this->id = $id;
+ if (is_int($id)) {
+ $id = (string)$id;
+ }
+
+ if(!is_string($id)) {
+ throw new \InvalidArgumentException('String expected.');
+ }
+
+ if ($this->id !== null) {
+ throw new IllegalIDChangeException('Not allowed to assign a new internal id to a share');
+ }
+
+ $this->id = trim($id);
return $this;
}
@@ -100,7 +113,15 @@ class Share implements \OCP\Share\IShare {
* @inheritdoc
*/
public function setProviderId($id) {
- $this->providerId = $id;
+ if(!is_string($id)) {
+ throw new \InvalidArgumentException('String expected.');
+ }
+
+ if ($this->providerId !== null) {
+ throw new IllegalIDChangeException('Not allowed to assign a new provider id to a share');
+ }
+
+ $this->providerId = trim($id);
return $this;
}
diff --git a/lib/public/share/exceptions/illegalidchangeexception.php b/lib/public/share/exceptions/illegalidchangeexception.php
new file mode 100644
index 00000000000..6cd887c386b
--- /dev/null
+++ b/lib/public/share/exceptions/illegalidchangeexception.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+namespace OCP\Share\Exceptions;
+
+/**
+ * Exception for illegal attempts to modify an id of a share
+ * @since 9.1.0
+ */
+class IllegalIDChangeException extends GenericShareException {}
diff --git a/lib/public/share/ishare.php b/lib/public/share/ishare.php
index fdf40f19e56..ee71715f436 100644
--- a/lib/public/share/ishare.php
+++ b/lib/public/share/ishare.php
@@ -25,6 +25,7 @@ use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\Node;
use OCP\Files\NotFoundException;
+use OCP\Share\Exceptions\IllegalIDChangeException;
/**
* Interface IShare
@@ -35,6 +36,19 @@ use OCP\Files\NotFoundException;
interface IShare {
/**
+ * Set the internal id of the share
+ * It is only allowed to set the internal id of a share once.
+ * Attempts to override the internal id will result in an IllegalIDChangeException
+ *
+ * @param string $id
+ * @return \OCP\Share\IShare
+ * @throws IllegalIDChangeException
+ * @throws \InvalidArgumentException
+ * @since 9.1.0
+ */
+ public function setId($id);
+
+ /**
* Get the internal id of the share.
*
* @return string
@@ -53,6 +67,19 @@ interface IShare {
public function getFullId();
/**
+ * Set the provider id of the share
+ * It is only allowed to set the provider id of a share once.
+ * Attempts to override the provider id will result in an IllegalIDChangeException
+ *
+ * @param string $id
+ * @return \OCP\Share\IShare
+ * @throws IllegalIDChangeException
+ * @throws \InvalidArgumentException
+ * @since 9.1.0
+ */
+ public function setProviderId($id);
+
+ /**
* Set the node of the file/folder that is shared
*
* @param Node $node