From 894856ce01daa5fd1e6a8b7dd3a62a41bd24df42 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 12 Nov 2013 15:51:51 +0100
Subject: make sure that we keep the correct timestamp and etag after
 encryoption/decryption

---
 apps/files_encryption/lib/util.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'apps/files_encryption/lib')

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 5e855abd973..5800d3ed108 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -717,17 +717,17 @@ class Util {
 			// Encrypt unencrypted files
 			foreach ($found['encrypted'] as $encryptedFile) {
 
-				//get file info
-				$fileInfo = \OC\Files\Filesystem::getFileInfo($encryptedFile['path']);
-
 				//relative to data/<user>/file
 				$relPath = Helper::stripUserFilesPath($encryptedFile['path']);
 
+				//get file info
+				$fileInfo = \OC\Files\Filesystem::getFileInfo($relPath);
+
 				//relative to /data
 				$rawPath = $encryptedFile['path'];
 
 				//get timestamp
-				$timestamp = $this->view->filemtime($rawPath);
+				$timestamp = $fileInfo['mtime'];
 
 				//enable proxy to use OC\Files\View to access the original file
 				\OC_FileProxy::$enabled = true;
@@ -768,10 +768,10 @@ class Util {
 
 				$this->view->rename($relPath . '.part', $relPath);
 
-				$this->view->chroot($fakeRoot);
-
 				//set timestamp
-				$this->view->touch($rawPath, $timestamp);
+				$this->view->touch($relPath, $timestamp);
+
+				$this->view->chroot($fakeRoot);
 
 				// Add the file to the cache
 				\OC\Files\Filesystem::putFileInfo($relPath, array(
@@ -839,7 +839,7 @@ class Util {
 				$rawPath = '/' . $this->userId . '/files/' . $plainFile['path'];
 
 				// keep timestamp
-				$timestamp = $this->view->filemtime($rawPath);
+				$timestamp = $fileInfo['mtime'];
 
 				// Open plain file handle for binary reading
 				$plainHandle = $this->view->fopen($rawPath, 'rb');
@@ -858,10 +858,10 @@ class Util {
 
 				$this->view->rename($relPath . '.part', $relPath);
 
-				$this->view->chroot($fakeRoot);
-
 				// set timestamp
-				$this->view->touch($rawPath, $timestamp);
+				$this->view->touch($relPath, $timestamp);
+
+				$this->view->chroot($fakeRoot);
 
 				// Add the file to the cache
 				\OC\Files\Filesystem::putFileInfo($relPath, array(
-- 
cgit v1.2.3


From e2fb8d7128d0022406d3cc22cda0439acb599f09 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 12 Nov 2013 15:55:59 +0100
Subject: only update file cache if the file is already indexed to avoid that
 we create a incomplete file cache entry

---
 apps/files_encryption/lib/stream.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'apps/files_encryption/lib')

diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 5ce5caf80ce..6e2b2ceb27b 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -67,6 +67,7 @@ class Stream {
 	 * @var \OC\Files\View
 	 */
 	private $rootView; // a fsview object set to '/'
+
 	/**
 	 * @var \OCA\Encryption\Session
 	 */
@@ -528,20 +529,22 @@ class Stream {
 				\OC_FileProxy::$enabled = $proxyStatus;
 			}
 
+			// we need to update the file info for the real file, not for the
+			// part file.
+			$path = Helper::fixPartialFilePath($this->rawPath);
+
 			// get file info
-			$fileInfo = $this->rootView->getFileInfo($this->rawPath);
-			if (!is_array($fileInfo)) {
-				$fileInfo = array();
+			$fileInfo = $this->rootView->getFileInfo($path);
+			if (is_array($fileInfo)) {
+				// set encryption data
+				$fileInfo['encrypted'] = true;
+				$fileInfo['size'] = $this->size;
+				$fileInfo['unencrypted_size'] = $this->unencryptedSize;
+
+				// set fileinfo
+				$this->rootView->putFileInfo($path, $fileInfo);
 			}
 
-			// set encryption data
-			$fileInfo['encrypted'] = true;
-			$fileInfo['size'] = $this->size;
-			$fileInfo['unencrypted_size'] = $this->unencryptedSize;
-
-			// set fileinfo
-			$this->rootView->putFileInfo($this->rawPath, $fileInfo);
-
 		}
 
 		return fclose($this->handle);
-- 
cgit v1.2.3


From dd0ebcede2ae163fda19996311cd643631ca3637 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 12 Nov 2013 18:48:31 +0100
Subject: fixPartialFilePath() is now stripPartialFileExtension()

---
 apps/files_encryption/lib/stream.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apps/files_encryption/lib')

diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 6e2b2ceb27b..069d9145a28 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -531,7 +531,7 @@ class Stream {
 
 			// we need to update the file info for the real file, not for the
 			// part file.
-			$path = Helper::fixPartialFilePath($this->rawPath);
+			$path = Helper::stripPartialFileExtension($this->rawPath);
 
 			// get file info
 			$fileInfo = $this->rootView->getFileInfo($path);
-- 
cgit v1.2.3