From 7c3c26ab941fa436d9dfb90958928816affb70f2 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Mon, 19 Jan 2015 13:01:37 +0100 Subject: Skip stray part files during initial encryption --- apps/files_encryption/lib/util.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index c1f273d86ed..c811989127b 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -279,6 +279,10 @@ class Util { while (false !== ($file = readdir($handle))) { if ($file !== "." && $file !== "..") { + // skip stray part files + if (Helper::isPartialFilePath($file)) { + continue; + } $filePath = $directory . '/' . $this->view->getRelativePath('/' . $file); $relPath = Helper::stripUserFilesPath($filePath); -- cgit v1.2.3 From 7a1ab3bb5e4ba247a47f6824ad360b9f47a6dd46 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Mon, 19 Jan 2015 13:01:52 +0100 Subject: Add class attribute types in encryption Util class --- apps/files_encryption/lib/util.php | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index c811989127b..b300999ff24 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -43,18 +43,69 @@ class Util { const FILE_TYPE_VERSION = 1; const FILE_TYPE_CACHE = 2; + /** + * @var \OC\Files\View + */ private $view; // OC\Files\View object for filesystem operations + + /** + * @var string + */ private $userId; // ID of the user we use to encrypt/decrypt files + + /** + * @var string + */ private $keyId; // ID of the key we want to manipulate + + /** + * @var bool + */ private $client; // Client side encryption mode flag + + /** + * @var string + */ private $publicKeyDir; // Dir containing all public user keys + + /** + * @var string + */ private $encryptionDir; // Dir containing user's files_encryption + + /** + * @var string + */ private $keysPath; // Dir containing all file related encryption keys + + /** + * @var string + */ private $publicKeyPath; // Path to user's public key + + /** + * @var string + */ private $privateKeyPath; // Path to user's private key + + /** + * @var string + */ private $userFilesDir; + + /** + * @var string + */ private $publicShareKeyId; + + /** + * @var string + */ private $recoveryKeyId; + + /** + * @var bool + */ private $isPublic; /** -- cgit v1.2.3