From cb65b7ca9d485f1a2ebf71ba2d60cb034669f945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Fri, 19 Apr 2013 10:31:42 +0200 Subject: [PATCH 1/6] move encryption keys to trash bin --- apps/files_trashbin/lib/trash.php | 107 +++++++++++++++++++++--------- 1 file changed, 76 insertions(+), 31 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index f0b56eef014..82c4601a026 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -46,7 +46,7 @@ class Trashbin { $path_parts = pathinfo($file_path); - $deleted = $path_parts['basename']; + $filename = $path_parts['basename']; $location = $path_parts['dirname']; $timestamp = time(); $mime = $view->getMimeType('files'.$file_path); @@ -62,45 +62,24 @@ class Trashbin { $trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin')); } - $sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view); + $sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$filename.'.d'.$timestamp, $view); - if ( $view->file_exists('files_trashbin/files/'.$deleted.'.d'.$timestamp) ) { + if ( $view->file_exists('files_trashbin/files/'.$filename.'.d'.$timestamp) ) { $trashbinSize += $sizeOfAddedFiles; $query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)"); - $result = $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user)); + $result = $query->execute(array($filename, $timestamp, $location, $type, $mime, $user)); if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin. - $view->deleteAll('files_trashbin/files/'.$deleted.'.d'.$timestamp); + $view->deleteAll('files_trashbin/files/'.$filename.'.d'.$timestamp); \OC_Log::write('files_trashbin', 'trash bin database couldn\'t be updated', \OC_log::ERROR); return; } \OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', array('filePath' => \OC\Files\Filesystem::normalizePath($file_path), - 'trashPath' => \OC\Files\Filesystem::normalizePath($deleted.'.d'.$timestamp))); - - // Take care of file versions - if ( \OCP\App::isEnabled('files_versions') ) { - if ( $view->is_dir('files_versions/'.$file_path) ) { - $trashbinSize += self::calculateSize(new \OC\Files\View('/'. $user.'/files_versions/'.$file_path)); - $view->rename('files_versions/'.$file_path, 'files_trashbin/versions'. $deleted.'.d'.$timestamp); - } else if ( $versions = \OCA\Files_Versions\Storage::getVersions($user, $file_path) ) { - foreach ($versions as $v) { - $trashbinSize += $view->filesize('files_versions'.$v['path'].'.v'.$v['version']); - $view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'files_trashbin/versions/'. $deleted.'.v'.$v['version'].'.d'.$timestamp); - } - } - } - - // Take care of encryption keys - $keyfile = \OC\Files\Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path); - if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile.'.key') ) { - if ( $view->is_dir('files'.$file_path) ) { - $trashbinSize += self::calculateSize(new \OC\Files\View('/'.$user.'/'.$keyfile)); - $view->rename($keyfile, 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp); - } else { - $trashbinSize += $view->filesize($keyfile.'.key'); - $view->rename($keyfile.'.key', 'files_trashbin/keyfiles/'. $deleted.'.key.d'.$timestamp); - } - } + 'trashPath' => \OC\Files\Filesystem::normalizePath($filename.'.d'.$timestamp))); + + $trashbinSize += self::retainVersions($view, $file_path, $filename, $timestamp); + $trashbinSize += self::retainEncryptionKeys($view, $file_path, $filename, $timestamp); + } else { \OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OC_log::ERROR); } @@ -111,6 +90,72 @@ class Trashbin { } + /** + * Move file versions to trash so that they can be restored later + * + * @param $file_path path to original file + * @param $filename of deleted file + * @param $timestamp when the file was deleted + * + * @return size of stored versions + */ + private static function retainVersions($view, $file_path, $filename, $timestamp) { + $size = 0; + if (\OCP\App::isEnabled('files_versions')) { + $user = \OCP\User::getUser(); + if ($view->is_dir('files_versions/' . $file_path)) { + $size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_versions/' . $file_path)); + $view->rename('files_versions/' . $file_path, 'files_trashbin/versions' . $filename . '.d' . $timestamp); + } else if ($versions = \OCA\Files_Versions\Storage::getVersions($user, $file_path)) { + foreach ($versions as $v) { + $size += $view->filesize('files_versions' . $v['path'] . '.v' . $v['version']); + $view->rename('files_versions' . $v['path'] . '.v' . $v['version'], 'files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp); + } + } + } + + return $size; + } + + /** + * Move encryption keys to trash so that they can be restored later + * + * @param $file_path path to original file + * @param $filename of deleted file + * @param $timestamp when the file was deleted + * + * @return size of encryption keys + */ + private static function retainEncryptionKeys($view, $file_path, $filename, $timestamp) { + $size = 0; + + if (\OCP\App::isEnabled('files_encryption')) { + + $user = \OCP\User::getUser(); + + //retain key files + $keyfile = \OC\Files\Filesystem::normalizePath('files_encryption/keyfiles/' . $file_path); + if ($view->file_exists($keyfile . '.key')) { + + $user = \OCP\User::getUser(); + if ($view->is_dir('files' . $file_path)) { + $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile)); + $view->rename($keyfile, 'files_trashbin/keyfiles/' . $filename . '.d' . $timestamp); + } else { + $size += $view->filesize($keyfile . '.key'); + $view->rename($keyfile . '.key', 'files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp); + } + } + + // retain per user encryption key for keyfile + $sharekeys = \OC\Files\Filesystem::normalizePath('files_encryption/share-keys/' . $file_path); + if ($view->is_dir($sharekeys)) { + $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $sharekeys)); + $view->rename($keyfile, 'files_trashbin/share-keys/' . $sharekeys . '.d' . $timestamp); + } + } + return $size; + } /** * restore files from trash bin From 680ba4bea18373a1a8663a9b81cfd5f599544fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Fri, 19 Apr 2013 10:35:32 +0200 Subject: [PATCH 2/6] restore encryption keys from trash bin (development snapshot) --- apps/files_trashbin/lib/trash.php | 117 ++++++++++++++++++------------ 1 file changed, 72 insertions(+), 45 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 82c4601a026..0808ed09d9b 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -212,49 +212,10 @@ class Trashbin { } else { $trashbinSize -= $view->filesize($target.$ext); } - // if versioning app is enabled, copy versions from the trash bin back to the original location - if ( \OCP\App::isEnabled('files_versions') ) { - if ($timestamp ) { - $versionedFile = $filename; - } else { - $versionedFile = $file; - } - if ( $result[0]['type'] === 'dir' ) { - $trashbinSize -= self::calculateSize(new \OC\Files\View('/'.$user.'/'.'files_trashbin/versions/'. $file)); - $view->rename(\OC\Files\Filesystem::normalizePath('files_trashbin/versions/'. $file), \OC\Files\Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext)); - } else if ( $versions = self::getVersionsFromTrash($versionedFile, $timestamp) ) { - foreach ($versions as $v) { - if ($timestamp ) { - $trashbinSize -= $view->filesize('files_trashbin/versions/'.$versionedFile.'.v'.$v.'.d'.$timestamp); - $view->rename('files_trashbin/versions/'.$versionedFile.'.v'.$v.'.d'.$timestamp, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); - } else { - $trashbinSize -= $view->filesize('files_trashbin/versions/'.$versionedFile.'.v'.$v); - $view->rename('files_trashbin/versions/'.$versionedFile.'.v'.$v, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v); - } - } - } - } - - // Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!) - $parts = pathinfo($file); - if ( $result[0]['type'] === 'dir' ) { - $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$parts['dirname'].'/'.$filename); - } else { - $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$parts['dirname'].'/'.$filename.'.key'); - } - if ($timestamp) { - $keyfile .= '.d'.$timestamp; - } - if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) { - if ( $result[0]['type'] === 'dir' ) { - $trashbinSize -= self::calculateSize(new \OC\Files\View('/'.$user.'/'.$keyfile)); - $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename); - } else { - $trashbinSize -= $view->filesize($keyfile); - $view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename.'.key'); - } - } - + + $trashbinSize -= self::restoreVersions($view, $file, $filename, $ext, $location, $timestamp); + $trashbinSize -= self::restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp); + if ( $timestamp ) { $query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?'); $query->execute(array($user,$filename,$timestamp)); @@ -263,13 +224,79 @@ class Trashbin { self::setTrashbinSize($user, $trashbinSize); return true; - } else { - \OC_Log::write('files_trashbin', 'Couldn\'t restore file from trash bin, '.$filename, \OC_log::ERROR); } return false; } + /** + * @brief restore versions from trash bin + * + * @param $view file view + * @param $file complete path to file + * @param $filename name of file + * @param $ext file extension in case a file with the same $filename already exists + * @param $location location if file + * @param $timestamp deleteion time + * @return size of restored versions + */ + private static function restoreVersions($view, $file, $filename, $ext, $location, $timestamp) { + $size = 0; + if (\OCP\App::isEnabled('files_versions')) { + $user = \OCP\User::getUser(); + if ($timestamp) { + $versionedFile = $filename; + } else { + $versionedFile = $file; + } + if ($result[0]['type'] === 'dir') { + $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . 'files_trashbin/versions/' . $file)); + $view->rename(\OC\Files\Filesystem::normalizePath('files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath('files_versions/' . $location . '/' . $filename . $ext)); + } else if ($versions = self::getVersionsFromTrash($versionedFile, $timestamp)) { + foreach ($versions as $v) { + if ($timestamp) { + $size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp); + $view->rename('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, 'files_versions/' . $location . '/' . $filename . $ext . '.v' . $v); + } else { + $size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v); + $view->rename('files_trashbin/versions/' . $versionedFile . '.v' . $v, 'files_versions/' . $location . '/' . $filename . $ext . '.v' . $v); + } + } + } + } + return $size; + } + + private static function restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp) { + // Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!) + $size = 0; + if (\OCP\App::isEnabled('files_encryption')) { + $user = \OCP\User::getUser(); + if ($view->file_exists($keyfile)) { + $parts = pathinfo($file); + if ($result[0]['type'] === 'dir') { + $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $parts['dirname'] . '/' . $filename); + } else { + $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $parts['dirname'] . '/' . $filename . '.key'); + } + if ($timestamp) { + $keyfile .= '.d' . $timestamp; + } + if ($result[0]['type'] === 'dir') { + $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile)); + $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename); + } else { + $size += $view->filesize($keyfile); + $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . '.key'); + } + } + + //TODO restore share-keys + //... + } + return $size; + } + /** * delete file from trash bin permanently * @param $filename path to the file From 228c5015158687b3dc1691c84904b3f8d3f91d11 Mon Sep 17 00:00:00 2001 From: Florin Peter Date: Fri, 19 Apr 2013 23:21:06 +0200 Subject: [PATCH 3/6] fixed some problems and broken code --- apps/files_trashbin/lib/trash.php | 127 ++++++++++++++++++++---------- 1 file changed, 84 insertions(+), 43 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 0808ed09d9b..d3edaa01bc6 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -39,9 +39,10 @@ class Trashbin { $view = new \OC\Files\View('/'. $user); if (!$view->is_dir('files_trashbin')) { $view->mkdir('files_trashbin'); - $view->mkdir("files_trashbin/files"); - $view->mkdir("files_trashbin/versions"); - $view->mkdir("files_trashbin/keyfiles"); + $view->mkdir('files_trashbin/files'); + $view->mkdir('files_trashbin/versions'); + $view->mkdir('files_trashbin/keyfiles'); + $view->mkdir('files_trashbin/share-keys'); } $path_parts = pathinfo($file_path); @@ -90,18 +91,19 @@ class Trashbin { } - /** - * Move file versions to trash so that they can be restored later - * - * @param $file_path path to original file - * @param $filename of deleted file - * @param $timestamp when the file was deleted - * - * @return size of stored versions - */ + /** + * Move file versions to trash so that they can be restored later + * + * @param \OC\Files\View $view + * @param $file_path path to original file + * @param $filename of deleted file + * @param $timestamp when the file was deleted + * + * @return size of stored versions + */ private static function retainVersions($view, $file_path, $filename, $timestamp) { $size = 0; - if (\OCP\App::isEnabled('files_versions')) { + if (\OCP\App::isEnabled('files_versions')) { $user = \OCP\User::getUser(); if ($view->is_dir('files_versions/' . $file_path)) { $size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_versions/' . $file_path)); @@ -117,15 +119,16 @@ class Trashbin { return $size; } - /** - * Move encryption keys to trash so that they can be restored later - * - * @param $file_path path to original file - * @param $filename of deleted file - * @param $timestamp when the file was deleted - * - * @return size of encryption keys - */ + /** + * Move encryption keys to trash so that they can be restored later + * + * @param \OC\Files\View $view + * @param $file_path path to original file + * @param $filename of deleted file + * @param $timestamp when the file was deleted + * + * @return size of encryption keys + */ private static function retainEncryptionKeys($view, $file_path, $filename, $timestamp) { $size = 0; @@ -133,26 +136,33 @@ class Trashbin { $user = \OCP\User::getUser(); - //retain key files - $keyfile = \OC\Files\Filesystem::normalizePath('files_encryption/keyfiles/' . $file_path); - if ($view->file_exists($keyfile . '.key')) { + // disable proxy to prevent recursive calls + \OC_FileProxy::$enabled = false; - $user = \OCP\User::getUser(); - if ($view->is_dir('files' . $file_path)) { + //retain key files + $keyfile = \OC\Files\Filesystem::normalizePath('files_encryption/keyfiles/' . $file_path); + if ($view->is_dir($keyfile) || $view->file_exists($keyfile . '.key')) { + + $user = \OCP\User::getUser(); + if ($view->is_dir($keyfile)) { $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile)); $view->rename($keyfile, 'files_trashbin/keyfiles/' . $filename . '.d' . $timestamp); } else { $size += $view->filesize($keyfile . '.key'); - $view->rename($keyfile . '.key', 'files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp); + $view->rename($keyfile . '.key', 'files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp); } } + // TODO needs review, only handle folders atm? // retain per user encryption key for keyfile $sharekeys = \OC\Files\Filesystem::normalizePath('files_encryption/share-keys/' . $file_path); if ($view->is_dir($sharekeys)) { $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $sharekeys)); $view->rename($keyfile, 'files_trashbin/share-keys/' . $sharekeys . '.d' . $timestamp); } + + // enable proxy + \OC_FileProxy::$enabled = true; } return $size; } @@ -162,7 +172,9 @@ class Trashbin { * @param $file path to the deleted file * @param $filename name of the file * @param $timestamp time when the file was deleted - */ + * + * @return bool + */ public static function restore($file, $filename, $timestamp) { $user = \OCP\User::getUser(); $view = new \OC\Files\View('/'.$user); @@ -202,8 +214,19 @@ class Trashbin { // we need a extension in case a file/dir with the same name already exists $ext = self::getUniqueExtension($location, $filename, $view); $mtime = $view->filemtime($source); - if( $view->rename($source, $target.$ext) ) { - $view->touch($target.$ext, $mtime); + + // disable proxy to prevent recursive calls + \OC_FileProxy::$enabled = false; + + // restore file + $restoreResult = $view->rename($source, $target.$ext); + + // enable proxy + \OC_FileProxy::$enabled = true; + + // handle the restore result + if( $restoreResult ) { + $view->touch($target.$ext, $mtime); \OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', array('filePath' => \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext), 'trashPath' => \OC\Files\Filesystem::normalizePath($file))); @@ -229,15 +252,16 @@ class Trashbin { return false; } - /** + /** * @brief restore versions from trash bin * - * @param $view file view + * @param \OC\Files\View $view file view * @param $file complete path to file * @param $filename name of file * @param $ext file extension in case a file with the same $filename already exists * @param $location location if file * @param $timestamp deleteion time + * * @return size of restored versions */ private static function restoreVersions($view, $file, $filename, $ext, $location, $timestamp) { @@ -249,7 +273,7 @@ class Trashbin { } else { $versionedFile = $file; } - if ($result[0]['type'] === 'dir') { + if ($view->is_dir('/files_trashbin/files/'.$file)) { $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . 'files_trashbin/versions/' . $file)); $view->rename(\OC\Files\Filesystem::normalizePath('files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath('files_versions/' . $location . '/' . $filename . $ext)); } else if ($versions = self::getVersionsFromTrash($versionedFile, $timestamp)) { @@ -267,22 +291,37 @@ class Trashbin { return $size; } - private static function restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp) { + + /** + * @brief restore encryption keys from trash bin + * + * @param \OC\Files\View $view + * @param $file complete path to file + * @param $filename name of file + * @param $ext file extension in case a file with the same $filename already exists + * @param $location location if file + * @param $timestamp deleteion time + * + * @return size of restored versions + */ + private static function restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp) { // Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!) $size = 0; if (\OCP\App::isEnabled('files_encryption')) { $user = \OCP\User::getUser(); + + $parts = pathinfo($file); + if ($view->is_dir('/files_trashbin/files/'.$file)) { + $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $parts['dirname'] . '/' . $filename); + } else { + $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $parts['dirname'] . '/' . $filename . '.key'); + } + if ($view->file_exists($keyfile)) { - $parts = pathinfo($file); - if ($result[0]['type'] === 'dir') { - $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $parts['dirname'] . '/' . $filename); - } else { - $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $parts['dirname'] . '/' . $filename . '.key'); - } if ($timestamp) { $keyfile .= '.d' . $timestamp; } - if ($result[0]['type'] === 'dir') { + if ($view->is_dir('/files_trashbin/files/'.$file)) { $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile)); $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename); } else { @@ -298,9 +337,11 @@ class Trashbin { } /** - * delete file from trash bin permanently + * @brief delete file from trash bin permanently + * * @param $filename path to the file * @param $timestamp of deletion time + * * @return size of deleted files */ public static function delete($filename, $timestamp=null) { From 26e5ef193d4285f2aee13c5b811d6d0df66e4792 Mon Sep 17 00:00:00 2001 From: Florin Peter Date: Mon, 22 Apr 2013 03:37:55 +0200 Subject: [PATCH 4/6] restore fixed --- apps/files_trashbin/lib/trash.php | 62 ++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index d3edaa01bc6..653242793be 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -64,7 +64,7 @@ class Trashbin { } $sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$filename.'.d'.$timestamp, $view); - + if ( $view->file_exists('files_trashbin/files/'.$filename.'.d'.$timestamp) ) { $trashbinSize += $sizeOfAddedFiles; $query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)"); @@ -141,6 +141,7 @@ class Trashbin { //retain key files $keyfile = \OC\Files\Filesystem::normalizePath('files_encryption/keyfiles/' . $file_path); + if ($view->is_dir($keyfile) || $view->file_exists($keyfile . '.key')) { $user = \OCP\User::getUser(); @@ -176,7 +177,8 @@ class Trashbin { * @return bool */ public static function restore($file, $filename, $timestamp) { - $user = \OCP\User::getUser(); + + $user = \OCP\User::getUser(); $view = new \OC\Files\View('/'.$user); $trashbinSize = self::getTrashbinSize($user); @@ -221,9 +223,6 @@ class Trashbin { // restore file $restoreResult = $view->rename($source, $target.$ext); - // enable proxy - \OC_FileProxy::$enabled = true; - // handle the restore result if( $restoreResult ) { $view->touch($target.$ext, $mtime); @@ -236,7 +235,7 @@ class Trashbin { $trashbinSize -= $view->filesize($target.$ext); } - $trashbinSize -= self::restoreVersions($view, $file, $filename, $ext, $location, $timestamp); + $trashbinSize -= self::restoreVersions($view, $file, $filename, $ext, $location, $timestamp); $trashbinSize -= self::restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp); if ( $timestamp ) { @@ -245,10 +244,16 @@ class Trashbin { } self::setTrashbinSize($user, $trashbinSize); - + + // enable proxy + \OC_FileProxy::$enabled = true; + return true; } + // enable proxy + \OC_FileProxy::$enabled = true; + return false; } @@ -302,7 +307,7 @@ class Trashbin { * @param $location location if file * @param $timestamp deleteion time * - * @return size of restored versions + * @return size of restored encrypted file */ private static function restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp) { // Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!) @@ -310,28 +315,41 @@ class Trashbin { if (\OCP\App::isEnabled('files_encryption')) { $user = \OCP\User::getUser(); - $parts = pathinfo($file); - if ($view->is_dir('/files_trashbin/files/'.$file)) { - $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $parts['dirname'] . '/' . $filename); + $path_parts = pathinfo($file); + $source_location = $path_parts['dirname']; + + if ($view->is_dir('/files_trashbin/keyfiles/'.$file)) { + if($source_location != '.') { + $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $source_location . '/' . $filename); + } else { + $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename); + } } else { - $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $parts['dirname'] . '/' . $filename . '.key'); + $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key'); } - if ($view->file_exists($keyfile)) { - if ($timestamp) { - $keyfile .= '.d' . $timestamp; - } - if ($view->is_dir('/files_trashbin/files/'.$file)) { - $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile)); - $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename); + if ($timestamp) { + $keyfile .= '.d' . $timestamp; + } + + // disable proxy to prevent recursive calls + \OC_FileProxy::$enabled = false; + + if ($view->file_exists($keyfile)) { + if ($view->is_dir($keyfile)) { + $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile)); + $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename); } else { $size += $view->filesize($keyfile); - $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . '.key'); + $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . '.key'); } } - //TODO restore share-keys - //... + //TODO restore share-keys + //... + + // enable proxy + \OC_FileProxy::$enabled = true; } return $size; } From 5e11948598e1ab2c9840c4e909f58f9f21ed09ab Mon Sep 17 00:00:00 2001 From: Florin Peter Date: Sat, 27 Apr 2013 00:15:46 +0200 Subject: [PATCH 5/6] added handling for share-keys this works only with latest files_encryption branch up from 813641e6e86601cc73da0f00d8430da62e872180 --- apps/files_trashbin/lib/trash.php | 101 ++++++++++++++++++++++++++---- 1 file changed, 88 insertions(+), 13 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 653242793be..9427f66ea5a 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -137,16 +137,17 @@ class Trashbin { $user = \OCP\User::getUser(); // disable proxy to prevent recursive calls + $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; - //retain key files + // retain key files $keyfile = \OC\Files\Filesystem::normalizePath('files_encryption/keyfiles/' . $file_path); if ($view->is_dir($keyfile) || $view->file_exists($keyfile . '.key')) { - $user = \OCP\User::getUser(); + // move keyfiles if ($view->is_dir($keyfile)) { - $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile)); + $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile)); $view->rename($keyfile, 'files_trashbin/keyfiles/' . $filename . '.d' . $timestamp); } else { $size += $view->filesize($keyfile . '.key'); @@ -154,16 +155,47 @@ class Trashbin { } } - // TODO needs review, only handle folders atm? - // retain per user encryption key for keyfile + // retain share keys $sharekeys = \OC\Files\Filesystem::normalizePath('files_encryption/share-keys/' . $file_path); + if ($view->is_dir($sharekeys)) { $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $sharekeys)); - $view->rename($keyfile, 'files_trashbin/share-keys/' . $sharekeys . '.d' . $timestamp); - } + $view->rename($sharekeys, 'files_trashbin/share-keys/' . $filename . '.d' . $timestamp); + } else { + // get local path to share-keys + $localShareKeysPath = $view->getLocalFile($sharekeys); + + // handle share-keys + $matches = glob(preg_quote($localShareKeysPath).'*.shareKey'); + foreach ($matches as $src) { + // get source file parts + $pathinfo = pathinfo($src); + + // we only want to keep the owners key so we can access the private key + $ownerShareKey = $filename . '.' . $user. '.shareKey'; + + // if we found the share-key for the owner, we need to move it to files_trashbin + if($pathinfo['basename'] == $ownerShareKey) { + + // calculate size + $size += $view->filesize($sharekeys. '.' . $user. '.shareKey'); + + // move file + $view->rename($sharekeys. '.' . $user. '.shareKey', 'files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp); + } else { + + // calculate size + $size += filesize($src); + + // don't keep other share-keys + unlink($src); + } + } + + } // enable proxy - \OC_FileProxy::$enabled = true; + \OC_FileProxy::$enabled = $proxyStatus; } return $size; } @@ -321,8 +353,10 @@ class Trashbin { if ($view->is_dir('/files_trashbin/keyfiles/'.$file)) { if($source_location != '.') { $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $source_location . '/' . $filename); + $sharekey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $source_location . '/' . $filename); } else { $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename); + $sharekey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename); } } else { $keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key'); @@ -333,23 +367,64 @@ class Trashbin { } // disable proxy to prevent recursive calls + $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; if ($view->file_exists($keyfile)) { + // handle directory if ($view->is_dir($keyfile)) { - $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile)); + + // handle keyfiles + $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile)); $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename); + + // handle share-keys + if ($timestamp) { + $sharekey .= '.d' . $timestamp; + } + $view->rename($sharekey, 'files_encryption/share-keys/' . $location . '/' . $filename); + } else { + // handle keyfiles $size += $view->filesize($keyfile); $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . '.key'); + + // handle share-keys + $ownerShareKey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user. '.shareKey'); + if ($timestamp) { + $ownerShareKey .= '.d' . $timestamp; + } + + $size += $view->filesize($ownerShareKey); + + // move only owners key + $view->rename($ownerShareKey, 'files_encryption/share-keys/' . $location . '/' . $filename . '.' . $user. '.shareKey'); + + // try to re-share if file is shared + $filesystemView = new \OC_FilesystemView('/'); + $session = new \OCA\Encryption\Session($filesystemView); + $util = new \OCA\Encryption\Util($filesystemView, $user); + + // fix the file size + $absolutePath = \OC\Files\Filesystem::normalizePath('/' . $user . '/files/'. $location. '/' .$filename); + $util->fixFileSize($absolutePath); + + // get current sharing state + $sharingEnabled = \OCP\Share::isEnabled(); + + // get the final filename + $target = \OC\Files\Filesystem::normalizePath($location.'/'.$filename); + + // get users sharing this file + $usersSharing = $util->getSharingUsersArray($sharingEnabled, $target.$ext, $user); + + // Attempt to set shareKey + $util->setSharedFileKeyfiles($session, $usersSharing, $target.$ext); } } - //TODO restore share-keys - //... - // enable proxy - \OC_FileProxy::$enabled = true; + \OC_FileProxy::$enabled = $proxyStatus; } return $size; } From 7a3ecd0429c625c5a04a59f868ab199fd3457285 Mon Sep 17 00:00:00 2001 From: Florin Peter Date: Sat, 27 Apr 2013 23:51:26 +0200 Subject: [PATCH 6/6] delete and restore of versions and share-keys now works fix restore of the same file name --- apps/files_trashbin/lib/trash.php | 57 ++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 9427f66ea5a..88c71a75ab0 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -104,16 +104,24 @@ class Trashbin { private static function retainVersions($view, $file_path, $filename, $timestamp) { $size = 0; if (\OCP\App::isEnabled('files_versions')) { - $user = \OCP\User::getUser(); + + // disable proxy to prevent recursive calls + $proxyStatus = \OC_FileProxy::$enabled; + \OC_FileProxy::$enabled = false; + + $user = \OCP\User::getUser(); if ($view->is_dir('files_versions/' . $file_path)) { - $size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_versions/' . $file_path)); - $view->rename('files_versions/' . $file_path, 'files_trashbin/versions' . $filename . '.d' . $timestamp); + $size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_versions/' . $file_path)); + $view->rename('files_versions/' . $file_path, 'files_trashbin/versions/' . $filename . '.d' . $timestamp); } else if ($versions = \OCA\Files_Versions\Storage::getVersions($user, $file_path)) { - foreach ($versions as $v) { + foreach ($versions as $v) { $size += $view->filesize('files_versions' . $v['path'] . '.v' . $v['version']); - $view->rename('files_versions' . $v['path'] . '.v' . $v['version'], 'files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp); + $view->rename('files_versions' . $v['path'] . '.v' . $v['version'], 'files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp); } } + + // enable proxy + \OC_FileProxy::$enabled = $proxyStatus; } return $size; @@ -186,7 +194,7 @@ class Trashbin { // calculate size $size += filesize($src); - + // don't keep other share-keys unlink($src); } @@ -250,6 +258,7 @@ class Trashbin { $mtime = $view->filemtime($source); // disable proxy to prevent recursive calls + $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; // restore file @@ -278,13 +287,13 @@ class Trashbin { self::setTrashbinSize($user, $trashbinSize); // enable proxy - \OC_FileProxy::$enabled = true; + \OC_FileProxy::$enabled = $proxyStatus; return true; } // enable proxy - \OC_FileProxy::$enabled = true; + \OC_FileProxy::$enabled = $proxyStatus; return false; } @@ -304,26 +313,34 @@ class Trashbin { private static function restoreVersions($view, $file, $filename, $ext, $location, $timestamp) { $size = 0; if (\OCP\App::isEnabled('files_versions')) { - $user = \OCP\User::getUser(); + // disable proxy to prevent recursive calls + $proxyStatus = \OC_FileProxy::$enabled; + \OC_FileProxy::$enabled = false; + + $user = \OCP\User::getUser(); if ($timestamp) { $versionedFile = $filename; } else { $versionedFile = $file; } - if ($view->is_dir('/files_trashbin/files/'.$file)) { + + if ($view->is_dir('/files_trashbin/versions/'.$file)) { $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . 'files_trashbin/versions/' . $file)); - $view->rename(\OC\Files\Filesystem::normalizePath('files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath('files_versions/' . $location . '/' . $filename . $ext)); + $view->rename(\OC\Files\Filesystem::normalizePath('files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath('files_versions/' . $location . '/' . $filename . $ext)); } else if ($versions = self::getVersionsFromTrash($versionedFile, $timestamp)) { - foreach ($versions as $v) { - if ($timestamp) { - $size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp); - $view->rename('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, 'files_versions/' . $location . '/' . $filename . $ext . '.v' . $v); + foreach ($versions as $v) { + if ($timestamp) { + $size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp); + $view->rename('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, 'files_versions/' . $location . '/' . $filename . $ext . '.v' . $v); } else { - $size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v); + $size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v); $view->rename('files_trashbin/versions/' . $versionedFile . '.v' . $v, 'files_versions/' . $location . '/' . $filename . $ext . '.v' . $v); } } } + + // enable proxy + \OC_FileProxy::$enabled = $proxyStatus; } return $size; } @@ -376,18 +393,18 @@ class Trashbin { // handle keyfiles $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile)); - $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename); + $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . $ext); // handle share-keys if ($timestamp) { $sharekey .= '.d' . $timestamp; } - $view->rename($sharekey, 'files_encryption/share-keys/' . $location . '/' . $filename); + $view->rename($sharekey, 'files_encryption/share-keys/' . $location . '/' . $filename . $ext); } else { // handle keyfiles $size += $view->filesize($keyfile); - $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . '.key'); + $view->rename($keyfile, 'files_encryption/keyfiles/' . $location . '/' . $filename . $ext . '.key'); // handle share-keys $ownerShareKey = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user. '.shareKey'); @@ -398,7 +415,7 @@ class Trashbin { $size += $view->filesize($ownerShareKey); // move only owners key - $view->rename($ownerShareKey, 'files_encryption/share-keys/' . $location . '/' . $filename . '.' . $user. '.shareKey'); + $view->rename($ownerShareKey, 'files_encryption/share-keys/' . $location . '/' . $filename . $ext . '.' . $user. '.shareKey'); // try to re-share if file is shared $filesystemView = new \OC_FilesystemView('/');