Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>tags/v14.0.0beta1
@@ -25,5 +25,8 @@ return [ | |||
'routes' => [ | |||
['name' => 'birthday_calendar#enable', 'url' => '/enableBirthdayCalendar', 'verb' => 'POST'], | |||
['name' => 'birthday_calendar#disable', 'url' => '/disableBirthdayCalendar', 'verb' => 'POST'], | |||
] | |||
], | |||
'ocs' => [ | |||
['name' => 'direct#getUrl', 'url' => '/api/v1/direct', 'verb' => 'POST'], | |||
], | |||
]; |
@@ -0,0 +1,39 @@ | |||
<?php | |||
declare(strict_types=1); | |||
/** | |||
* @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/>. | |||
* | |||
*/ | |||
// no php execution timeout for webdav | |||
if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) { | |||
@set_time_limit(0); | |||
} | |||
ignore_user_abort(true); | |||
// Turn off output buffering to prevent memory problems | |||
\OC_Util::obEnd(); | |||
$requestUri = \OC::$server->getRequest()->getRequestUri(); | |||
$serverFactory = new \OCA\DAV\Direct\ServerFactory(\OC::$server->getConfig()); | |||
$server = $serverFactory->createServer($baseuri, $requestUri); | |||
$server->exec(); |
@@ -109,6 +109,7 @@ return array( | |||
'OCA\\DAV\\Connector\\Sabre\\TagList' => $baseDir . '/../lib/Connector/Sabre/TagList.php', | |||
'OCA\\DAV\\Connector\\Sabre\\TagsPlugin' => $baseDir . '/../lib/Connector/Sabre/TagsPlugin.php', | |||
'OCA\\DAV\\Controller\\BirthdayCalendarController' => $baseDir . '/../lib/Controller/BirthdayCalendarController.php', | |||
'OCA\\DAV\\Controller\\DirectController' => $baseDir . '/../lib/Controller/DirectController.php', | |||
'OCA\\DAV\\DAV\\CustomPropertiesBackend' => $baseDir . '/../lib/DAV/CustomPropertiesBackend.php', | |||
'OCA\\DAV\\DAV\\GroupPrincipalBackend' => $baseDir . '/../lib/DAV/GroupPrincipalBackend.php', | |||
'OCA\\DAV\\DAV\\PublicAuth' => $baseDir . '/../lib/DAV/PublicAuth.php', | |||
@@ -118,6 +119,12 @@ return array( | |||
'OCA\\DAV\\DAV\\Sharing\\Xml\\Invite' => $baseDir . '/../lib/DAV/Sharing/Xml/Invite.php', | |||
'OCA\\DAV\\DAV\\Sharing\\Xml\\ShareRequest' => $baseDir . '/../lib/DAV/Sharing/Xml/ShareRequest.php', | |||
'OCA\\DAV\\DAV\\SystemPrincipalBackend' => $baseDir . '/../lib/DAV/SystemPrincipalBackend.php', | |||
'OCA\\DAV\\Db\\Direct' => $baseDir . '/../lib/Db/Direct.php', | |||
'OCA\\DAV\\Db\\DirectMapper' => $baseDir . '/../lib/Db/DirectMapper.php', | |||
'OCA\\DAV\\Direct\\DirectFile' => $baseDir . '/../lib/Direct/DirectFile.php', | |||
'OCA\\DAV\\Direct\\DirectHome' => $baseDir . '/../lib/Direct/DirectHome.php', | |||
'OCA\\DAV\\Direct\\Server' => $baseDir . '/../lib/Direct/Server.php', | |||
'OCA\\DAV\\Direct\\ServerFactory' => $baseDir . '/../lib/Direct/ServerFactory.php', | |||
'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => $baseDir . '/../lib/Files/BrowserErrorPagePlugin.php', | |||
'OCA\\DAV\\Files\\FileSearchBackend' => $baseDir . '/../lib/Files/FileSearchBackend.php', | |||
'OCA\\DAV\\Files\\FilesHome' => $baseDir . '/../lib/Files/FilesHome.php', | |||
@@ -133,6 +140,7 @@ return array( | |||
'OCA\\DAV\\Migration\\Version1004Date20170919104507' => $baseDir . '/../lib/Migration/Version1004Date20170919104507.php', | |||
'OCA\\DAV\\Migration\\Version1004Date20170924124212' => $baseDir . '/../lib/Migration/Version1004Date20170924124212.php', | |||
'OCA\\DAV\\Migration\\Version1004Date20170926103422' => $baseDir . '/../lib/Migration/Version1004Date20170926103422.php', | |||
'OCA\\DAV\\Migration\\Version1005Date20180413093149' => $baseDir . '/../lib/Migration/Version1005Date20180413093149.php', | |||
'OCA\\DAV\\RootCollection' => $baseDir . '/../lib/RootCollection.php', | |||
'OCA\\DAV\\Server' => $baseDir . '/../lib/Server.php', | |||
'OCA\\DAV\\Settings\\CalDAVSettings' => $baseDir . '/../lib/Settings/CalDAVSettings.php', |
@@ -124,6 +124,7 @@ class ComposerStaticInitDAV | |||
'OCA\\DAV\\Connector\\Sabre\\TagList' => __DIR__ . '/..' . '/../lib/Connector/Sabre/TagList.php', | |||
'OCA\\DAV\\Connector\\Sabre\\TagsPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/TagsPlugin.php', | |||
'OCA\\DAV\\Controller\\BirthdayCalendarController' => __DIR__ . '/..' . '/../lib/Controller/BirthdayCalendarController.php', | |||
'OCA\\DAV\\Controller\\DirectController' => __DIR__ . '/..' . '/../lib/Controller/DirectController.php', | |||
'OCA\\DAV\\DAV\\CustomPropertiesBackend' => __DIR__ . '/..' . '/../lib/DAV/CustomPropertiesBackend.php', | |||
'OCA\\DAV\\DAV\\GroupPrincipalBackend' => __DIR__ . '/..' . '/../lib/DAV/GroupPrincipalBackend.php', | |||
'OCA\\DAV\\DAV\\PublicAuth' => __DIR__ . '/..' . '/../lib/DAV/PublicAuth.php', | |||
@@ -133,6 +134,12 @@ class ComposerStaticInitDAV | |||
'OCA\\DAV\\DAV\\Sharing\\Xml\\Invite' => __DIR__ . '/..' . '/../lib/DAV/Sharing/Xml/Invite.php', | |||
'OCA\\DAV\\DAV\\Sharing\\Xml\\ShareRequest' => __DIR__ . '/..' . '/../lib/DAV/Sharing/Xml/ShareRequest.php', | |||
'OCA\\DAV\\DAV\\SystemPrincipalBackend' => __DIR__ . '/..' . '/../lib/DAV/SystemPrincipalBackend.php', | |||
'OCA\\DAV\\Db\\Direct' => __DIR__ . '/..' . '/../lib/Db/Direct.php', | |||
'OCA\\DAV\\Db\\DirectMapper' => __DIR__ . '/..' . '/../lib/Db/DirectMapper.php', | |||
'OCA\\DAV\\Direct\\DirectFile' => __DIR__ . '/..' . '/../lib/Direct/DirectFile.php', | |||
'OCA\\DAV\\Direct\\DirectHome' => __DIR__ . '/..' . '/../lib/Direct/DirectHome.php', | |||
'OCA\\DAV\\Direct\\Server' => __DIR__ . '/..' . '/../lib/Direct/Server.php', | |||
'OCA\\DAV\\Direct\\ServerFactory' => __DIR__ . '/..' . '/../lib/Direct/ServerFactory.php', | |||
'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => __DIR__ . '/..' . '/../lib/Files/BrowserErrorPagePlugin.php', | |||
'OCA\\DAV\\Files\\FileSearchBackend' => __DIR__ . '/..' . '/../lib/Files/FileSearchBackend.php', | |||
'OCA\\DAV\\Files\\FilesHome' => __DIR__ . '/..' . '/../lib/Files/FilesHome.php', | |||
@@ -148,6 +155,7 @@ class ComposerStaticInitDAV | |||
'OCA\\DAV\\Migration\\Version1004Date20170919104507' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170919104507.php', | |||
'OCA\\DAV\\Migration\\Version1004Date20170924124212' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170924124212.php', | |||
'OCA\\DAV\\Migration\\Version1004Date20170926103422' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170926103422.php', | |||
'OCA\\DAV\\Migration\\Version1005Date20180413093149' => __DIR__ . '/..' . '/../lib/Migration/Version1005Date20180413093149.php', | |||
'OCA\\DAV\\RootCollection' => __DIR__ . '/..' . '/../lib/RootCollection.php', | |||
'OCA\\DAV\\Server' => __DIR__ . '/..' . '/../lib/Server.php', | |||
'OCA\\DAV\\Settings\\CalDAVSettings' => __DIR__ . '/..' . '/../lib/Settings/CalDAVSettings.php', |
@@ -0,0 +1,61 @@ | |||
<?php | |||
declare(strict_types=1); | |||
/** | |||
* @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\DAV\Controller; | |||
use OCA\DAV\Db\DirectMapper; | |||
use OCP\AppFramework\OCSController; | |||
use OCP\Files\IRootFolder; | |||
use OCP\IDBConnection; | |||
use OCP\IRequest; | |||
use OCP\IUserManager; | |||
class DirectController extends OCSController { | |||
/** @var IRootFolder */ | |||
private $rootFolder; | |||
/** @var string */ | |||
private $userId; | |||
/** @var DirectMapper */ | |||
private $mapper; | |||
public function __construct(string $appName, | |||
IRequest $request, | |||
IRootFolder $rootFolder, | |||
string $userId, | |||
DirectMapper $mapper) { | |||
parent::__construct($appName, $request); | |||
$this->rootFolder = $rootFolder; | |||
$this->userId = $userId; | |||
$this->mapper = $mapper; | |||
} | |||
public function getUrl(int $fileId) { | |||
} | |||
} |
@@ -0,0 +1,79 @@ | |||
<?php | |||
declare(strict_types=1); | |||
/** | |||
* @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\DAV\Direct; | |||
use OCP\Files\File; | |||
use Sabre\DAV\Exception\Forbidden; | |||
use Sabre\DAV\IFile; | |||
class DirectFile implements IFile { | |||
/** @var File */ | |||
private $file; | |||
public function __construct(File $file) { | |||
$this->file = $file; | |||
} | |||
function put($data) { | |||
throw new Forbidden(); | |||
} | |||
function get() { | |||
// TODO: Implement get() method. | |||
} | |||
function getContentType() { | |||
// TODO: Implement getContentType() method. | |||
} | |||
function getETag() { | |||
return $this->file->getEtag(); | |||
// TODO: Implement getETag() method. | |||
} | |||
function getSize() { | |||
return $this->file->getSize(); | |||
// TODO: Implement getSize() method. | |||
} | |||
function delete() { | |||
throw new Forbidden(); | |||
// TODO: Implement delete() method. | |||
} | |||
function getName() { | |||
return $this->file->getName(); | |||
} | |||
function setName($name) { | |||
throw new Forbidden(); | |||
} | |||
function getLastModified() { | |||
return $this->file->getMTime(); | |||
// TODO: Implement getLastModified() method. | |||
} | |||
} |
@@ -0,0 +1,89 @@ | |||
<?php | |||
declare(strict_types=1); | |||
/** | |||
* @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\DAV\Direct; | |||
use OCP\Files\File; | |||
use OCP\Files\IRootFolder; | |||
use Sabre\DAV\Exception\Forbidden; | |||
use Sabre\DAV\Exception\NotFound; | |||
use Sabre\DAV\ICollection; | |||
class DirectHome implements ICollection { | |||
/** @var IRootFolder */ | |||
private $rootFolder; | |||
public function __construct(IRootFolder $rootFolder) { | |||
$this->rootFolder = $rootFolder; | |||
} | |||
function createFile($name, $data = null) { | |||
throw new Forbidden(); | |||
} | |||
function createDirectory($name) { | |||
throw new Forbidden(); | |||
} | |||
function getChild($name) { | |||
throw new NotFound(); | |||
} | |||
function getChildren() { | |||
$adminFolder = $this->rootFolder->getUserFolder('admin'); | |||
$listing = $adminFolder->getDirectoryListing(); | |||
$res = []; | |||
foreach ($listing as $file) { | |||
if ($file instanceof File) { | |||
$res[] = new DirectFile($file); | |||
} | |||
} | |||
return $res; | |||
} | |||
function childExists($name) { | |||
return false; | |||
} | |||
function delete() { | |||
throw new Forbidden(); | |||
} | |||
function getName() { | |||
return 'direct'; | |||
} | |||
function setName($name) { | |||
throw new Forbidden(); | |||
} | |||
function getLastModified() { | |||
return 0; | |||
} | |||
} |
@@ -0,0 +1,33 @@ | |||
<?php | |||
declare(strict_types=1); | |||
/** | |||
* @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\DAV\Direct; | |||
class Server extends \Sabre\DAV\Server { | |||
public function __construct($treeOrNode = null) { | |||
parent::__construct($treeOrNode); | |||
self::$exposeVersion = false; | |||
$this->enablePropfindDepthInfinityf = false; | |||
} | |||
} |
@@ -0,0 +1,51 @@ | |||
<?php | |||
declare(strict_types=1); | |||
/** | |||
* @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\DAV\Direct; | |||
use OCP\IConfig; | |||
class ServerFactory { | |||
/** @var IConfig */ | |||
private $config; | |||
public function __construct(IConfig $config) { | |||
$this->config = $config; | |||
} | |||
public function createServer(string $baseURI, | |||
string $requestURI) { | |||
$home = new DirectHome(\OC::$server->getRootFolder()); | |||
$server = new Server($home); | |||
$server->httpRequest->setUrl($requestURI); | |||
$server->setBaseUri($baseURI); | |||
$server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin($this->config)); | |||
return $server; | |||
} | |||
} |
@@ -100,6 +100,7 @@ function resolveService($service) { | |||
'carddav' => 'dav/appinfo/v1/carddav.php', | |||
'contacts' => 'dav/appinfo/v1/carddav.php', | |||
'files' => 'dav/appinfo/v1/webdav.php', | |||
'direct' => 'dav/appinfo/v2/direct.php', | |||
]; | |||
if (isset($services[$service])) { | |||
return $services[$service]; |