2011-07-20 13:53:34 +00:00
|
|
|
<?php
|
2012-05-05 16:13:40 +00:00
|
|
|
|
2011-07-20 13:53:34 +00:00
|
|
|
/**
|
2012-05-05 16:13:40 +00:00
|
|
|
* ownCloud
|
|
|
|
*
|
|
|
|
* @author Jakob Sack
|
|
|
|
* @copyright 2011 Jakob Sack kde@jakobsack.de
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 3 of the License, or any later version.
|
|
|
|
*
|
|
|
|
* This library 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 library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
2011-07-20 13:53:34 +00:00
|
|
|
*/
|
2012-05-05 16:13:40 +00:00
|
|
|
|
2014-01-09 13:25:48 +00:00
|
|
|
class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\DAV\IFile {
|
2011-07-20 13:53:34 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Updates the data
|
|
|
|
*
|
2012-07-20 21:52:47 +00:00
|
|
|
* The data argument is a readable stream resource.
|
|
|
|
*
|
2013-09-30 08:46:50 +00:00
|
|
|
* After a successful put operation, you may choose to return an ETag. The
|
2012-07-20 21:52:47 +00: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 13:53:34 +00:00
|
|
|
* @param resource $data
|
2014-01-09 13:25:48 +00:00
|
|
|
* @throws \Sabre\DAV\Exception\Forbidden
|
2014-04-23 13:34:04 +00:00
|
|
|
* @throws OC_Connector_Sabre_Exception_UnsupportedMediaType
|
2014-01-09 13:25:48 +00:00
|
|
|
* @throws \Sabre\DAV\Exception\BadRequest
|
|
|
|
* @throws \Sabre\DAV\Exception
|
2014-04-23 13:34:04 +00:00
|
|
|
* @throws OC_Connector_Sabre_Exception_EntityTooLarge
|
2014-01-09 13:25:48 +00:00
|
|
|
* @throws \Sabre\DAV\Exception\ServiceUnavailable
|
2012-07-20 21:52:47 +00:00
|
|
|
* @return string|null
|
2011-07-20 13:53:34 +00:00
|
|
|
*/
|
|
|
|
public function put($data) {
|
2014-11-06 09:59:36 +00: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 15:59:38 +00:00
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("File is not updatable: ".$e->getMessage());
|
2013-06-25 15:04:25 +00:00
|
|
|
}
|
|
|
|
|
2013-08-14 07:44:29 +00:00
|
|
|
// throw an exception if encryption was disabled but the files are still encrypted
|
|
|
|
if (\OC_Util::encryptedFiles()) {
|
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 15:59:38 +00:00
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("Encryption is disabled");
|
2013-08-14 07:44:29 +00:00
|
|
|
}
|
2013-09-24 13:14:42 +00:00
|
|
|
|
2014-01-13 12:14:05 +00:00
|
|
|
$fileName = basename($this->path);
|
|
|
|
if (!\OCP\Util::isValidFileName($fileName)) {
|
2014-01-09 13:25:48 +00:00
|
|
|
throw new \Sabre\DAV\Exception\BadRequest();
|
2014-01-13 12:14:05 +00:00
|
|
|
}
|
|
|
|
|
2013-09-24 13:14:42 +00:00
|
|
|
// chunked handling
|
|
|
|
if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
|
2013-10-07 15:49:21 +00:00
|
|
|
return $this->createFileChunked($data);
|
2013-09-24 13:14:42 +00:00
|
|
|
}
|
|
|
|
|
2015-01-08 08:46:40 +00:00
|
|
|
list($storage, ) = $this->fileView->resolvePath($this->path);
|
2015-01-07 20:21:51 +00:00
|
|
|
$needsPartFile = $this->needsPartFile($storage);
|
|
|
|
|
|
|
|
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 16:21:57 +00:00
|
|
|
|
2013-09-26 09:50:46 +00:00
|
|
|
try {
|
2014-07-08 07:44:46 +00:00
|
|
|
$putOkay = $this->fileView->file_put_contents($partFilePath, $data);
|
2013-09-26 09:50:46 +00:00
|
|
|
if ($putOkay === false) {
|
|
|
|
\OC_Log::write('webdav', '\OC\Files\Filesystem::file_put_contents() failed', \OC_Log::ERROR);
|
2014-07-08 07:44:46 +00:00
|
|
|
$this->fileView->unlink($partFilePath);
|
2013-09-26 09:50:46 +00:00
|
|
|
// because we have no clue about the cause we can only throw back a 500/Internal Server Error
|
2014-01-09 13:25:48 +00:00
|
|
|
throw new \Sabre\DAV\Exception('Could not write file contents');
|
2013-09-26 09:50:46 +00:00
|
|
|
}
|
|
|
|
} catch (\OCP\Files\NotPermittedException $e) {
|
2013-10-08 13:04:31 +00:00
|
|
|
// a more general case - due to whatever reason the content could not be written
|
2014-01-09 13:25:48 +00:00
|
|
|
throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
|
2013-10-08 13:04:31 +00:00
|
|
|
|
2013-10-07 13:11:47 +00:00
|
|
|
} catch (\OCP\Files\EntityTooLargeException $e) {
|
2013-10-08 13:04:31 +00:00
|
|
|
// the file is too big to be stored
|
|
|
|
throw new OC_Connector_Sabre_Exception_EntityTooLarge($e->getMessage());
|
|
|
|
|
2013-10-07 13:11:47 +00:00
|
|
|
} catch (\OCP\Files\InvalidContentException $e) {
|
2013-10-08 13:04:31 +00:00
|
|
|
// the file content is not permitted
|
|
|
|
throw new OC_Connector_Sabre_Exception_UnsupportedMediaType($e->getMessage());
|
|
|
|
|
2013-10-07 13:11:47 +00:00
|
|
|
} catch (\OCP\Files\InvalidPathException $e) {
|
2013-10-08 13:04:31 +00:00
|
|
|
// the path for the file was not valid
|
|
|
|
// TODO: find proper http status code for this case
|
2014-01-09 13:25:48 +00:00
|
|
|
throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
|
2014-05-24 13:18:24 +00:00
|
|
|
} catch (\OCP\Files\LockNotAcquiredException $e) {
|
|
|
|
// the file is currently being written to by another process
|
2014-05-30 12:10:48 +00:00
|
|
|
throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e);
|
2014-12-03 15:16:09 +00:00
|
|
|
} catch (\OCA\Files_Encryption\Exception\EncryptionException $e) {
|
2014-11-04 16:17:29 +00:00
|
|
|
throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
|
2014-11-06 09:59:36 +00: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 15:59:38 +00:00
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to write file contents: ".$e->getMessage());
|
2013-09-24 12:25:56 +00:00
|
|
|
}
|
2013-02-22 16:21:57 +00:00
|
|
|
|
2014-11-06 09:59:36 +00: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 11:49:15 +00:00
|
|
|
}
|
2014-07-08 07:44:46 +00:00
|
|
|
|
2015-01-07 20:21:51 +00: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
|
|
|
|
throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e);
|
2014-11-06 09:59:36 +00:00
|
|
|
}
|
2014-05-24 13:18:24 +00:00
|
|
|
}
|
2013-02-22 16:21:57 +00:00
|
|
|
|
2014-11-06 09:59:36 +00:00
|
|
|
// allow sync clients to send the mtime along in a header
|
|
|
|
$mtime = OC_Request::hasModificationTime();
|
|
|
|
if ($mtime !== false) {
|
|
|
|
if($this->fileView->touch($this->path, $mtime)) {
|
|
|
|
header('X-OC-MTime: accepted');
|
|
|
|
}
|
2013-02-10 10:44:34 +00:00
|
|
|
}
|
2014-11-06 09:59:36 +00: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 15:59:38 +00:00
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to check file size: ".$e->getMessage());
|
2013-02-10 10:05:43 +00:00
|
|
|
}
|
2011-07-20 13:53:34 +00:00
|
|
|
|
2014-02-25 15:23:09 +00:00
|
|
|
return '"' . $this->info->getEtag() . '"';
|
2011-07-20 13:53:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the data
|
|
|
|
*
|
2014-05-11 17:28:45 +00:00
|
|
|
* @return string|resource
|
2011-07-20 13:53:34 +00:00
|
|
|
*/
|
|
|
|
public function get() {
|
|
|
|
|
2013-09-24 13:14:42 +00:00
|
|
|
//throw exception if encryption is disabled but files are still encrypted
|
2013-08-14 07:44:29 +00:00
|
|
|
if (\OC_Util::encryptedFiles()) {
|
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 15:59:38 +00:00
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("Encryption is disabled");
|
2013-08-14 07:44:29 +00:00
|
|
|
} else {
|
2014-11-04 16:17:29 +00:00
|
|
|
try {
|
|
|
|
return $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
|
2014-12-03 15:16:09 +00:00
|
|
|
} catch (\OCA\Files_Encryption\Exception\EncryptionException $e) {
|
2014-11-04 16:17:29 +00:00
|
|
|
throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
|
2014-11-06 09:59:36 +00: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 15:59:38 +00:00
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to open file: ".$e->getMessage());
|
2014-11-04 16:17:29 +00:00
|
|
|
}
|
2013-08-14 07:44:29 +00:00
|
|
|
}
|
2011-07-20 13:53:34 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Delete the current file
|
|
|
|
*
|
|
|
|
* @return void
|
2014-01-09 13:25:48 +00:00
|
|
|
* @throws \Sabre\DAV\Exception\Forbidden
|
2011-07-20 13:53:34 +00:00
|
|
|
*/
|
|
|
|
public function delete() {
|
2014-02-25 15:23:09 +00:00
|
|
|
if (!$this->info->isDeletable()) {
|
2014-01-09 13:25:48 +00:00
|
|
|
throw new \Sabre\DAV\Exception\Forbidden();
|
2013-06-25 15:04:25 +00:00
|
|
|
}
|
2014-09-22 10:19:34 +00:00
|
|
|
|
2014-11-06 09:59:36 +00: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 15:59:38 +00:00
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to unlink: ".$e->getMessage());
|
2014-09-22 10:19:34 +00:00
|
|
|
}
|
2011-07-20 13:53:34 +00:00
|
|
|
|
2013-10-22 17:41:26 +00:00
|
|
|
// remove properties
|
|
|
|
$this->removeProperties();
|
|
|
|
|
2011-07-20 13:53:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the size of the node, in bytes
|
|
|
|
*
|
2014-02-16 13:42:59 +00:00
|
|
|
* @return int|float
|
2011-07-20 13:53:34 +00:00
|
|
|
*/
|
|
|
|
public function getSize() {
|
2014-02-25 15:23:09 +00:00
|
|
|
return $this->info->getSize();
|
2011-07-20 13:53:34 +00: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 18:05:43 +00:00
|
|
|
$mimeType = $this->info->getMimetype();
|
2011-07-20 13:53:34 +00:00
|
|
|
|
2014-11-11 14:42:50 +00: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 15:17:50 +00:00
|
|
|
return \OC_Helper::getSecureMimeType($mimeType);
|
2011-07-20 13:53:34 +00:00
|
|
|
}
|
2013-10-07 15:49:21 +00:00
|
|
|
|
2014-12-15 14:20:24 +00: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 15:30:58 +00:00
|
|
|
/**
|
|
|
|
* @param resource $data
|
2014-04-23 13:34:04 +00:00
|
|
|
* @return null|string
|
2014-02-06 15:30:58 +00:00
|
|
|
*/
|
2013-10-07 15:49:21 +00:00
|
|
|
private function createFileChunked($data)
|
|
|
|
{
|
2014-01-09 13:25:48 +00:00
|
|
|
list($path, $name) = \Sabre\DAV\URLUtil::splitPath($this->path);
|
2013-10-07 15:49:21 +00:00
|
|
|
|
|
|
|
$info = OC_FileChunking::decodeName($name);
|
|
|
|
if (empty($info)) {
|
2014-01-09 13:25:48 +00:00
|
|
|
throw new \Sabre\DAV\Exception\NotImplemented();
|
2013-10-07 15:49:21 +00:00
|
|
|
}
|
|
|
|
$chunk_handler = new OC_FileChunking($info);
|
|
|
|
$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 18:20:13 +00:00
|
|
|
$chunk_handler->remove($info['index']);
|
2014-01-09 13:25:48 +00:00
|
|
|
throw new \Sabre\DAV\Exception\BadRequest(
|
2013-10-07 15:49:21 +00:00
|
|
|
'expected filesize ' . $expected . ' got ' . $bytesWritten);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($chunk_handler->isComplete()) {
|
2015-01-08 08:46:40 +00:00
|
|
|
list($storage, ) = $this->fileView->resolvePath($path);
|
2015-01-07 20:21:51 +00:00
|
|
|
$needsPartFile = $this->needsPartFile($storage);
|
2013-10-21 11:21:39 +00:00
|
|
|
|
2014-11-06 09:59:36 +00:00
|
|
|
try {
|
2015-01-08 08:46:40 +00:00
|
|
|
$targetPath = $path . '/' . $info['name'];
|
2015-01-07 20:21:51 +00: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 09:59:36 +00:00
|
|
|
}
|
2015-01-07 20:21:51 +00:00
|
|
|
} else {
|
|
|
|
// assemble directly into the final file
|
2015-01-08 08:46:40 +00:00
|
|
|
$chunk_handler->file_assemble($targetPath);
|
2014-01-08 17:43:20 +00:00
|
|
|
}
|
2013-10-21 13:00:28 +00:00
|
|
|
|
2014-11-06 09:59:36 +00:00
|
|
|
// allow sync clients to send the mtime along in a header
|
|
|
|
$mtime = OC_Request::hasModificationTime();
|
|
|
|
if ($mtime !== false) {
|
|
|
|
if($this->fileView->touch($targetPath, $mtime)) {
|
|
|
|
header('X-OC-MTime: accepted');
|
|
|
|
}
|
2013-10-21 13:00:28 +00:00
|
|
|
}
|
|
|
|
|
2014-11-06 09:59:36 +00: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 15:59:38 +00:00
|
|
|
throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to put file: ".$e->getMessage());
|
2014-11-06 09:59:36 +00:00
|
|
|
}
|
2013-10-07 15:49:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return null;
|
|
|
|
}
|
2015-01-07 20:21:51 +00: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.
|
|
|
|
*
|
|
|
|
* @param \OCP\Files\Storage $storage storage to check
|
|
|
|
* @param bool true if the storage needs part file handling
|
|
|
|
*/
|
|
|
|
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');
|
|
|
|
}
|
2011-07-20 13:53:34 +00:00
|
|
|
}
|