summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2018-04-16 14:14:31 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2018-04-25 20:25:10 +0200
commit09940bcde697df90423cb0b4ecb4e62ba31bfaf7 (patch)
treed535808bcaddaa99b79a9be4978bea7582ad7adc /apps/files_trashbin/lib
parent9c64a203e308f990e54fb59c1c18ed0778f58460 (diff)
downloadnextcloud-server-09940bcde697df90423cb0b4ecb4e62ba31bfaf7.tar.gz
nextcloud-server-09940bcde697df90423cb0b4ecb4e62ba31bfaf7.zip
List trashbin in DAV
First steps for #1332 * Add a new DAV collection * List all files in the trashbin for this user * Deleting files from trashbin * Get files from trashbin (just read) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/files_trashbin/lib')
-rw-r--r--apps/files_trashbin/lib/AppInfo/Application.php13
-rw-r--r--apps/files_trashbin/lib/Sabre/RootCollection.php58
-rw-r--r--apps/files_trashbin/lib/Sabre/TrashFile.php77
-rw-r--r--apps/files_trashbin/lib/Sabre/TrashFolder.php102
-rw-r--r--apps/files_trashbin/lib/Sabre/TrashFolderFile.php81
-rw-r--r--apps/files_trashbin/lib/Sabre/TrashFolderFolder.php110
-rw-r--r--apps/files_trashbin/lib/Sabre/TrashHome.php116
7 files changed, 557 insertions, 0 deletions
diff --git a/apps/files_trashbin/lib/AppInfo/Application.php b/apps/files_trashbin/lib/AppInfo/Application.php
index e9d4e6ecc1d..ea27c8c16ea 100644
--- a/apps/files_trashbin/lib/AppInfo/Application.php
+++ b/apps/files_trashbin/lib/AppInfo/Application.php
@@ -23,6 +23,7 @@
namespace OCA\Files_Trashbin\AppInfo;
+use OCA\DAV\Connector\Sabre\Principal;
use OCP\AppFramework\App;
use OCA\Files_Trashbin\Expiration;
use OCP\AppFramework\Utility\ITimeFactory;
@@ -47,5 +48,17 @@ class Application extends App {
$c->query(ITimeFactory::class)
);
});
+
+ /*
+ * Register $principalBackend for the DAV collection
+ */
+ $container->registerService('principalBackend', function () {
+ return new Principal(
+ \OC::$server->getUserManager(),
+ \OC::$server->getGroupManager(),
+ \OC::$server->getShareManager(),
+ \OC::$server->getUserSession()
+ );
+ });
}
}
diff --git a/apps/files_trashbin/lib/Sabre/RootCollection.php b/apps/files_trashbin/lib/Sabre/RootCollection.php
new file mode 100644
index 00000000000..226fc33e58e
--- /dev/null
+++ b/apps/files_trashbin/lib/Sabre/RootCollection.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Files_Trashbin\Sabre;
+
+use Sabre\DAV\INode;
+use Sabre\DAVACL\AbstractPrincipalCollection;
+use Sabre\DAVACL\PrincipalBackend;
+
+class RootCollection extends AbstractPrincipalCollection {
+
+ public function __construct(PrincipalBackend\BackendInterface $principalBackend) {
+ parent::__construct($principalBackend, 'principals/users');
+ }
+
+ /**
+ * This method returns a node for a principal.
+ *
+ * The passed array contains principal information, and is guaranteed to
+ * at least contain a uri item. Other properties may or may not be
+ * supplied by the authentication backend.
+ *
+ * @param array $principalInfo
+ * @return INode
+ */
+ public function getChildForPrincipal(array $principalInfo) {
+ list(,$name) = \Sabre\Uri\split($principalInfo['uri']);
+ $user = \OC::$server->getUserSession()->getUser();
+ if (is_null($user) || $name !== $user->getUID()) {
+ throw new \Sabre\DAV\Exception\Forbidden();
+ }
+ return new TrashHome($principalInfo);
+ }
+
+ public function getName() {
+ return 'trashbin';
+ }
+
+}
diff --git a/apps/files_trashbin/lib/Sabre/TrashFile.php b/apps/files_trashbin/lib/Sabre/TrashFile.php
new file mode 100644
index 00000000000..39b788a2e2c
--- /dev/null
+++ b/apps/files_trashbin/lib/Sabre/TrashFile.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Files_Trashbin\Sabre;
+
+use OCP\Files\FileInfo;
+use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\IFile;
+
+class TrashFile implements IFile {
+ /** @var string */
+ private $userId;
+
+ /** @var FileInfo */
+ private $data;
+
+ public function __construct(string $userId, FileInfo $data) {
+ $this->userId = $userId;
+ $this->data = $data;
+ }
+
+ public function put($data) {
+ throw new Forbidden();
+ }
+
+ public function get() {
+ return $this->data->getStorage()->fopen($this->data->getInternalPath().'.d'.$this->getLastModified(), 'rb');
+ }
+
+ public function getContentType() {
+ return $this->data->getMimetype();
+ }
+
+ public function getETag() {
+ return $this->data->getEtag();
+ }
+
+ public function getSize() {
+ return $this->data->getSize();
+ }
+
+ public function delete() {
+ \OCA\Files_Trashbin\Trashbin::delete($this->data->getName(), $this->userId, $this->getLastModified());
+ }
+
+ public function getName() {
+ return $this->data->getName() . '.d' . $this->getLastModified();
+ }
+
+ public function setName($name) {
+ throw new Forbidden();
+ }
+
+ public function getLastModified() {
+ return $this->data->getMtime();
+ }
+
+}
diff --git a/apps/files_trashbin/lib/Sabre/TrashFolder.php b/apps/files_trashbin/lib/Sabre/TrashFolder.php
new file mode 100644
index 00000000000..2f97a73ebfd
--- /dev/null
+++ b/apps/files_trashbin/lib/Sabre/TrashFolder.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Files_Trashbin\Sabre;
+
+use OCP\Files\FileInfo;
+use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\ICollection;
+
+class TrashFolder implements ICollection {
+ /** @var string */
+ private $userId;
+
+ /** @var FileInfo */
+ private $data;
+
+ public function __construct(string $root, string $userId, FileInfo $data) {
+ $this->userId = $userId;
+ $this->data = $data;
+ }
+
+ public function createFile($name, $data = null) {
+ throw new Forbidden();
+ }
+
+ public function createDirectory($name) {
+ throw new Forbidden();
+ }
+
+ public function getChild($name) {
+ $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->getName(), $this->userId);
+
+ foreach ($entries as $entry) {
+ if ($entry->getName() === $name) {
+ if ($entry->getMimetype() === 'httpd/unix-directory') {
+ return new TrashFolderFolder($this->getName(), $this->userId, $entry);
+ }
+ return new TrashFolderFile($this->getName(), $this->userId, $entry);
+ }
+ }
+ }
+
+ public function getChildren() {
+ $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->getName(), $this->userId);
+
+ $children = array_map(function (FileInfo $entry) {
+ if ($entry->getMimetype() === 'httpd/unix-directory') {
+ return new TrashFolderFolder($this->getName(), $this->userId, $entry);
+ }
+ return new TrashFolderFile($this->getName(), $this->userId, $entry);
+ }, $entries);
+
+ return $children;
+ }
+
+ public function childExists($name) {
+ $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->getName(), $this->userId);
+
+ foreach ($entries as $entry) {
+ if ($entry->getName() === $name) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public function delete() {
+ \OCA\Files_Trashbin\Trashbin::delete($this->data->getName(), $this->userId, $this->getLastModified());
+ }
+
+ public function getName() {
+ return $this->data->getName() . '.d' . $this->getLastModified();
+ }
+
+ public function setName($name) {
+ throw new Forbidden();
+ }
+
+ public function getLastModified() {
+ return $this->data->getMtime();
+ }
+}
diff --git a/apps/files_trashbin/lib/Sabre/TrashFolderFile.php b/apps/files_trashbin/lib/Sabre/TrashFolderFile.php
new file mode 100644
index 00000000000..5a9133f3adb
--- /dev/null
+++ b/apps/files_trashbin/lib/Sabre/TrashFolderFile.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Files_Trashbin\Sabre;
+
+use OCP\Files\FileInfo;
+use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\IFile;
+
+class TrashFolderFile implements IFile {
+ /** @var string */
+ private $root;
+
+ /** @var string */
+ private $userId;
+
+ /** @var FileInfo */
+ private $data;
+
+ public function __construct(string $root, string $userId, FileInfo $data) {
+ $this->root = $root;
+ $this->userId = $userId;
+ $this->data = $data;
+ }
+
+ public function put($data) {
+ throw new Forbidden();
+ }
+
+ public function get() {
+ return $this->data->getStorage()->fopen($this->data->getInternalPath(), 'rb');
+ }
+
+ public function getContentType() {
+ return $this->data->getMimetype();
+ }
+
+ public function getETag() {
+ return $this->data->getEtag();
+ }
+
+ public function getSize() {
+ return $this->data->getSize();
+ }
+
+ public function delete() {
+ \OCA\Files_Trashbin\Trashbin::delete($this->root . '/' . $this->getName(), $this->userId, null);
+ }
+
+ public function getName() {
+ return $this->data->getName();
+ }
+
+ public function setName($name) {
+ throw new Forbidden();
+ }
+
+ public function getLastModified() {
+ return $this->data->getMtime();
+ }
+
+}
diff --git a/apps/files_trashbin/lib/Sabre/TrashFolderFolder.php b/apps/files_trashbin/lib/Sabre/TrashFolderFolder.php
new file mode 100644
index 00000000000..21c121c7d46
--- /dev/null
+++ b/apps/files_trashbin/lib/Sabre/TrashFolderFolder.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Files_Trashbin\Sabre;
+
+use OCP\Files\FileInfo;
+use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\ICollection;
+
+class TrashFolderFolder implements ICollection {
+
+ /** @var string */
+ private $root;
+
+
+ /** @var string */
+ private $userId;
+
+ /** @var FileInfo */
+ private $data;
+
+ public function __construct(string $root, string $userId, FileInfo $data) {
+ $this->root = $root;
+ $this->userId = $userId;
+ $this->data = $data;
+ }
+
+ public function createFile($name, $data = null) {
+ throw new Forbidden();
+ }
+
+ public function createDirectory($name) {
+ throw new Forbidden();
+ }
+
+ public function getChild($name) {
+ $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root . '/' . $this->getName(), $this->userId);
+
+ foreach ($entries as $entry) {
+ if ($entry->getName() === $name) {
+ if ($entry->getMimetype() === 'httpd/unix-directory') {
+ return new TrashFolderFolder($this->root . '/' . $this->getName(), $this->userId, $entry);
+ }
+ return new TrashFolderFile($this->root . '/' . $this->getName(), $this->userId, $entry);
+ }
+ }
+ }
+
+ public function getChildren() {
+ $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root . '/' . $this->getName(), $this->userId);
+
+ $children = array_map(function (FileInfo $entry) {
+ if ($entry->getMimetype() === 'httpd/unix-directory') {
+ return new TrashFolderFolder($this->root.'/'.$this->getName(), $this->userId, $entry);
+ }
+ return new TrashFolderFile($this->root.'/'.$this->getName(), $this->userId, $entry);
+ }, $entries);
+
+ return $children;
+ }
+
+ public function childExists($name) {
+ $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root . '/' . $this->getName(), $this->userId);
+
+ foreach ($entries as $entry) {
+ if ($entry->getName() === $name) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public function delete() {
+ \OCA\Files_Trashbin\Trashbin::delete($this->root . '/' . $this->getName(), $this->userId, null);
+ }
+
+ public function getName() {
+ return $this->data->getName();
+
+ }
+
+ public function setName($name) {
+ throw new Forbidden();
+ }
+
+ function getLastModified() {
+ return $this->data->getMtime();
+ }
+
+}
diff --git a/apps/files_trashbin/lib/Sabre/TrashHome.php b/apps/files_trashbin/lib/Sabre/TrashHome.php
new file mode 100644
index 00000000000..45a95ccea80
--- /dev/null
+++ b/apps/files_trashbin/lib/Sabre/TrashHome.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Files_Trashbin\Sabre;
+
+use OCP\Files\FileInfo;
+use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\Exception\NotFound;
+use Sabre\DAV\ICollection;
+
+class TrashHome implements ICollection {
+
+ /**
+ * @var array
+ */
+ private $principalInfo;
+
+ /**
+ * FilesHome constructor.
+ *
+ * @param array $principalInfo
+ */
+ public function __construct($principalInfo) {
+ $this->principalInfo = $principalInfo;
+ }
+
+ public function delete() {
+ throw new Forbidden('Permission denied to delete your trashbin');
+ }
+
+ public function getName(): string {
+ list(,$name) = \Sabre\Uri\split($this->principalInfo['uri']);
+ return $name;
+ }
+
+ public function setName($name) {
+ throw new Forbidden('Permission denied to rename this trashbin');
+ }
+
+ public function createFile($name, $data = null) {
+ throw new Forbidden('Not allowed to create files in the trashbin');
+ }
+
+ public function createDirectory($name) {
+ throw new Forbidden('Not allowed to create folders in the trashbin');
+ }
+
+ public function getChild($name) {
+ list(,$userId) = \Sabre\Uri\split($this->principalInfo['uri']);
+
+ $entries = \OCA\Files_Trashbin\Helper::getTrashFiles('/', $userId);
+
+ foreach ($entries as $entry) {
+ if ($entry->getName() . '.d'.$entry->getMtime() === $name) {
+ if ($entry->getMimetype() === 'httpd/unix-directory') {
+ return new TrashFolder('/', $userId, $entry);
+ }
+ return new TrashFile($userId, $entry);
+ }
+ }
+
+ throw new NotFound();
+ }
+
+ public function getChildren() {
+ list(,$userId) = \Sabre\Uri\split($this->principalInfo['uri']);
+
+ $entries = \OCA\Files_Trashbin\Helper::getTrashFiles('/', $userId);
+
+ $children = array_map(function (FileInfo $entry) use ($userId) {
+ if ($entry->getMimetype() === 'httpd/unix-directory') {
+ return new TrashFolder('/', $userId, $entry);
+ }
+ return new TrashFile($userId, $entry);
+ }, $entries);
+
+ return $children;
+ }
+
+ public function childExists($name) {
+ list(,$userId) = \Sabre\Uri\split($this->principalInfo['uri']);
+
+ $entries = \OCA\Files_Trashbin\Helper::getTrashFiles('/', $userId);
+
+ foreach ($entries as $entry) {
+ if ($entry->getName() . '.d'.$entry->getMtime() === $name) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public function getLastModified() {
+ return 0;
+ }
+}