mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer 

Conflicts:
	lib/private/files.php
This commit is contained in:
Thomas Müller 2014-02-20 16:36:37 +01:00
parent b8048866c7 99ad4e8000
commit b35cd54e87
2 changed files with 103 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit c7b4cdbcc1faa56df2489a5753b457627f460c07 Subproject commit 41f8d5a38b491d3ada4b43273462535c015eba08

215
lib/private/files.php
View File

@ -21,22 +21,39 @@
* *
*/ */
// TODO: get rid of this using proper composer packages
require_once 'mcnetic/phpzipstreamer/ZipStreamer.php';
class GET_TYPE {
const FILE = 1;
const ZIP_FILES = 2;
const ZIP_DIR = 3;
}
/** /**
* Class for fileserver access * Class for file server access
* *
*/ */
class OC_Files { class OC_Files {
static $tmpFiles = array();
static public function getFileInfo($path, $includeMountPoints = true){
return \OC\Files\Filesystem::getFileInfo($path, $includeMountPoints);
}
/** /**
* @param string $path * @param string $filename
* @param string $name
* @param bool $zip
*/ */
static public function getDirectoryContent($path){ private static function sendHeaders($filename, $name, $zip = false) {
return \OC\Files\Filesystem::getDirectoryContent($path); OC_Response::setContentDispositionHeader($name, 'attachment');
header('Content-Transfer-Encoding: binary');
OC_Response::disableCaching();
if ($zip) {
header('Content-Type: application/zip');
} else {
$filesize = \OC\Files\Filesystem::filesize($filename);
header('Content-Type: '.\OC\Files\Filesystem::getMimeType($filename));
if ($filesize > -1) {
header("Content-Length: ".$filesize);
}
}
} }
/** /**
@ -54,97 +71,50 @@ class OC_Files {
$xsendfile = true; $xsendfile = true;
} }
if (is_array($files) && count($files) == 1) { if (is_array($files) && count($files) === 1) {
$files = $files[0]; $files = $files[0];
} }
if (is_array($files)) { if (is_array($files)) {
self::validateZipDownload($dir, $files); $get_type = GET_TYPE::ZIP_FILES;
$executionTime = intval(ini_get('max_execution_time'));
set_time_limit(0);
$zip = new ZipArchive();
$filename = OC_Helper::tmpFile('.zip');
if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
$l = OC_L10N::get('lib');
throw new Exception($l->t('cannot open "%s"', array($filename)));
}
foreach ($files as $file) {
$file = $dir . '/' . $file;
if (\OC\Files\Filesystem::is_file($file)) {
$tmpFile = \OC\Files\Filesystem::toTmpFile($file);
self::$tmpFiles[] = $tmpFile;
$zip->addFile($tmpFile, basename($file));
} elseif (\OC\Files\Filesystem::is_dir($file)) {
self::zipAddDir($file, $zip);
}
}
$zip->close();
if ($xsendfile) {
$filename = OC_Helper::moveToNoClean($filename);
}
$basename = basename($dir); $basename = basename($dir);
if ($basename) { if ($basename) {
$name = $basename . '.zip'; $name = $basename . '.zip';
} else { } else {
$name = 'download.zip'; $name = 'download.zip';
} }
set_time_limit($executionTime); $filename = $dir . '/' . $name;
} elseif (\OC\Files\Filesystem::is_dir($dir . '/' . $files)) {
self::validateZipDownload($dir, $files);
$executionTime = intval(ini_get('max_execution_time'));
set_time_limit(0);
$zip = new ZipArchive();
$filename = OC_Helper::tmpFile('.zip');
if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
$l = OC_L10N::get('lib');
throw new Exception($l->t('cannot open "%s"', array($filename)));
}
$file = $dir . '/' . $files;
self::zipAddDir($file, $zip);
$zip->close();
if ($xsendfile) {
$filename = OC_Helper::moveToNoClean($filename);
}
// downloading root ?
if ($files === '') {
$name = 'download.zip';
} else {
$name = $files . '.zip';
}
set_time_limit($executionTime);
} else { } else {
$zip = false;
$filename = $dir . '/' . $files; $filename = $dir . '/' . $files;
$name = $files; if (\OC\Files\Filesystem::is_dir($dir . '/' . $files)) {
$get_type = GET_TYPE::ZIP_DIR;
// downloading root ?
if ($files === '') {
$name = 'download.zip';
} else {
$name = $files . '.zip';
}
} else {
$get_type = GET_TYPE::FILE;
$name = $files;
}
}
if ($get_type === GET_TYPE::FILE) {
$zip = false;
if ($xsendfile && OC_App::isEnabled('files_encryption')) { if ($xsendfile && OC_App::isEnabled('files_encryption')) {
$xsendfile = false; $xsendfile = false;
} }
} else {
self::validateZipDownload($dir, $files);
$zip = new ZipStreamer(false);
} }
OC_Util::obEnd(); OC_Util::obEnd();
if ($zip or \OC\Files\Filesystem::isReadable($filename)) { if ($zip or \OC\Files\Filesystem::isReadable($filename)) {
OC_Response::setContentDispositionHeader($name, 'attachment'); self::sendHeaders($filename, $name, $zip);
header('Content-Transfer-Encoding: binary'); } elseif (!\OC\Files\Filesystem::file_exists($filename)) {
OC_Response::disableCaching();
if ($zip) {
ini_set('zlib.output_compression', 'off');
header('Content-Type: application/zip');
header('Content-Length: ' . filesize($filename));
self::addSendfileHeader($filename);
}else{
$filesize = \OC\Files\Filesystem::filesize($filename);
header('Content-Type: '.\OC\Files\Filesystem::getMimeType($filename));
if ($filesize > -1) {
header("Content-Length: ".$filesize);
}
if ($xsendfile) {
list($storage) = \OC\Files\Filesystem::resolvePath(\OC\Files\Filesystem::getView()->getAbsolutePath($filename));
if ($storage->isLocal()) {
self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));
}
}
}
} elseif ($zip or !\OC\Files\Filesystem::file_exists($filename)) {
header("HTTP/1.0 404 Not Found"); header("HTTP/1.0 404 Not Found");
$tmpl = new OC_Template('', '404', 'guest'); $tmpl = new OC_Template('', '404', 'guest');
$tmpl->assign('file', $name); $tmpl->assign('file', $name);
@ -157,23 +127,36 @@ class OC_Files {
return ; return ;
} }
if ($zip) { if ($zip) {
$handle = fopen($filename, 'r'); $executionTime = intval(ini_get('max_execution_time'));
if ($handle) { set_time_limit(0);
$chunkSize = 8 * 1024; // 1 MB chunks if ($get_type === GET_TYPE::ZIP_FILES) {
while (!feof($handle)) { foreach ($files as $file) {
echo fread($handle, $chunkSize); $file = $dir . '/' . $file;
flush(); if (\OC\Files\Filesystem::is_file($file)) {
$fh = \OC\Files\Filesystem::fopen($file, 'r');
$zip->addFileFromStream($fh, basename($file));
fclose($fh);
} elseif (\OC\Files\Filesystem::is_dir($file)) {
self::zipAddDir($file, $zip);
}
} }
} elseif ($get_type === GET_TYPE::ZIP_DIR) {
$file = $dir . '/' . $files;
self::zipAddDir($file, $zip);
} }
if (!$xsendfile) { $zip->finalize();
unlink($filename); set_time_limit($executionTime);
} } else {
}else{ if ($xsendfile) {
\OC\Files\Filesystem::readfile($filename); /** @var $storage \OC\Files\Storage\Storage */
} list($storage) = \OC\Files\Filesystem::resolvePath($filename);
foreach (self::$tmpFiles as $tmpFile) { if ($storage->isLocal()) {
if (file_exists($tmpFile) and is_file($tmpFile)) { self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));
unlink($tmpFile); } else {
\OC\Files\Filesystem::readfile($filename);
}
} else {
\OC\Files\Filesystem::readfile($filename);
} }
} }
} }
@ -186,10 +169,10 @@ class OC_Files {
header("X-Sendfile: " . $filename); header("X-Sendfile: " . $filename);
} }
if (isset($_SERVER['MOD_X_SENDFILE2_ENABLED'])) { if (isset($_SERVER['MOD_X_SENDFILE2_ENABLED'])) {
if (isset($_SERVER['HTTP_RANGE']) && if (isset($_SERVER['HTTP_RANGE']) &&
preg_match("/^bytes=([0-9]+)-([0-9]*)$/", $_SERVER['HTTP_RANGE'], $range)) { preg_match("/^bytes=([0-9]+)-([0-9]*)$/", $_SERVER['HTTP_RANGE'], $range)) {
$filelength = filesize($filename); $filelength = filesize($filename);
if ($range[2] == "") { if ($range[2] === "") {
$range[2] = $filelength - 1; $range[2] = $filelength - 1;
} }
header("Content-Range: bytes $range[1]-$range[2]/" . $filelength); header("Content-Range: bytes $range[1]-$range[2]/" . $filelength);
@ -199,7 +182,7 @@ class OC_Files {
header("X-Sendfile: " . $filename); header("X-Sendfile: " . $filename);
} }
} }
if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) { if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
header("X-Accel-Redirect: " . $filename); header("X-Accel-Redirect: " . $filename);
} }
@ -207,22 +190,27 @@ class OC_Files {
/** /**
* @param string $dir * @param string $dir
* @param ZipArchive $zip * @param ZipStreamer $zip
* @param string $internalDir
*/ */
public static function zipAddDir($dir, $zip, $internalDir='') { public static function zipAddDir($dir, $zip, $internalDir='') {
$dirname=basename($dir); $dirname=basename($dir);
$zip->addEmptyDir($internalDir.$dirname); $rootDir = $internalDir.$dirname;
if (!empty($rootDir)) {
$zip->addEmptyDir($rootDir);
}
$internalDir.=$dirname.='/'; $internalDir.=$dirname.='/';
// prevent absolute dirs // prevent absolute dirs
$internalDir = ltrim($internalDir, '/'); $internalDir = ltrim($internalDir, '/');
$files=OC_Files::getDirectoryContent($dir);
$files=\OC\Files\Filesystem::getDirectoryContent($dir);
foreach($files as $file) { foreach($files as $file) {
$filename=$file['name']; $filename=$file['name'];
$file=$dir.'/'.$filename; $file=$dir.'/'.$filename;
if(\OC\Files\Filesystem::is_file($file)) { if(\OC\Files\Filesystem::is_file($file)) {
$tmpFile=\OC\Files\Filesystem::toTmpFile($file); $fh = \OC\Files\Filesystem::fopen($file, 'r');
OC_Files::$tmpFiles[]=$tmpFile; $zip->addFileFromStream($fh, $internalDir.$filename);
$zip->addFile($tmpFile, $internalDir.$filename); fclose($fh);
}elseif(\OC\Files\Filesystem::is_dir($file)) { }elseif(\OC\Files\Filesystem::is_dir($file)) {
self::zipAddDir($file, $zip, $internalDir); self::zipAddDir($file, $zip, $internalDir);
} }
@ -232,8 +220,8 @@ class OC_Files {
/** /**
* checks if the selected files are within the size constraint. If not, outputs an error page. * checks if the selected files are within the size constraint. If not, outputs an error page.
* *
* @param string $dir * @param string $dir
* @param files $files * @param array | string $files
*/ */
static function validateZipDownload($dir, $files) { static function validateZipDownload($dir, $files) {
if (!OC_Config::getValue('allowZipDownload', true)) { if (!OC_Config::getValue('allowZipDownload', true)) {
@ -280,8 +268,8 @@ class OC_Files {
/** /**
* set the maximum upload size limit for apache hosts using .htaccess * set the maximum upload size limit for apache hosts using .htaccess
* *
* @param int size filesisze in bytes * @param int $size file size in bytes
* @return false on failure, size on success * @return bool false on failure, size on success
*/ */
static function setUploadLimit($size) { static function setUploadLimit($size) {
//don't allow user to break his config -- upper boundary //don't allow user to break his config -- upper boundary
@ -297,11 +285,12 @@ class OC_Files {
} }
//don't allow user to break his config -- broken or malicious size input //don't allow user to break his config -- broken or malicious size input
if (intval($size) == 0) { if (intval($size) === 0) {
return false; return false;
} }
$htaccess = @file_get_contents(OC::$SERVERROOT . '/.htaccess'); //supress errors in case we don't have permissions for //suppress errors in case we don't have permissions for
$htaccess = @file_get_contents(OC::$SERVERROOT . '/.htaccess');
if (!$htaccess) { if (!$htaccess) {
return false; return false;
} }
@ -319,7 +308,7 @@ class OC_Files {
if ($content !== null) { if ($content !== null) {
$htaccess = $content; $htaccess = $content;
} }
if ($hasReplaced == 0) { if ($hasReplaced === 0) {
$htaccess .= "\n" . $setting; $htaccess .= "\n" . $setting;
} }
} }