wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use OC\Files\View to read encrypted file, so that it also works with external storages

Browse source
This commit is contained in:
Bjoern Schiessle 2013-07-31 16:35:14 +02:00
parent fe2937e3cd
commit 23e9721644
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/files_encryption/lib/util.php
View file

@ -768,9 +768,6 @@ class Util {
$decryptedFiles[] = array();
// Disable proxy to prevent file being encrypted twice
\OC_FileProxy::$enabled = false;
// Encrypt unencrypted files
foreach ($found['encrypted'] as $encryptedFile) {
@ -780,8 +777,14 @@ class Util {
//relative to /data
$rawPath = $encryptedFile['path'];
//enable proxy to use OC\Files\View to access the original file
\OC_FileProxy::$enabled = true;
// Open enc file handle for binary reading
$encHandle = fopen('crypt://' . $rawPath, 'rb');
$encHandle = $this->view->fopen($rawPath, 'rb');
// Disable proxy to prevent file being encrypted again
\OC_FileProxy::$enabled = false;
if ($encHandle === false) {
\OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $rawPath . '", decryption failed!', \OCP\Util::FATAL);