2011-07-20 17:53:34 +04:00
|
|
|
<?php
|
2015-02-26 13:37:37 +03:00
|
|
|
/**
|
2015-03-26 13:44:34 +03:00
|
|
|
* @author Bart Visscher <bartv@thisnet.nl>
|
|
|
|
* @author Björn Schießle <schiessle@owncloud.com>
|
|
|
|
* @author chli1 <chli1@users.noreply.github.com>
|
|
|
|
* @author Chris Wilson <chris+github@qwirx.com>
|
|
|
|
* @author Jakob Sack <mail@jakobsack.de>
|
|
|
|
* @author Joas Schilling <nickvergessen@owncloud.com>
|
|
|
|
* @author Jörn Friedrich Dreyer <jfd@butonic.de>
|
|
|
|
* @author Lukas Reschke <lukas@owncloud.com>
|
|
|
|
* @author Morris Jobke <hey@morrisjobke.de>
|
|
|
|
* @author Owen Winkler <a_github@midnightcircus.com>
|
|
|
|
* @author Robin Appelman <icewind@owncloud.com>
|
|
|
|
* @author Robin McCorkell <rmccorkell@karoshi.org.uk>
|
|
|
|
* @author Thomas Müller <thomas.mueller@tmit.eu>
|
|
|
|
* @author Thomas Tanghus <thomas@tanghus.net>
|
|
|
|
* @author Vincent Petry <pvince81@owncloud.com>
|
2015-02-26 13:37:37 +03:00
|
|
|
*
|
2015-03-26 13:44:34 +03:00
|
|
|
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
|
|
|
* @license AGPL-3.0
|
2015-02-26 13:37:37 +03:00
|
|
|
*
|
2015-03-26 13:44:34 +03:00
|
|
|
* 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.
|
2015-02-26 13:37:37 +03:00
|
|
|
*
|
2015-03-26 13:44:34 +03:00
|
|
|
* This program is distributed in the hope that it will be useful,
|
2015-02-26 13:37:37 +03:00
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2015-03-26 13:44:34 +03:00
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU Affero General Public License for more details.
|
2015-02-26 13:37:37 +03:00
|
|
|
*
|
2015-03-26 13:44:34 +03:00
|
|
|
* 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/>
|
2015-02-26 13:37:37 +03:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2015-02-12 14:29:01 +03:00
|
|
|
namespace OC\Connector\Sabre;
|
|
|
|
|
2015-04-01 17:36:08 +03:00
|
|
|
use OCP\Encryption\Exceptions\GenericEncryptionException;
|
2015-03-30 23:36:48 +03:00
|
|
|
|
2015-02-12 14:29:01 +03:00
|
|
|
class File extends \OC\Connector\Sabre\Node implements \Sabre\DAV\IFile {
|
2011-07-20 17:53:34 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Updates the data
|
|
|
|
*
|
2012-07-21 01:52:47 +04:00
|
|
|
* The data argument is a readable stream resource.
|
|
|
|
*
|
2013-09-30 12:46:50 +04:00
|
|
|
* After a successful put operation, you may choose to return an ETag. The
|
2012-07-21 01:52:47 +04:00
|
|
|
* etag must always be surrounded by double-quotes. These quotes must
|
|
|
|
* appear in the actual string you're returning.
|
|
|
|
*
|
|
|
|
* Clients may use the ETag from a PUT request to later on make sure that
|
|
|
|
* when they update the file, the contents haven't changed in the mean
|
|
|
|
* time.
|
|
|
|
*
|
|
|
|
* If you don't plan to store the file byte-by-byte, and you return a
|
|
|
|
* different object on a subsequent GET you are strongly recommended to not
|
|
|
|
* return an ETag, and just return null.
|
|
|
|
*
|
2011-07-20 17:53:34 +04:00
|
|
|
* @param resource $data
|
2015-02-12 14:29:01 +03:00
|
|
|
*
|
2014-01-09 17:25:48 +04:00
|
|
|
* @throws \Sabre\DAV\Exception\Forbidden
|
2015-02-12 14:29:01 +03:00
|
|
|
* @throws \OC\Connector\Sabre\Exception\UnsupportedMediaType
|
2014-01-09 17:25:48 +04:00
|
|
|
* @throws \Sabre\DAV\Exception\BadRequest
|
|
|
|
* @throws \Sabre\DAV\Exception
|
2015-02-12 14:29:01 +03:00
|
|
|
* @throws \OC\Connector\Sabre\Exception\EntityTooLarge
|
2014-01-09 17:25:48 +04:00
|
|
|
* @throws \Sabre\DAV\Exception\ServiceUnavailable
|
2012-07-21 01:52:47 +04:00
|
|
|
* @return string|null
|
2011-07-20 17:53:34 +04:00
|
|
|
*/
|
|
|
|
public function put($data) {
|
2014-11-06 12:59:36 +03:00
|
|
|
try {
|
|
|
|
if ($this->info && $this->fileView->file_exists($this->path) &&
|
|
|
|
!$this->info->isUpdateable()) {
|
|
|
|
throw new \Sabre\DAV\Exception\Forbidden();
|
|
|
|
}
|
|
|
|
} catch (\OCP\Files\StorageNotAvailableException $e) {
|
Improve debugging for ServiceUnavailable exceptions
I was getting a lot of these in my logs for no apparent reason, and file
uploads were failing:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: ","level":4,"time":"2015-01-06T15:33:39+00:00"}
In order to debug it, I had to add unique messages to all the places where
this exception was thrown, to identify which one it was, and that made the
logs much more useful:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: Encryption is disabled","level":4,"time":"2015-01-06T15:36:47+00:00"}
2015-01-06 18:59:38 +03:00
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("File is not updatable: ".$e->getMessage());
|
2013-06-25 19:04:25 +04:00
|
|
|
}
|
|
|
|
|
2015-02-18 19:44:13 +03:00
|
|
|
// verify path of the target
|
|
|
|
$this->verifyPath();
|
2014-01-13 16:14:05 +04:00
|
|
|
|
2013-09-24 17:14:42 +04:00
|
|
|
// chunked handling
|
|
|
|
if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
|
2013-10-07 19:49:21 +04:00
|
|
|
return $this->createFileChunked($data);
|
2013-09-24 17:14:42 +04:00
|
|
|
}
|
|
|
|
|
2015-02-18 19:44:13 +03:00
|
|
|
list($storage) = $this->fileView->resolvePath($this->path);
|
2015-01-26 19:48:28 +03:00
|
|
|
$needsPartFile = $this->needsPartFile($storage) && (strlen($this->path) > 1);
|
2015-01-07 23:21:51 +03:00
|
|
|
|
|
|
|
if ($needsPartFile) {
|
|
|
|
// mark file as partial while uploading (ignored by the scanner)
|
|
|
|
$partFilePath = $this->path . '.ocTransferId' . rand() . '.part';
|
|
|
|
} else {
|
|
|
|
// upload file directly as the final path
|
|
|
|
$partFilePath = $this->path;
|
|
|
|
}
|
2013-02-22 20:21:57 +04:00
|
|
|
|
2013-09-26 13:50:46 +04:00
|
|
|
try {
|
2014-07-08 11:44:46 +04:00
|
|
|
$putOkay = $this->fileView->file_put_contents($partFilePath, $data);
|
2013-09-26 13:50:46 +04:00
|
|
|
if ($putOkay === false) {
|
|
|
|
\OC_Log::write('webdav', '\OC\Files\Filesystem::file_put_contents() failed', \OC_Log::ERROR);
|
2014-07-08 11:44:46 +04:00
|
|
|
$this->fileView->unlink($partFilePath);
|
2013-09-26 13:50:46 +04:00
|
|
|
// because we have no clue about the cause we can only throw back a 500/Internal Server Error
|
2014-01-09 17:25:48 +04:00
|
|
|
throw new \Sabre\DAV\Exception('Could not write file contents');
|
2013-09-26 13:50:46 +04:00
|
|
|
}
|
|
|
|
} catch (\OCP\Files\NotPermittedException $e) {
|
2013-10-08 17:04:31 +04:00
|
|
|
// a more general case - due to whatever reason the content could not be written
|
2014-01-09 17:25:48 +04:00
|
|
|
throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
|
2013-10-08 17:04:31 +04:00
|
|
|
|
2013-10-07 17:11:47 +04:00
|
|
|
} catch (\OCP\Files\EntityTooLargeException $e) {
|
2013-10-08 17:04:31 +04:00
|
|
|
// the file is too big to be stored
|
2015-02-12 14:29:01 +03:00
|
|
|
throw new \OC\Connector\Sabre\Exception\EntityTooLarge($e->getMessage());
|
2013-10-08 17:04:31 +04:00
|
|
|
|
2013-10-07 17:11:47 +04:00
|
|
|
} catch (\OCP\Files\InvalidContentException $e) {
|
2013-10-08 17:04:31 +04:00
|
|
|
// the file content is not permitted
|
2015-02-12 14:29:01 +03:00
|
|
|
throw new \OC\Connector\Sabre\Exception\UnsupportedMediaType($e->getMessage());
|
2013-10-08 17:04:31 +04:00
|
|
|
|
2013-10-07 17:11:47 +04:00
|
|
|
} catch (\OCP\Files\InvalidPathException $e) {
|
2013-10-08 17:04:31 +04:00
|
|
|
// the path for the file was not valid
|
|
|
|
// TODO: find proper http status code for this case
|
2014-01-09 17:25:48 +04:00
|
|
|
throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
|
2014-05-24 17:18:24 +04:00
|
|
|
} catch (\OCP\Files\LockNotAcquiredException $e) {
|
|
|
|
// the file is currently being written to by another process
|
2015-02-12 14:29:01 +03:00
|
|
|
throw new \OC\Connector\Sabre\Exception\FileLocked($e->getMessage(), $e->getCode(), $e);
|
2015-03-30 23:36:48 +03:00
|
|
|
} catch (GenericEncryptionException $e) {
|
2014-11-04 19:17:29 +03:00
|
|
|
throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
|
2014-11-06 12:59:36 +03:00
|
|
|
} catch (\OCP\Files\StorageNotAvailableException $e) {
|
Improve debugging for ServiceUnavailable exceptions
I was getting a lot of these in my logs for no apparent reason, and file
uploads were failing:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: ","level":4,"time":"2015-01-06T15:33:39+00:00"}
In order to debug it, I had to add unique messages to all the places where
this exception was thrown, to identify which one it was, and that made the
logs much more useful:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: Encryption is disabled","level":4,"time":"2015-01-06T15:36:47+00:00"}
2015-01-06 18:59:38 +03:00
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to write file contents: ".$e->getMessage());
|
2013-09-24 16:25:56 +04:00
|
|
|
}
|
2013-02-22 20:21:57 +04:00
|
|
|
|
2014-11-06 12:59:36 +03:00
|
|
|
try {
|
|
|
|
// if content length is sent by client:
|
|
|
|
// double check if the file was fully received
|
|
|
|
// compare expected and actual size
|
|
|
|
if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] !== 'LOCK') {
|
|
|
|
$expected = $_SERVER['CONTENT_LENGTH'];
|
|
|
|
$actual = $this->fileView->filesize($partFilePath);
|
|
|
|
if ($actual != $expected) {
|
|
|
|
$this->fileView->unlink($partFilePath);
|
|
|
|
throw new \Sabre\DAV\Exception\BadRequest('expected filesize ' . $expected . ' got ' . $actual);
|
|
|
|
}
|
2014-09-04 15:49:15 +04:00
|
|
|
}
|
2014-07-08 11:44:46 +04:00
|
|
|
|
2015-01-07 23:21:51 +03:00
|
|
|
if ($needsPartFile) {
|
|
|
|
// rename to correct path
|
|
|
|
try {
|
|
|
|
$renameOkay = $this->fileView->rename($partFilePath, $this->path);
|
|
|
|
$fileExists = $this->fileView->file_exists($this->path);
|
|
|
|
if ($renameOkay === false || $fileExists === false) {
|
|
|
|
\OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
|
|
|
|
$this->fileView->unlink($partFilePath);
|
|
|
|
throw new \Sabre\DAV\Exception('Could not rename part file to final file');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (\OCP\Files\LockNotAcquiredException $e) {
|
|
|
|
// the file is currently being written to by another process
|
2015-02-12 14:29:01 +03:00
|
|
|
throw new \OC\Connector\Sabre\Exception\FileLocked($e->getMessage(), $e->getCode(), $e);
|
2014-11-06 12:59:36 +03:00
|
|
|
}
|
2014-05-24 17:18:24 +04:00
|
|
|
}
|
2013-02-22 20:21:57 +04:00
|
|
|
|
2014-11-06 12:59:36 +03:00
|
|
|
// allow sync clients to send the mtime along in a header
|
2015-02-10 15:02:48 +03:00
|
|
|
$request = \OC::$server->getRequest();
|
|
|
|
if (isset($request->server['HTTP_X_OC_MTIME'])) {
|
|
|
|
if($this->fileView->touch($this->path, $request->server['HTTP_X_OC_MTIME'])) {
|
2014-11-06 12:59:36 +03:00
|
|
|
header('X-OC-MTime: accepted');
|
|
|
|
}
|
2013-02-10 14:44:34 +04:00
|
|
|
}
|
2014-11-06 12:59:36 +03:00
|
|
|
$this->refreshInfo();
|
|
|
|
} catch (\OCP\Files\StorageNotAvailableException $e) {
|
Improve debugging for ServiceUnavailable exceptions
I was getting a lot of these in my logs for no apparent reason, and file
uploads were failing:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: ","level":4,"time":"2015-01-06T15:33:39+00:00"}
In order to debug it, I had to add unique messages to all the places where
this exception was thrown, to identify which one it was, and that made the
logs much more useful:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: Encryption is disabled","level":4,"time":"2015-01-06T15:36:47+00:00"}
2015-01-06 18:59:38 +03:00
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to check file size: ".$e->getMessage());
|
2013-02-10 14:05:43 +04:00
|
|
|
}
|
2011-07-20 17:53:34 +04:00
|
|
|
|
2014-02-25 19:23:09 +04:00
|
|
|
return '"' . $this->info->getEtag() . '"';
|
2011-07-20 17:53:34 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the data
|
2014-05-11 21:28:45 +04:00
|
|
|
* @return string|resource
|
2015-02-10 15:02:48 +03:00
|
|
|
* @throws \Sabre\DAV\Exception\Forbidden
|
|
|
|
* @throws \Sabre\DAV\Exception\ServiceUnavailable
|
2011-07-20 17:53:34 +04:00
|
|
|
*/
|
|
|
|
public function get() {
|
|
|
|
|
2013-09-24 17:14:42 +04:00
|
|
|
//throw exception if encryption is disabled but files are still encrypted
|
2015-03-31 12:50:53 +03:00
|
|
|
try {
|
|
|
|
return $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
|
2015-04-01 17:36:08 +03:00
|
|
|
} catch (\OCP\Encryption\Exceptions\GenericEncryptionException $e) {
|
2015-03-31 12:50:53 +03:00
|
|
|
throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
|
|
|
|
} catch (\OCP\Files\StorageNotAvailableException $e) {
|
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to open file: ".$e->getMessage());
|
2013-08-14 11:44:29 +04:00
|
|
|
}
|
2011-07-20 17:53:34 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Delete the current file
|
2014-01-09 17:25:48 +04:00
|
|
|
* @throws \Sabre\DAV\Exception\Forbidden
|
2015-02-10 15:02:48 +03:00
|
|
|
* @throws \Sabre\DAV\Exception\ServiceUnavailable
|
2011-07-20 17:53:34 +04:00
|
|
|
*/
|
|
|
|
public function delete() {
|
2014-02-25 19:23:09 +04:00
|
|
|
if (!$this->info->isDeletable()) {
|
2014-01-09 17:25:48 +04:00
|
|
|
throw new \Sabre\DAV\Exception\Forbidden();
|
2013-06-25 19:04:25 +04:00
|
|
|
}
|
2014-09-22 14:19:34 +04:00
|
|
|
|
2014-11-06 12:59:36 +03:00
|
|
|
try {
|
|
|
|
if (!$this->fileView->unlink($this->path)) {
|
|
|
|
// assume it wasn't possible to delete due to permissions
|
|
|
|
throw new \Sabre\DAV\Exception\Forbidden();
|
|
|
|
}
|
|
|
|
} catch (\OCP\Files\StorageNotAvailableException $e) {
|
Improve debugging for ServiceUnavailable exceptions
I was getting a lot of these in my logs for no apparent reason, and file
uploads were failing:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: ","level":4,"time":"2015-01-06T15:33:39+00:00"}
In order to debug it, I had to add unique messages to all the places where
this exception was thrown, to identify which one it was, and that made the
logs much more useful:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: Encryption is disabled","level":4,"time":"2015-01-06T15:36:47+00:00"}
2015-01-06 18:59:38 +03:00
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to unlink: ".$e->getMessage());
|
2014-09-22 14:19:34 +04:00
|
|
|
}
|
2015-02-05 22:43:37 +03:00
|
|
|
}
|
|
|
|
|
2011-07-20 17:53:34 +04:00
|
|
|
/**
|
|
|
|
* Returns the mime-type for a file
|
|
|
|
*
|
|
|
|
* If null is returned, we'll assume application/octet-stream
|
|
|
|
*
|
|
|
|
* @return mixed
|
|
|
|
*/
|
|
|
|
public function getContentType() {
|
2014-04-15 22:05:43 +04:00
|
|
|
$mimeType = $this->info->getMimetype();
|
2011-07-20 17:53:34 +04:00
|
|
|
|
2014-11-11 17:42:50 +03:00
|
|
|
// PROPFIND needs to return the correct mime type, for consistency with the web UI
|
|
|
|
if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PROPFIND' ) {
|
|
|
|
return $mimeType;
|
|
|
|
}
|
2014-04-14 19:17:50 +04:00
|
|
|
return \OC_Helper::getSecureMimeType($mimeType);
|
2011-07-20 17:53:34 +04:00
|
|
|
}
|
2013-10-07 19:49:21 +04:00
|
|
|
|
2015-02-10 15:02:48 +03:00
|
|
|
/**
|
|
|
|
* @return array|false
|
|
|
|
*/
|
2014-12-15 17:20:24 +03:00
|
|
|
public function getDirectDownload() {
|
|
|
|
if (\OCP\App::isEnabled('encryption')) {
|
|
|
|
return [];
|
|
|
|
}
|
|
|
|
/** @var \OCP\Files\Storage $storage */
|
|
|
|
list($storage, $internalPath) = $this->fileView->resolvePath($this->path);
|
|
|
|
if (is_null($storage)) {
|
|
|
|
return [];
|
|
|
|
}
|
|
|
|
|
|
|
|
return $storage->getDirectDownload($internalPath);
|
|
|
|
}
|
|
|
|
|
2014-02-06 19:30:58 +04:00
|
|
|
/**
|
|
|
|
* @param resource $data
|
2014-04-23 17:34:04 +04:00
|
|
|
* @return null|string
|
2015-02-10 15:02:48 +03:00
|
|
|
* @throws \Sabre\DAV\Exception
|
|
|
|
* @throws \Sabre\DAV\Exception\BadRequest
|
|
|
|
* @throws \Sabre\DAV\Exception\NotImplemented
|
|
|
|
* @throws \Sabre\DAV\Exception\ServiceUnavailable
|
2014-02-06 19:30:58 +04:00
|
|
|
*/
|
2013-10-07 19:49:21 +04:00
|
|
|
private function createFileChunked($data)
|
|
|
|
{
|
2015-02-12 14:29:01 +03:00
|
|
|
list($path, $name) = \Sabre\HTTP\URLUtil::splitPath($this->path);
|
2013-10-07 19:49:21 +04:00
|
|
|
|
2015-02-12 14:29:01 +03:00
|
|
|
$info = \OC_FileChunking::decodeName($name);
|
2013-10-07 19:49:21 +04:00
|
|
|
if (empty($info)) {
|
2014-01-09 17:25:48 +04:00
|
|
|
throw new \Sabre\DAV\Exception\NotImplemented();
|
2013-10-07 19:49:21 +04:00
|
|
|
}
|
2015-02-12 14:29:01 +03:00
|
|
|
$chunk_handler = new \OC_FileChunking($info);
|
2013-10-07 19:49:21 +04:00
|
|
|
$bytesWritten = $chunk_handler->store($info['index'], $data);
|
|
|
|
|
|
|
|
//detect aborted upload
|
|
|
|
if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT' ) {
|
|
|
|
if (isset($_SERVER['CONTENT_LENGTH'])) {
|
|
|
|
$expected = $_SERVER['CONTENT_LENGTH'];
|
|
|
|
if ($bytesWritten != $expected) {
|
2013-10-17 22:20:13 +04:00
|
|
|
$chunk_handler->remove($info['index']);
|
2014-01-09 17:25:48 +04:00
|
|
|
throw new \Sabre\DAV\Exception\BadRequest(
|
2013-10-07 19:49:21 +04:00
|
|
|
'expected filesize ' . $expected . ' got ' . $bytesWritten);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($chunk_handler->isComplete()) {
|
2015-01-08 11:46:40 +03:00
|
|
|
list($storage, ) = $this->fileView->resolvePath($path);
|
2015-01-07 23:21:51 +03:00
|
|
|
$needsPartFile = $this->needsPartFile($storage);
|
2013-10-21 15:21:39 +04:00
|
|
|
|
2014-11-06 12:59:36 +03:00
|
|
|
try {
|
2015-01-08 11:46:40 +03:00
|
|
|
$targetPath = $path . '/' . $info['name'];
|
2015-01-07 23:21:51 +03:00
|
|
|
if ($needsPartFile) {
|
|
|
|
// we first assembly the target file as a part file
|
|
|
|
$partFile = $path . '/' . $info['name'] . '.ocTransferId' . $info['transferid'] . '.part';
|
|
|
|
$chunk_handler->file_assemble($partFile);
|
|
|
|
|
|
|
|
// here is the final atomic rename
|
|
|
|
$renameOkay = $this->fileView->rename($partFile, $targetPath);
|
|
|
|
$fileExists = $this->fileView->file_exists($targetPath);
|
|
|
|
if ($renameOkay === false || $fileExists === false) {
|
|
|
|
\OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
|
|
|
|
// only delete if an error occurred and the target file was already created
|
|
|
|
if ($fileExists) {
|
|
|
|
$this->fileView->unlink($targetPath);
|
|
|
|
}
|
|
|
|
throw new \Sabre\DAV\Exception('Could not rename part file assembled from chunks');
|
2014-11-06 12:59:36 +03:00
|
|
|
}
|
2015-01-07 23:21:51 +03:00
|
|
|
} else {
|
|
|
|
// assemble directly into the final file
|
2015-01-08 11:46:40 +03:00
|
|
|
$chunk_handler->file_assemble($targetPath);
|
2014-01-08 21:43:20 +04:00
|
|
|
}
|
2013-10-21 17:00:28 +04:00
|
|
|
|
2014-11-06 12:59:36 +03:00
|
|
|
// allow sync clients to send the mtime along in a header
|
2015-02-10 15:02:48 +03:00
|
|
|
$request = \OC::$server->getRequest();
|
|
|
|
if (isset($request->server['HTTP_X_OC_MTIME'])) {
|
|
|
|
if($this->fileView->touch($targetPath, $request->server['HTTP_X_OC_MTIME'])) {
|
2014-11-06 12:59:36 +03:00
|
|
|
header('X-OC-MTime: accepted');
|
|
|
|
}
|
2013-10-21 17:00:28 +04:00
|
|
|
}
|
|
|
|
|
2014-11-06 12:59:36 +03:00
|
|
|
$info = $this->fileView->getFileInfo($targetPath);
|
|
|
|
return $info->getEtag();
|
|
|
|
} catch (\OCP\Files\StorageNotAvailableException $e) {
|
Improve debugging for ServiceUnavailable exceptions
I was getting a lot of these in my logs for no apparent reason, and file
uploads were failing:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: ","level":4,"time":"2015-01-06T15:33:39+00:00"}
In order to debug it, I had to add unique messages to all the places where
this exception was thrown, to identify which one it was, and that made the
logs much more useful:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: Encryption is disabled","level":4,"time":"2015-01-06T15:36:47+00:00"}
2015-01-06 18:59:38 +03:00
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to put file: ".$e->getMessage());
|
2014-11-06 12:59:36 +03:00
|
|
|
}
|
2013-10-07 19:49:21 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
return null;
|
|
|
|
}
|
2015-01-07 23:21:51 +03:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns whether a part file is needed for the given storage
|
|
|
|
* or whether the file can be assembled/uploaded directly on the
|
|
|
|
* target storage.
|
2015-02-10 15:02:48 +03:00
|
|
|
* @param \OCP\Files\Storage $storage
|
|
|
|
* @return bool true if the storage needs part file handling
|
2015-01-07 23:21:51 +03:00
|
|
|
*/
|
|
|
|
private function needsPartFile($storage) {
|
|
|
|
// TODO: in the future use ChunkHandler provided by storage
|
|
|
|
// and/or add method on Storage called "needsPartFile()"
|
|
|
|
return !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage') &&
|
|
|
|
!$storage->instanceOfStorage('OC\Files\Storage\OwnCloud');
|
2015-02-18 19:44:13 +03:00
|
|
|
}
|
2011-07-20 17:53:34 +04:00
|
|
|
}
|