upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

Browse source
This commit is contained in:
Bjoern Schiessle 2013-10-10 15:02:52 +02: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
View file

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