gremove unused code

3 files changed, 68 insertions, 154 deletions

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 74f8a1ffa3b..708d1719d73 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -472,61 +472,7 @@ class Crypt {
 		return $result;

 	

 	}

-

-        /**

-         * @brief Encrypts content symmetrically and generates keyfile asymmetrically

-         * @returns array containing catfile and new keyfile. 

-         * keys: data, key

-         * @note this method is a wrapper for combining other crypt class methods

-         */

-	public static function keyEncryptKeyfile( $plainContent, $publicKey, $path ) {

-

-		$user = \OCP\User::getUser();

-		$view = new \OC_FilesystemView('/');

-		$util = new Util($view, $user);

-

-		// Encrypt plain data, generate keyfile & encrypted file

-		$cryptedData = self::symmetricEncryptFileContentKeyfile( $plainContent );

-		

-		// Encrypt keyfile

-

-		$sharingEnabled = \OCP\Share::isEnabled();

-

-		// if file exists try to get sharing users

-		if($view->file_exists($path)) {

-			$uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $path, $user );

-		} else {

-			$uniqueUserIds[] = $user;

-		}

-

-		// Fetch public keys for all users who will share the file

-		$publicKeys = Keymanager::getPublicKeys( $view, $uniqueUserIds );

-

-		// Encrypt plain keyfile to multiple sharefiles

-		$multiEncrypted = Crypt::multiKeyEncrypt( $cryptedData['key'], $publicKeys );

-

-		return array( 'data' => $cryptedData['encrypted'], 'filekey' => $multiEncrypted['data'], 'sharekeys' => $multiEncrypted['keys'] );

-		

-	}

-	

-        /**

-         * @brief Takes catfile, keyfile, and private key, and

-         * performs decryption

-         * @returns decrypted content

-         * @note this method is a wrapper for combining other crypt class methods

-         */

-	public static function keyDecryptKeyfile( $catfile, $keyfile, $privateKey ) {

-		

-		// Decrypt the keyfile with the user's private key

-		$decryptedKeyfile = self::keyDecrypt( $keyfile, $privateKey );

 		

-		// Decrypt the catfile symmetrically using the decrypted keyfile

-		$decryptedData = self::symmetricDecryptFileContent( $catfile, $decryptedKeyfile );

-		

-		return $decryptedData;

-		

-	}

-	

 	/**

 	* @brief Symmetrically encrypt a file by combining encrypted component data blocks

 	*/

@@ -743,13 +689,17 @@ class Crypt {
 		

 	}

 	

