Skip to content

Add "fileids" virtual collection with file ids #28947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
PVince81 wants to merge 1 commit into from
Closed

Add "fileids" virtual collection with file ids #28947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 54 additions & 3 deletions apps/dav/lib/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@
use OCA\DAV\AppInfo\PluginManager;
use OCA\DAV\Connector\Sabre\MaintenancePlugin;
use OCA\DAV\Connector\Sabre\ValidateRequestPlugin;
use Sabre\HTTP\ResponseInterface;
use Sabre\HTTP\RequestInterface;
use OCP\Files\Folder;
use OCP\IUserSession;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\Exception\MethodNotAllowed;
use OCP\Files\NotFoundException;

class Server {

Expand Down Expand Up @@ -163,12 +170,19 @@ public function __construct(IRequest $request, $baseUri) {
}

// wait with registering these until auth is handled and the filesystem is setup
$this->server->on('beforeMethod', function () use ($root) {
$this->server->on('beforeMethod', function (RequestInterface $request, ResponseInterface $response) use ($root) {
// custom properties plugin must be the last one
$userSession = \OC::$server->getUserSession();
$user = $userSession->getUser();
if (!is_null($user)) {
$view = \OC\Files\Filesystem::getView();

// TODO: switch to LazyUserFolder
$userFolder = \OC::$server->getUserFolder();
if ($this->handleRedirectFileId($request, $response, $userSession, $userFolder) === false) {
return false;
}

$this->server->addPlugin(
new FilesPlugin(
$this->server->tree,
Expand Down Expand Up @@ -213,8 +227,6 @@ public function __construct(IRequest $request, $baseUri) {
$this->server->tree, \OC::$server->getTagManager()
)
);
// TODO: switch to LazyUserFolder
$userFolder = \OC::$server->getUserFolder();
$this->server->addPlugin(new SharesPlugin(
$this->server->tree,
$userSession,
Expand Down Expand Up @@ -252,6 +264,45 @@ public function __construct(IRequest $request, $baseUri) {
});
}

private function handleRedirectFileId(RequestInterface $request, ResponseInterface $response, IUserSession $userSession, Folder $userFolder) {
$sections = explode('/', $request->getPath());
if (count($sections) < 3 || $sections[0] !== 'meta' || $sections[2] !== 'link') {
return;
}

if (count($sections) > 3) {
// trying to access sub-entry of link...
throw new NotFound();
}

$fileId = $sections[1];

$results = $userFolder->getById($fileId);
if (empty($results)) {
throw new NotFound('File with id ' . $fileId . ' not found');
}

$node = $results[0];
$nodePath = trim($userFolder->getRelativePath($node->getPath()), '/');

$nodePath = implode(
'/', array_map(
rawurlencode,
explode('/', $nodePath)
)
);

// redirect
$davPath = rtrim($request->getBaseUrl(), '/') . '/files/' . rawurlencode($userSession->getUser()->getUid()) . '/' . $nodePath;
$response->setStatus(302);
$response->setHeader('Location', $davPath);
$response->setHeader('Redirect-ref', 'URI');

$this->server->sapi->sendResponse($response);

return false;
}

public function exec() {
$this->server->exec();
}
Expand Down