mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make sure that we keep the correct timestamp and etag after encryoption/decryption

This commit is contained in:
Bjoern Schiessle 2013-11-12 15:51:51 +01:00
parent a745901d50
commit 894856ce01
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/files_encryption/lib/util.php
View File

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