upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

pass file helper to encryption wrapper

Browse source
This commit is contained in:
Bjoern Schiessle 2015-04-01 10:37:48 +02:00 committed by Thomas Müller
parent d90663704c
commit 83cb382b3f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/private/encryption/manager.php
View file

@ -194,7 +194,8 @@ class Manager implements \OCP\Encryption\IManager {
$user = \OC::$server->getUserSession()->getUser();
$logger = \OC::$server->getLogger();
$uid = $user ? $user->getUID() : null;
return new Encryption($parameters, $manager, $util, $logger, $uid);
$fileHelper = \OC::$server->getEncryptionFilesHelper();
return new Encryption($parameters, $manager, $util, $logger, $fileHelper, $uid);
});
}
}

8
lib/private/files/storage/wrapper/encryption.php
View file

@ -45,11 +45,15 @@ class Encryption extends Wrapper {
/** @var array */
private $unencryptedSize;
/** @var \OC\Encryption\File */
private $fileHelper;
/**
* @param array $parameters
* @param \OC\Encryption\Manager $encryptionManager
* @param \OC\Encryption\Util $util
* @param \OC\Log $logger
* @param \OC\Encryption\File $fileHelper
* @param string $uid user who perform the read/write operation (null for public access)
*/
public function __construct(
@ -57,6 +61,7 @@ class Encryption extends Wrapper {
\OC\Encryption\Manager $encryptionManager = null,
\OC\Encryption\Util $util = null,
\OC\Log $logger = null,
\OC\Encryption\File $fileHelper = null,
$uid = null
) {
@ -65,6 +70,7 @@ class Encryption extends Wrapper {
$this->util = $util;
$this->logger = $logger;
$this->uid = $uid;
$this->fileHelper = $fileHelper;
$this->unencryptedSize = array();
parent::__construct($parameters);
}
@ -250,7 +256,7 @@ class Encryption extends Wrapper {
$uid = $owner;
}
$handle = \OC\Files\Stream\Encryption::wrap($source, $path, $fullPath, $header,
$uid, $encryptionModule, $this->storage, $this, $this->util, $mode,
$uid, $encryptionModule, $this->storage, $this, $this->util, $this->fileHelper, $mode,
$size, $unencryptedSize);
return $handle;
} else {