sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't cache if the encryption is enabled, this can lead to problems during unit testing

remotes/origin/stable6
Bjoern Schiessle 2013-10-10 15:02:52 +07:00
parent a1719deabe
commit 909af2b62e
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/files_encryption/lib/proxy.php
Unescape Escape View File

@ -38,8 +38,6 @@ class Proxy extends \OC_FileProxy {
private static $blackList = null; //mimetypes blacklisted from encryption private static $blackList = null; //mimetypes blacklisted from encryption
private static $enableEncryption = null;
/** /**
* Check if a file requires encryption * Check if a file requires encryption
* @param string $path * @param string $path
@ -49,46 +47,22 @@ class Proxy extends \OC_FileProxy {
*/ */
private static function shouldEncrypt($path) { private static function shouldEncrypt($path) {
if (is_null(self::$enableEncryption)) { if (\OCP\App::isEnabled('files_encryption') === false || Crypt::mode() !== 'server') {
if (
\OCP\App::isEnabled('files_encryption') === true
&& Crypt::mode() === 'server'
) {
self::$enableEncryption = true;
} else {
self::$enableEncryption = false;
}
}
if (!self::$enableEncryption) {
return false; return false;
} }
if (is_null(self::$blackList)) { if (is_null(self::$blackList)) {
self::$blackList = explode(',', \OCP\Config::getAppValue('files_encryption', 'type_blacklist', '')); self::$blackList = explode(',', \OCP\Config::getAppValue('files_encryption', 'type_blacklist', ''));
} }
if (Crypt::isCatfileContent($path)) { if (Crypt::isCatfileContent($path)) {
return true; return true;
} }
$extension = substr($path, strrpos($path, '.') + 1); $extension = substr($path, strrpos($path, '.') + 1);
if (array_search($extension, self::$blackList) === false) { if (array_search($extension, self::$blackList) === false) {
return true; return true;
} }
return false; return false;