-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use Webdav PUT for uploads in the web browser
- uses PUT method with jquery.fileupload for regular and public file lists - for IE and browsers that don't support it, use POST with iframe transport - implemented Sabre plugin to handle iframe transport and redirect the embedded PUT request to the proper handler - added RFC5995 POST to file collection with "add-member" property to make it possible to auto-rename conflicting file names - remove obsolete ajax/upload.php and obsolete ajax routes
- Loading branch information
Vincent Petry
committed
Dec 21, 2015
1 parent
0c16909
commit 5e88bef
Showing
16 changed files
with
1,302 additions
and
715 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| <?php | ||
| /** | ||
| * @author Vincent Petry <pvince81@owncloud.com> | ||
| * | ||
| * @copyright Copyright (c) 2015, 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 OCA\DAV\Connector\Sabre; | ||
|
|
||
| use Sabre\DAV\IFile; | ||
| use Sabre\HTTP\RequestInterface; | ||
| use Sabre\HTTP\ResponseInterface; | ||
| use Sabre\DAV\Exception\BadRequest; | ||
|
|
||
| /** | ||
| * Plugin to receive Webdav PUT through POST, | ||
| * mostly used as a workaround for browsers that | ||
| * do not support PUT upload. | ||
| */ | ||
| class IFrameTransportPlugin extends \Sabre\DAV\ServerPlugin { | ||
|
|
||
| /** | ||
| * @var \Sabre\DAV\Server $server | ||
| */ | ||
| private $server; | ||
|
|
||
| /** | ||
| * This initializes the plugin. | ||
| * | ||
| * @param \Sabre\DAV\Server $server | ||
| * @return void | ||
| */ | ||
| public function initialize(\Sabre\DAV\Server $server) { | ||
| $this->server = $server; | ||
| $this->server->on('method:POST', [$this, 'handlePost']); | ||
| } | ||
|
|
||
| /** | ||
| * POST operation | ||
| * | ||
| * @param RequestInterface $request request object | ||
| * @param ResponseInterface $response response object | ||
| * @return null|false | ||
| */ | ||
| public function handlePost(RequestInterface $request, ResponseInterface $response) { | ||
| try { | ||
| return $this->processUpload($request, $response); | ||
| } catch (\Sabre\DAV\Exception $e) { | ||
| $response->setStatus($e->getHTTPCode()); | ||
| $response->setBody(['message' => $e->getMessage()]); | ||
| $this->convertResponse($response); | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Wrap and send response in JSON format | ||
| * | ||
| * @param ResponseInterface $response response object | ||
| */ | ||
| private function convertResponse(ResponseInterface $response) { | ||
| if (is_resource($response->getBody())) { | ||
| throw new BadRequest('Cannot request binary data with iframe transport'); | ||
| } | ||
|
|
||
| $responseData = json_encode([ | ||
| 'status' => $response->getStatus(), | ||
| 'headers' => $response->getHeaders(), | ||
| 'data' => $response->getBody(), | ||
| ]); | ||
|
|
||
| // IE needs this content type | ||
| $response->setHeader('Content-Type', 'text/plain'); | ||
| $response->setHeader('Content-Length', strlen($responseData)); | ||
| $response->setStatus(200); | ||
| $response->setBody($responseData); | ||
| } | ||
|
|
||
| /** | ||
| * Process upload | ||
| * | ||
| * @param RequestInterface $request request object | ||
| * @param ResponseInterface $response response object | ||
| * @return null|false | ||
| */ | ||
| private function processUpload(RequestInterface $request, ResponseInterface $response) { | ||
| $queryParams = $request->getQueryParameters(); | ||
|
|
||
| if (!isset($queryParams['_method'])) { | ||
| return null; | ||
| } | ||
|
|
||
| $method = $queryParams['_method']; | ||
| if ($method !== 'PUT') { | ||
| return null; | ||
| } | ||
|
|
||
| $contentType = $request->getHeader('Content-Type'); | ||
| list($contentType) = explode(';', $contentType); | ||
| if ($contentType !== 'application/x-www-form-urlencoded' | ||
| && $contentType !== 'multipart/form-data' | ||
| ) { | ||
| return null; | ||
| } | ||
|
|
||
| if (!isset($_FILES['files'])) { | ||
| return null; | ||
| } | ||
|
|
||
| // TODO: move this to another plugin ? | ||
| if (!\OC::$CLI && !\OC::$server->getRequest()->passesCSRFCheck()) { | ||
| throw new BadRequest('Invalid CSRF token'); | ||
| } | ||
|
|
||
| if ($_FILES) { | ||
| $file = current($_FILES); | ||
| } else { | ||
| return null; | ||
| } | ||
|
|
||
| if ($file['error'][0] !== 0) { | ||
| throw new BadRequest('Error during upload, code ' . $file['error'][0]); | ||
| } | ||
|
|
||
| if (!\OC::$CLI && !is_uploaded_file($file['tmp_name'][0])) { | ||
| return null; | ||
| } | ||
|
|
||
| if (count($file['tmp_name']) > 1) { | ||
| throw new BadRequest('Only a single file can be uploaded'); | ||
| } | ||
|
|
||
| $postData = $request->getPostData(); | ||
| if (isset($postData['headers'])) { | ||
| $headers = json_decode($postData['headers'], true); | ||
|
|
||
| // copy safe headers into the request | ||
| $allowedHeaders = [ | ||
| 'If', | ||
| 'If-Match', | ||
| 'If-None-Match', | ||
| 'If-Modified-Since', | ||
| 'If-Unmodified-Since', | ||
| 'Authorization', | ||
| ]; | ||
|
|
||
| foreach ($allowedHeaders as $allowedHeader) { | ||
| if (isset($headers[$allowedHeader])) { | ||
| $request->setHeader($allowedHeader, $headers[$allowedHeader]); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // MEGAHACK, because the Sabre File impl reads this property directly | ||
| $_SERVER['CONTENT_LENGTH'] = $file['size'][0]; | ||
| $request->setHeader('Content-Length', $file['size'][0]); | ||
|
|
||
| $tmpFile = $file['tmp_name'][0]; | ||
| $resource = fopen($tmpFile, 'r'); | ||
|
|
||
| $request->setBody($resource); | ||
| $request->setMethod($method); | ||
|
|
||
| $this->server->invokeMethod($request, $response, false); | ||
|
|
||
| fclose($resource); | ||
| unlink($tmpFile); | ||
|
|
||
| $this->convertResponse($response); | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.