From: Florin Peter <github@florin-peter.de>
Date: Sun, 28 Apr 2013 23:43:59 +0000 (+0200)
Subject: speed improvement
X-Git-Tag: v6.0.0alpha2~743^2~145
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4a63faf64b14b21af7cb73f43ca3fcf841aff804;p=nextcloud-server.git

speed improvement
---

diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 411bcdac92d..a51f2c56d95 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -298,7 +298,8 @@ class Stream {
 		// automatically attempted when the file is written to disk - 
 		// we are handling that separately here and we don't want to 
 		// get into an infinite loop
-		//\OC_FileProxy::$enabled = false;
+        $proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
 		
 		// Get the length of the unencrypted data that we are handling
 		$length = strlen( $data );
@@ -322,30 +323,7 @@ class Stream {
 			
 		}
 		
-		// Fetch user's public key
-		$this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
-		
-		// Check if OC sharing api is enabled
-		$sharingEnabled = \OCP\Share::isEnabled();
-		
-		$util = new Util( $this->rootView, $this->userId );
-		
-		// Get all users sharing the file includes current user
-		$uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath, $this->userId);
-
-        // Fetch public keys for all sharing users
-		$publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
 
-        // Encrypt enc key for all sharing users
-		$this->encKeyfiles = Crypt::multiKeyEncrypt( $this->plainKey, $publicKeys );
-		
-		$view = new \OC_FilesystemView( '/' );
-		
-		// Save the new encrypted file key
-		Keymanager::setFileKey( $this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data'] );
-		
-		// Save the sharekeys
-		Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
 		
 		// If extra data is left over from the last round, make sure it 
 		// is integrated into the next 6126 / 8192 block
@@ -437,6 +415,8 @@ class Stream {
 		$this->size = max( $this->size, $pointer + $length );
         $this->unencryptedSize += $length;
 
+        \OC_FileProxy::$enabled = $proxyStatus;
+
 		return $length;
 
 	}
@@ -492,13 +472,46 @@ class Stream {
 	}
 
 	public function stream_close() {
-	
-		$this->flush();
+
+        $this->flush();
 		
 		if ( 
 		$this->meta['mode']!='r' 
 		and $this->meta['mode']!='rb' 
 		) {
+
+            // Disable encryption proxy to prevent recursive calls
+            $proxyStatus = \OC_FileProxy::$enabled;
+            \OC_FileProxy::$enabled = false;
+
+            // Fetch user's public key
+            $this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
+
+            // Check if OC sharing api is enabled
+            $sharingEnabled = \OCP\Share::isEnabled();
+
+            $util = new Util( $this->rootView, $this->userId );
+
+            // Get all users sharing the file includes current user
+            $uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath, $this->userId);
+
+            // Fetch public keys for all sharing users
+            $publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
+
+            // Encrypt enc key for all sharing users
+            $this->encKeyfiles = Crypt::multiKeyEncrypt( $this->plainKey, $publicKeys );
+
+            $view = new \OC_FilesystemView( '/' );
+
+            // Save the new encrypted file key
+            Keymanager::setFileKey( $this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data'] );
+
+            // Save the sharekeys
+            Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
+
+            // Re-enable proxy - our work is done
+            \OC_FileProxy::$enabled = $proxyStatus;
+
 			\OC\Files\Filesystem::putFileInfo( $this->relPath, array( 'encrypted' => 1, 'size' => $this->size, 'unencrypted_size' => $this->unencryptedSize ), '' );
 		}