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

Merge pull request #4991 from owncloud/enc_fix_warning 

check if key exists before reading it
This commit is contained in:
Thomas Müller 2013-09-26 03:15:14 -07:00
parent 70dccd28ef 0b98427536
commit 2334f96906
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files_encryption/lib/keymanager.php
View File

@ -40,11 +40,14 @@ class Keymanager {
public static function getPrivateKey(\OC_FilesystemView $view, $user) { public static function getPrivateKey(\OC_FilesystemView $view, $user) {
$path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key'; $path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key';
$key = false;
$proxyStatus = \OC_FileProxy::$enabled; $proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false; \OC_FileProxy::$enabled = false;
$key = $view->file_get_contents($path); if ($view->file_exists($path)) {
$key = $view->file_get_contents($path);
}
\OC_FileProxy::$enabled = $proxyStatus; \OC_FileProxy::$enabled = $proxyStatus;

3
apps/files_encryption/lib/proxy.php
View File

@ -50,9 +50,8 @@ class Proxy extends \OC_FileProxy {
private static function shouldEncrypt($path) { private static function shouldEncrypt($path) {
if (is_null(self::$enableEncryption)) { if (is_null(self::$enableEncryption)) {
if ( if (
\OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') === 'true' \OCP\App::isEnabled('files_encryption') === true
&& Crypt::mode() === 'server' && Crypt::mode() === 'server'
) { ) {