Merge pull request #5193 from owncloud/fix_5126_2
fix upload to /Shared
This commit is contained in:
commit
f49de34373
|
@ -50,8 +50,22 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
|
||||||
*/
|
*/
|
||||||
public function createFile($name, $data = null) {
|
public function createFile($name, $data = null) {
|
||||||
|
|
||||||
if (!\OC\Files\Filesystem::isCreatable($this->path)) {
|
// for chunked upload also updating a existing file is a "createFile"
|
||||||
throw new \Sabre_DAV_Exception_Forbidden();
|
// because we create all the chunks before reasamble them to the existing file.
|
||||||
|
if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
|
||||||
|
|
||||||
|
// exit if we can't create a new file and we don't updatable existing file
|
||||||
|
$info = OC_FileChunking::decodeName($name);
|
||||||
|
if (!\OC\Files\Filesystem::isCreatable($this->path) &&
|
||||||
|
!\OC\Files\Filesystem::isUpdatable($this->path . '/' . $info['name'])) {
|
||||||
|
throw new \Sabre_DAV_Exception_Forbidden();
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// For non-chunked upload it is enough to check if we can create a new file
|
||||||
|
if (!\OC\Files\Filesystem::isCreatable($this->path)) {
|
||||||
|
throw new \Sabre_DAV_Exception_Forbidden();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$path = $this->path . '/' . $name;
|
$path = $this->path . '/' . $name;
|
||||||
|
|
|
@ -45,7 +45,9 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
|
||||||
* @return string|null
|
* @return string|null
|
||||||
*/
|
*/
|
||||||
public function put($data) {
|
public function put($data) {
|
||||||
|
|
||||||
$fs = $this->getFS();
|
$fs = $this->getFS();
|
||||||
|
|
||||||
if ($fs->file_exists($this->path) &&
|
if ($fs->file_exists($this->path) &&
|
||||||
!$fs->isUpdatable($this->path)) {
|
!$fs->isUpdatable($this->path)) {
|
||||||
throw new \Sabre_DAV_Exception_Forbidden();
|
throw new \Sabre_DAV_Exception_Forbidden();
|
||||||
|
@ -58,12 +60,14 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
|
||||||
|
|
||||||
// chunked handling
|
// chunked handling
|
||||||
if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
|
if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
|
||||||
|
|
||||||
list($path, $name) = \Sabre_DAV_URLUtil::splitPath($this->path);
|
list($path, $name) = \Sabre_DAV_URLUtil::splitPath($this->path);
|
||||||
|
|
||||||
$info = OC_FileChunking::decodeName($name);
|
$info = OC_FileChunking::decodeName($name);
|
||||||
if (empty($info)) {
|
if (empty($info)) {
|
||||||
throw new Sabre_DAV_Exception_NotImplemented();
|
throw new Sabre_DAV_Exception_NotImplemented();
|
||||||
}
|
}
|
||||||
|
|
||||||
$chunk_handler = new OC_FileChunking($info);
|
$chunk_handler = new OC_FileChunking($info);
|
||||||
$chunk_handler->store($info['index'], $data);
|
$chunk_handler->store($info['index'], $data);
|
||||||
if ($chunk_handler->isComplete()) {
|
if ($chunk_handler->isComplete()) {
|
||||||
|
@ -78,6 +82,13 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
|
||||||
// mark file as partial while uploading (ignored by the scanner)
|
// mark file as partial while uploading (ignored by the scanner)
|
||||||
$partpath = $this->path . '.part';
|
$partpath = $this->path . '.part';
|
||||||
|
|
||||||
|
// if file is located in /Shared we write the part file to the users
|
||||||
|
// root folder because we can't create new files in /shared
|
||||||
|
// we extend the name with a random number to avoid overwriting a existing file
|
||||||
|
if (dirname($partpath) === 'Shared') {
|
||||||
|
$partpath = pathinfo($partpath, PATHINFO_FILENAME) . rand() . '.part';
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$putOkay = $fs->file_put_contents($partpath, $data);
|
$putOkay = $fs->file_put_contents($partpath, $data);
|
||||||
if ($putOkay === false) {
|
if ($putOkay === false) {
|
||||||
|
|
Loading…
Reference in New Issue