-	public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKey, $newPassphrase, $path ) {

+	public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys, $newPassphrase, $path ) {

 	

 		$decrypted = self::legacyDecrypt( $legacyEncryptedContent, $legacyPassphrase );

-	

-		$recrypted = self::keyEncryptKeyfile( $decrypted, $publicKey, $path );

-		

-		return $recrypted;

+

+		// Encrypt plain data, generate keyfile & encrypted file

+		$cryptedData = self::symmetricEncryptFileContentKeyfile( $decrypted );

+

+		// Encrypt plain keyfile to multiple sharefiles

+		$multiEncrypted = Crypt::multiKeyEncrypt( $cryptedData['key'], $publicKeys );

+

+		return array( 'data' => $cryptedData['encrypted'], 'filekey' => $multiEncrypted['data'], 'sharekeys' => $multiEncrypted['keys'] );

 	

 	}

 	

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index b312b502c14..a2dee1ca71f 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -656,103 +656,108 @@ class Util {
 	 * @param string $dirPath the directory whose files will be encrypted
 	 * @note Encryption is recursive
 	 */
-	public function encryptAll( $publicKey, $dirPath, $legacyPassphrase = null, $newPassphrase = null ) {
-		
-		if ( $found = $this->findEncFiles( $dirPath ) ) {
-		
+	public function encryptAll($publicKey, $dirPath, $legacyPassphrase = null, $newPassphrase = null) {
+
+		if ($found = $this->findEncFiles($dirPath)) {
+
 			// Disable proxy to prevent file being encrypted twice
 			\OC_FileProxy::$enabled = false;
-		
+
 			// Encrypt unencrypted files
-			foreach ( $found['plain'] as $plainFile ) {
-				
+			foreach ($found['plain'] as $plainFile) {
+
 				//relative to data/<user>/file
 				$relPath = $plainFile['path'];
-				
+
 				//relative to /data
-				$rawPath = $this->userId . '/files/' .  $plainFile['path'];
-				
+				$rawPath = $this->userId . '/files/' . $plainFile['path'];
+
 				// Open plain file handle for binary reading
-				$plainHandle1 = $this->view->fopen( $rawPath, 'rb' );
-				
+				$plainHandle1 = $this->view->fopen($rawPath, 'rb');
+
 				// 2nd handle for moving plain file - view->rename() doesn't work, this is a workaround
-				$plainHandle2 = $this->view->fopen( $rawPath . '.plaintmp', 'wb' );
-				
+				$plainHandle2 = $this->view->fopen($rawPath . '.plaintmp', 'wb');
+
 				// Move plain file to a temporary location
-				stream_copy_to_stream( $plainHandle1, $plainHandle2 );
-				
+				stream_copy_to_stream($plainHandle1, $plainHandle2);
+
 				// Close access to original file
 				// $this->view->fclose( $plainHandle1 ); // not implemented in view{}
-				
 				// Delete original plain file so we can rename enc file later
-				$this->view->unlink( $rawPath );
-				
+				$this->view->unlink($rawPath);
+
 				// Open enc file handle for binary writing, with same filename as original plain file
-				$encHandle = fopen( 'crypt://' . $relPath, 'wb' );
-				
+				$encHandle = fopen('crypt://' . $relPath, 'wb');
+
 				// Save data from plain stream to new encrypted file via enc stream
 				// NOTE: Stream{} will be invoked for handling 
 				// the encryption, and should handle all keys 
 				// and their generation etc. automatically
-				$size = stream_copy_to_stream( $plainHandle2, $encHandle );
-				
+				$size = stream_copy_to_stream($plainHandle2, $encHandle);
+
 				// Delete temporary plain copy of file
-				$this->view->unlink( $rawPath . '.plaintmp' );
-				
+				$this->view->unlink($rawPath . '.plaintmp');
+
 				// Add the file to the cache
-				\OC\Files\Filesystem::putFileInfo( $plainFile['path'], array( 'encrypted'=>true, 'size' => $size ), '' );
-			
+				\OC\Files\Filesystem::putFileInfo($plainFile['path'], array('encrypted' => true, 'size' => $size), '');
 			}
-			
+
 			// Encrypt legacy encrypted files
-			if ( 
-				! empty( $legacyPassphrase ) 
-				&& ! empty( $newPassphrase ) 
+			if (
+				!empty($legacyPassphrase)
+				&& !empty($newPassphrase)
 			) {
-			
-				foreach ( $found['legacy'] as $legacyFile ) {
-				
+
+				foreach ($found['legacy'] as $legacyFile) {
+
 					// Fetch data from file
-					$legacyData = $this->view->file_get_contents( $legacyFile['path'] );
+					$legacyData = $this->view->file_get_contents($legacyFile['path']);
+
+					$sharingEnabled = \OCP\Share::isEnabled();
+
+					// if file exists try to get sharing users
+					if ($view->file_exists($legacyFile['path'])) {
+						$uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $legacyFile['path'], $this->userId);
+					} else {
+						$uniqueUserIds[] = $this->userId;
+					}
+
+					// Fetch public keys for all users who will share the file
+					$publicKeys = Keymanager::getPublicKeys($this->view, $uniqueUserIds);
 
 					// Recrypt data, generate catfile
-					$recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKey, $newPassphrase, $legacyFile['path'] );
-					
+					$recrypted = Crypt::legacyKeyRecryptKeyfile($legacyData, $legacyPassphrase, $publicKey, $newPassphrase, $legacyFile['path'], $publicKeys);
+
 					$rawPath = $legacyFile['path'];
 					$relPath = $this->stripUserFilesPath($rawPath);
-					
+
 					// Save keyfile
-					Keymanager::setFileKey( $this->view, $relPath, $this->userId, $recrypted['filekey'] );
+					Keymanager::setFileKey($this->view, $relPath, $this->userId, $recrypted['filekey']);
 
 					// Save sharekeys to user folders
-					Keymanager::setShareKeys( $this->view, $relPath, $recrypted['sharekeys'] );
+					Keymanager::setShareKeys($this->view, $relPath, $recrypted['sharekeys']);
 
 					// Overwrite the existing file with the encrypted one
-					$this->view->file_put_contents( $rawPath, $recrypted['data'] );
-					
-					$size = strlen( $recrypted['data'] );
-					
+					$this->view->file_put_contents($rawPath, $recrypted['data']);
+
+					$size = strlen($recrypted['data']);
+
 					// Add the file to the cache
-					\OC\Files\Filesystem::putFileInfo( $rawPath, array( 'encrypted'=>true, 'size' => $size ), '' );
-				
+					\OC\Files\Filesystem::putFileInfo($rawPath, array('encrypted' => true, 'size' => $size), '');
 				}
-				
 			}
-			
+
 			\OC_FileProxy::$enabled = true;
-			
+
 			// If files were found, return true
 			return true;
-		
 		} else {
-		
+
 			// If no files were found, return false
 			return false;
-			
 		}
-		
 	}
-	
+
 	/**
 	 * @brief Return important encryption related paths
 	 * @param string $pathName Name of the directory to return the path of
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index bfb5ca0ec8b..69fd99d9a82 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -513,48 +513,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals( $this->dataUrl, $decrypt );
 	
 	}
-	
-	// What is the point of this test? It doesn't use keyEncryptKeyfile()
-	function testKeyEncryptKeyfile() {
-	
-		# TODO: Don't repeat encryption from previous tests, use PHPUnit test interdependency instead
-		
-		// Generate keypair
-		$pair1 = Encryption\Crypt::createKeypair();
-		
-		// Encrypt plain data, generate keyfile & encrypted file
-		$cryptedData = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->dataUrl );
-		
-		// Encrypt keyfile
-		$cryptedKey = Encryption\Crypt::keyEncrypt( $cryptedData['key'], $pair1['publicKey'] );
-		
-		// Decrypt keyfile
-		$decryptKey = Encryption\Crypt::keyDecrypt( $cryptedKey, $pair1['privateKey'] );
-		
-		// Decrypt encrypted file
-		$decryptData = Encryption\Crypt::symmetricDecryptFileContent( $cryptedData['encrypted'], $decryptKey );
-		
-		$this->assertEquals( $this->dataUrl, $decryptData );
-	
-	}
-	
-	/**
-	 * @brief test functionality of keyEncryptKeyfile() and 
-	 * keyDecryptKeyfile()
-	 */
-	function testKeyDecryptKeyfile() {
-		
-		$encrypted = Encryption\Crypt::keyEncryptKeyfile( $this->dataShort, $this->genPublicKey );
-		
-		$this->assertNotEquals( $encrypted['data'], $this->dataShort );
 		
-		$decrypted = Encryption\Crypt::keyDecryptKeyfile( $encrypted['data'], $encrypted['key'], $this->genPrivateKey );
-		
-		$this->assertEquals( $decrypted, $this->dataShort );
-		
-	}
-
-	
 	/**
 	 * @brief test encryption using legacy blowfish method
 	 */