fixes after review from @DeepDiver1975

1 files changed, 95 insertions, 109 deletions

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index cc9d239b256..eaaeae9b619 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -48,13 +48,12 @@ class Proxy extends \OC_FileProxy
 	 *
 	 * Tests if server side encryption is enabled, and file is allowed by blacklists
 	 */
-	private static function shouldEncrypt($path)
-	{
+	private static function shouldEncrypt( $path ) {
 
-		if (is_null(self::$enableEncryption)) {
+		if ( is_null( self::$enableEncryption ) ) {
 
 			if (
-				\OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') == 'true'
+				\OCP\Config::getAppValue( 'files_encryption', 'enable_encryption', 'true' ) == 'true'
 				&& Crypt::mode() == 'server'
 			) {
 
@@ -68,27 +67,27 @@ class Proxy extends \OC_FileProxy
 
 		}
 
-		if (!self::$enableEncryption) {
+		if ( !self::$enableEncryption ) {
 
 			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;
 
 		}
 
-		$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;
 
@@ -102,35 +101,34 @@ class Proxy extends \OC_FileProxy
 	 * @param $data
 	 * @return bool
 	 */
-	public function preFile_put_contents($path, &$data)
-	{
+	public function preFile_put_contents( $path, &$data ) {
 
-		if (self::shouldEncrypt($path)) {
+		if ( self::shouldEncrypt( $path ) ) {
 
 			// Stream put contents should have been converted to fopen
-			if (!is_resource($data)) {
+			if ( !is_resource( $data ) ) {
 
 				$userId = \OCP\USER::getUser();
-				$view = new \OC_FilesystemView('/');
-				$util = new Util($view, $userId);
-				$session = new Session($view);
+				$view = new \OC_FilesystemView( '/' );
+				$util = new Util( $view, $userId );
+				$session = new Session( $view );
 				$privateKey = $session->getPrivateKey();
-				$filePath = $util->stripUserFilesPath($path);
+				$filePath = $util->stripUserFilesPath( $path );
 				// Set the filesize for userland, before encrypting
-				$size = strlen($data);
+				$size = strlen( $data );
 
 				// Disable encryption proxy to prevent recursive calls
 				$proxyStatus = \OC_FileProxy::$enabled;
 				\OC_FileProxy::$enabled = false;
 
 				// Check if there is an existing key we can reuse
-				if ($encKeyfile = Keymanager::getFileKey($view, $userId, $filePath)) {
+				if ( $encKeyfile = Keymanager::getFileKey( $view, $userId, $filePath ) ) {
 
 					// Fetch shareKey
-					$shareKey = Keymanager::getShareKey($view, $userId, $filePath);
+					$shareKey = Keymanager::getShareKey( $view, $userId, $filePath );
 
 					// Decrypt the keyfile
-					$plainKey = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+					$plainKey = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
 
 				} else {
 
@@ -140,37 +138,37 @@ class Proxy extends \OC_FileProxy
 				}
 
 				// Encrypt data
-				$encData = Crypt::symmetricEncryptFileContent($data, $plainKey);
+				$encData = Crypt::symmetricEncryptFileContent( $data, $plainKey );
 
 				$sharingEnabled = \OCP\Share::isEnabled();
 
 				// if file exists try to get sharing users
-				if ($view->file_exists($path)) {
-					$uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $filePath, $userId);
+				if ( $view->file_exists( $path ) ) {
+					$uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $filePath, $userId );
 				} else {
 					$uniqueUserIds[] = $userId;
 				}
 
 				// Fetch public keys for all users who will share the file
-				$publicKeys = Keymanager::getPublicKeys($view, $uniqueUserIds);
+				$publicKeys = Keymanager::getPublicKeys( $view, $uniqueUserIds );
 
 				// Encrypt plain keyfile to multiple sharefiles
-				$multiEncrypted = Crypt::multiKeyEncrypt($plainKey, $publicKeys);
+				$multiEncrypted = Crypt::multiKeyEncrypt( $plainKey, $publicKeys );
 
 				// Save sharekeys to user folders
-				Keymanager::setShareKeys($view, $filePath, $multiEncrypted['keys']);
+				Keymanager::setShareKeys( $view, $filePath, $multiEncrypted['keys'] );
 
 				// Set encrypted keyfile as common varname
 				$encKey = $multiEncrypted['data'];
 
 				// Save keyfile for newly encrypted file in parallel directory tree
-				Keymanager::setFileKey($view, $filePath, $userId, $encKey);
+				Keymanager::setFileKey( $view, $filePath, $userId, $encKey );
 
 				// Replace plain content with encrypted content by reference
 				$data = $encData;
 
 				// Update the file cache with file info
-				\OC\Files\Filesystem::putFileInfo($filePath, array('encrypted' => true, 'size' => strlen($data), 'unencrypted_size' => $size), '');
+				\OC\Files\Filesystem::putFileInfo( $filePath, array( 'encrypted' => true, 'size' => strlen( $data ), 'unencrypted_size' => $size ), '' );
 
 				// Re-enable proxy - our work is done
 				\OC_FileProxy::$enabled = $proxyStatus;
@@ -186,52 +184,51 @@ class Proxy extends \OC_FileProxy
 	 * @param string $path Path of file from which has been read
 	 * @param string $data Data that has been read from file
 	 */
-	public function postFile_get_contents($path, $data)
-	{
+	public function postFile_get_contents( $path, $data ) {
 
 		$userId = \OCP\USER::getUser();
-		$view = new \OC_FilesystemView('/');
-		$util = new Util($view, $userId);
+		$view = new \OC_FilesystemView( '/' );
+		$util = new Util( $view, $userId );
 
-		$relPath = $util->stripUserFilesPath($path);
+		$relPath = $util->stripUserFilesPath( $path );
 
 		// Disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
 		// init session
-		$session = new Session($view);
+		$session = new Session( $view );
 
 		// If data is a catfile
 		if (
 			Crypt::mode() == 'server'
-			&& Crypt::isCatfileContent($data)
+			&& Crypt::isCatfileContent( $data )
 		) {
 
-			$privateKey = $session->getPrivateKey($userId);
+			$privateKey = $session->getPrivateKey( $userId );
 
 			// Get the encrypted keyfile
-			$encKeyfile = Keymanager::getFileKey($view, $userId, $relPath);
+			$encKeyfile = Keymanager::getFileKey( $view, $userId, $relPath );
 
 			// Attempt to fetch the user's shareKey
-			$shareKey = Keymanager::getShareKey($view, $userId, $relPath);
+			$shareKey = Keymanager::getShareKey( $view, $userId, $relPath );
 
 			// Decrypt keyfile with shareKey
-			$plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+			$plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
 
-			$plainData = Crypt::symmetricDecryptFileContent($data, $plainKeyfile);
+			$plainData = Crypt::symmetricDecryptFileContent( $data, $plainKeyfile );
 
 		} elseif (
 			Crypt::mode() == 'server'
-			&& isset($_SESSION['legacyenckey'])
-			&& Crypt::isEncryptedMeta($path)
+			&& isset( $_SESSION['legacyenckey'] )
+			&& Crypt::isEncryptedMeta( $path )
 		) {
-			$plainData = Crypt::legacyDecrypt($data, $session->getLegacyKey());
+			$plainData = Crypt::legacyDecrypt( $data, $session->getLegacyKey() );
 		}
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
-		if (!isset($plainData)) {
+		if ( !isset( $plainData ) ) {
 
 			$plainData = $data;
 
@@ -244,11 +241,10 @@ class Proxy extends \OC_FileProxy
 	/**
 	 * @brief When a file is deleted, remove its keyfile also
 	 */
-	public function preUnlink($path)
-	{
+	public function preUnlink( $path ) {
 
 		// let the trashbin handle this  
-		if (\OCP\App::isEnabled('files_trashbin')) {
+		if ( \OCP\App::isEnabled( 'files_trashbin' ) ) {
 			return true;
 		}
 
@@ -256,29 +252,24 @@ class Proxy extends \OC_FileProxy
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$view = new \OC_FilesystemView('/');
+		$view = new \OC_FilesystemView( '/' );
 
 		$userId = \OCP\USER::getUser();
 
-		$util = new Util($view, $userId);
+		$util = new Util( $view, $userId );
 
 		// Format path to be relative to user files dir
-		$relPath = $util->stripUserFilesPath($path);
+		$relPath = $util->stripUserFilesPath( $path );
 
-		list($owner, $ownerPath) = $util->getUidAndFilename($relPath);
+		list( $owner, $ownerPath ) = $util->getUidAndFilename( $relPath );
 
 		// Delete keyfile & shareKey so it isn't orphaned
-		if (
-			!(
-				Keymanager::deleteFileKey($view, $owner, $ownerPath)
-					&& Keymanager::delAllShareKeys($view, $owner, $ownerPath)
-			)
-		) {
-
-			\OC_Log::write('Encryption library', 'Keyfile or shareKey could not be deleted for file "' . $ownerPath . '"', \OC_Log::ERROR);
-
+		if ( !Keymanager::deleteFileKey( $view, $owner, $ownerPath ) ) {
+			\OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "' . $ownerPath . '"', \OC_Log::ERROR );
 		}
 
+		Keymanager::delAllShareKeys( $view, $owner, $ownerPath );
+
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		// If we don't return true then file delete will fail; better
@@ -291,9 +282,8 @@ class Proxy extends \OC_FileProxy
 	 * @param $path
 	 * @return bool
 	 */
-	public function postTouch($path)
-	{
-		$this->handleFile($path);
+	public function postTouch( $path ) {
+		$this->handleFile( $path );
 
 		return true;
 	}
@@ -303,21 +293,20 @@ class Proxy extends \OC_FileProxy
 	 * @param $result
 	 * @return resource
 	 */
-	public function postFopen($path, &$result)
-	{
+	public function postFopen( $path, &$result ) {
 
-		if (!$result) {
+		if ( !$result ) {
 
 			return $result;
 
 		}
 
 		// Reformat path for use with OC_FSV
-		$path_split = explode('/', $path);
-		$path_f = implode('/', array_slice($path_split, 3));
+		$path_split = explode( '/', $path );
+		$path_f = implode( '/', array_slice( $path_split, 3 ) );
 
 		// FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
-		if ($path_split[2] == 'cache') {
+		if ( count($path_split) >= 2 && $path_split[2] == 'cache' ) {
 			return $result;
 		}
 
@@ -325,31 +314,31 @@ class Proxy extends \OC_FileProxy
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$meta = stream_get_meta_data($result);
+		$meta = stream_get_meta_data( $result );
 
-		$view = new \OC_FilesystemView('');
+		$view = new \OC_FilesystemView( '' );
 
-		$util = new Util($view, \OCP\USER::getUser());
+		$util = new Util( $view, \OCP\USER::getUser() );
 
 		// If file is already encrypted, decrypt using crypto protocol
 		if (
 			Crypt::mode() == 'server'
-			&& $util->isEncryptedPath($path)
+			&& $util->isEncryptedPath( $path )
 		) {
 
 			// Close the original encrypted file
-			fclose($result);
+			fclose( $result );
 
 			// Open the file using the crypto stream wrapper 
 			// protocol and let it do the decryption work instead
-			$result = fopen('crypt://' . $path_f, $meta['mode']);
+			$result = fopen( 'crypt://' . $path_f, $meta['mode'] );
 
 		} elseif (
-			self::shouldEncrypt($path)
+			self::shouldEncrypt( $path )
 			and $meta ['mode'] != 'r'
 			and $meta['mode'] != 'rb'
 		) {
-			$result = fopen('crypt://' . $path_f, $meta['mode']);
+			$result = fopen( 'crypt://' . $path_f, $meta['mode'] );
 		}
 
 		// Re-enable the proxy
@@ -364,18 +353,17 @@ class Proxy extends \OC_FileProxy
 	 * @param $data
 	 * @return array
 	 */
-	public function postGetFileInfo($path, $data)
-	{
+	public function postGetFileInfo( $path, $data ) {
 
 		// if path is a folder do nothing
-		if (is_array($data) && array_key_exists('size', $data)) {
+		if ( is_array( $data ) && array_key_exists( 'size', $data ) ) {
 
 			// Disable encryption proxy to prevent recursive calls
 			$proxyStatus = \OC_FileProxy::$enabled;
 			\OC_FileProxy::$enabled = false;
 
 			// get file size
-			$data['size'] = self::postFileSize($path, $data['size']);
+			$data['size'] = self::postFileSize( $path, $data['size'] );
 
 			// Re-enable the proxy
 			\OC_FileProxy::$enabled = $proxyStatus;
@@ -389,52 +377,51 @@ class Proxy extends \OC_FileProxy
 	 * @param $size
 	 * @return bool
 	 */
-	public function postFileSize($path, $size)
-	{
+	public function postFileSize( $path, $size ) {
 
-		$view = new \OC_FilesystemView('/');
+		$view = new \OC_FilesystemView( '/' );
 
 		// if path is a folder do nothing
-		if ($view->is_dir($path)) {
+		if ( $view->is_dir( $path ) ) {
 			return $size;
 		}
 
 		// Reformat path for use with OC_FSV
-		$path_split = explode('/', $path);
-		$path_f = implode('/', array_slice($path_split, 3));
+		$path_split = explode( '/', $path );
+		$path_f = implode( '/', array_slice( $path_split, 3 ) );
 
 		// if path is empty we cannot resolve anything
-		if (empty($path_f)) {
+		if ( empty( $path_f ) ) {
 			return $size;
 		}
 
 		$fileInfo = false;
 		// get file info from database/cache if not .part file
-		if(!Keymanager::isPartialFilePath($path)) {
-			$fileInfo = $view->getFileInfo($path);
+		if ( !Keymanager::isPartialFilePath( $path ) ) {
+			$fileInfo = $view->getFileInfo( $path );
 		}
 
 		// if file is encrypted return real file size
-		if (is_array($fileInfo) && $fileInfo['encrypted'] === true) {
+		if ( is_array( $fileInfo ) && $fileInfo['encrypted'] === true ) {
 			$size = $fileInfo['unencrypted_size'];
 		} else {
 			// self healing if file was removed from file cache
-			if (!is_array($fileInfo)) {
+			if ( !is_array( $fileInfo ) ) {
 				$fileInfo = array();
 			}
 
 			$userId = \OCP\User::getUser();
-			$util = new Util($view, $userId);
-			$fixSize = $util->getFileSize($path);
-			if ($fixSize > 0) {
+			$util = new Util( $view, $userId );
+			$fixSize = $util->getFileSize( $path );
+			if ( $fixSize > 0 ) {
 				$size = $fixSize;
 
 				$fileInfo['encrypted'] = true;
 				$fileInfo['unencrypted_size'] = $size;
 
 				// put file info if not .part file
-				if(!Keymanager::isPartialFilePath($path_f)) {
-					$view->putFileInfo($path, $fileInfo);
+				if ( !Keymanager::isPartialFilePath( $path_f ) ) {
+					$view->putFileInfo( $path, $fileInfo );
 				}
 			}
 
@@ -445,33 +432,32 @@ class Proxy extends \OC_FileProxy
 	/**
 	 * @param $path
 	 */
-	public function handleFile($path)
-	{
+	public function handleFile( $path ) {
 
 		// Disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$view = new \OC_FilesystemView('/');
-		$session = new Session($view);
+		$view = new \OC_FilesystemView( '/' );
+		$session = new Session( $view );
 		$userId = \OCP\User::getUser();
-		$util = new Util($view, $userId);
+		$util = new Util( $view, $userId );
 
 		// Reformat path for use with OC_FSV
-		$path_split = explode('/', $path);
-		$path_f = implode('/', array_slice($path_split, 3));
+		$path_split = explode( '/', $path );
+		$path_f = implode( '/', array_slice( $path_split, 3 ) );
 
 		// only if file is on 'files' folder fix file size and sharing
-		if ($path_split[2] == 'files' && $util->fixFileSize($path)) {
+		if ( count($path_split) >= 2 && $path_split[2] == 'files' && $util->fixFileSize( $path ) ) {
 
 			// get sharing app state
 			$sharingEnabled = \OCP\Share::isEnabled();
 
 			// get users
-			$usersSharing = $util->getSharingUsersArray($sharingEnabled, $path_f);
+			$usersSharing = $util->getSharingUsersArray( $sharingEnabled, $path_f );
 
 			// update sharing-keys
-			$util->setSharedFileKeyfiles($session, $usersSharing, $path_f);
+			$util->setSharedFileKeyfiles( $session, $usersSharing, $path_f );
 		}
 
 		\OC_FileProxy::$enabled = $proxyStatus;