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

fix memory problems as reported at #3620

This commit is contained in:
Florin Peter 2013-06-13 20:51:22 +02:00
parent 7889f2ef5c
commit 35da408222
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files_encryption/lib/crypt.php
View File

@ -168,7 +168,7 @@ class Crypt {
* e.g. filename or /Docs/filename, NOT admin/files/filename * e.g. filename or /Docs/filename, NOT admin/files/filename
* @return boolean * @return boolean
*/ */
public static function isLegacyEncryptedContent($data, $relPath) { public static function isLegacyEncryptedContent($isCatFileContent, $relPath) {
// Fetch all file metadata from DB // Fetch all file metadata from DB
$metadata = \OC\Files\Filesystem::getFileInfo($relPath, ''); $metadata = \OC\Files\Filesystem::getFileInfo($relPath, '');
@ -178,7 +178,7 @@ class Crypt {
// legacy encryption system // legacy encryption system
if (isset($metadata['encrypted']) if (isset($metadata['encrypted'])
&& $metadata['encrypted'] === true && $metadata['encrypted'] === true
&& !self::isCatfileContent($data) && $isCatFileContent === false
) { ) {
return true; return true;
@ -480,7 +480,7 @@ class Crypt {
} else { } else {
\OCP\Util::writeLog('Encryption library', 'Decryption (asymmetric) of sealed content failed', \OCP\Util::ERROR); \OCP\Util::writeLog('Encryption library', 'Decryption (asymmetric) of sealed content with share-key "'.$shareKey.'" failed', \OCP\Util::ERROR);
return false; return false;

7
apps/files_encryption/lib/util.php
View File

@ -424,8 +424,7 @@ class Util {
// where they got re-enabled :/ // where they got re-enabled :/
\OC_FileProxy::$enabled = false; \OC_FileProxy::$enabled = false;
$data = $this->view->file_get_contents($filePath); $isEncryptedPath = $this->isEncryptedPath($filePath);
// If the file is encrypted // If the file is encrypted
// NOTE: If the userId is // NOTE: If the userId is
// empty or not set, file will // empty or not set, file will
@ -435,7 +434,7 @@ class Util {
// will eat server resources :( // will eat server resources :(
if ( if (
Keymanager::getFileKey($this->view, $this->userId, $relPath) Keymanager::getFileKey($this->view, $this->userId, $relPath)
&& Crypt::isCatfileContent($data) && $isEncryptedPath
) { ) {
$found['encrypted'][] = array( $found['encrypted'][] = array(
@ -445,7 +444,7 @@ class Util {
// If the file uses old // If the file uses old
// encryption system // encryption system
} elseif (Crypt::isLegacyEncryptedContent($data, $relPath)) { } elseif (Crypt::isLegacyEncryptedContent($isEncryptedPath, $relPath)) {
$found['legacy'][] = array( $found['legacy'][] = array(
'name' => $file, 'name' => $file,