make file cache updates more robust

only update the encrypted version after the write operation is finished and the stream is closed

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

Author: schiessle

apps/encryption/lib/Crypto/Encryption.php

@@ -254,7 +254,6 @@ public function begin($path, $user, $mode, array $header, array $accessList) {
 	public function end($path, $position = 0) {
 		$result = '';
 		if ($this->isWriteOperation) {
-			$this->keyManager->setVersion($path, $this->version + 1, new View());
 			// in case of a part file we remember the new signature versions
 			// the version will be set later on update.
 			// This way we make sure that other apps listening to the pre-hooks

lib/private/Files/Stream/Encryption.php

@@ -102,6 +102,9 @@ class Encryption extends Wrapper {
 	/** @var array */
 	protected $expectedContextProperties;
 
+	/** @var bool */
+	protected $fileUpdated = false;
+
 	public function __construct() {
 		$this->expectedContextProperties = array(
 			'source',
@@ -313,7 +316,7 @@ public function stream_read($count) {
 	}
 
 	public function stream_write($data) {
-
+		$this->fileUpdated = true;
 		$length = 0;
 		// loop over $data to fit it in 6126 sized unencrypted blocks
 		while (isset($data[0])) {
@@ -414,7 +417,18 @@ public function stream_close() {
 			}
 			$this->encryptionStorage->updateUnencryptedSize($this->fullPath, $this->unencryptedSize);
 		}
-		return parent::stream_close();
+		$result = parent::stream_close();
+
+		if ($this->fileUpdated) {
+			$cache = $this->storage->getCache();
+			$cacheEntry = $cache->get($this->internalPath);
+			if ($cacheEntry) {
+				$version = $cacheEntry['encryptedVersion'] + 1;
+				$cache->update($cacheEntry->getId(), ['encrypted' => $version, 'encryptedVersion' => $version]);
+			}
+		}
+
+		return $result;
 	}
 
 	/**