diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 98a5f1f2f28767ec62b0074ddbd812589f9314b1..48175e460ec2924537ba906ea3779311e0483b22 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -156,6 +156,22 @@ class Helper {
return $return;
}
+ /**
+ * @brief Check if a path is a .part file
+ * @param string $path Path that may identify a .part file
+ * @return bool
+ */
+ public static function isPartialFilePath($path) {
+
+ $extension = pathinfo($path, PATHINFO_EXTENSION);
+ if ( $extension === 'part' || $extension === 'etmp') {
+ return true;
+ } else {
+ return false;
+ }
+
+ }
+
/**
* @brief Remove .path extension from a file path
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 578d8965b424b21e731be8a1d45773ec395643ae..794641f712f047a139f1c70d53123c3c72cf3f67 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -152,10 +152,10 @@ class Keymanager {
}
// try reusing key file if part file
- if (self::isPartialFilePath($targetPath)) {
+ if (Helper::isPartialFilePath($targetPath)) {
$result = $view->file_put_contents(
- $basePath . '/' . \OCA\Encryption\Helper::fixPartialFilePath($targetPath) . '.key', $catfile);
+ $basePath . '/' . Helper::fixPartialFilePath($targetPath) . '.key', $catfile);
} else {
@@ -169,22 +169,6 @@ class Keymanager {
}
- /**
- * @brief Check if a path is a .part file
- * @param string $path Path that may identify a .part file
- * @return bool
- */
- public static function isPartialFilePath($path) {
-
- $extension = pathinfo($path, PATHINFO_EXTENSION);
- if ( $extension === 'part' || $extension === 'etmp') {
- return true;
- } else {
- return false;
- }
-
- }
-
/**
* @brief retrieve keyfile for an encrypted file
* @param \OC_FilesystemView $view
@@ -200,7 +184,7 @@ class Keymanager {
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
- $filename = \OCA\Encryption\Helper::fixPartialFilePath($filename);
+ $filename = Helper::fixPartialFilePath($filename);
$filePath_f = ltrim($filename, '/');
// in case of system wide mount points the keys are stored directly in the data directory
@@ -359,8 +343,8 @@ class Keymanager {
foreach ($shareKeys as $userId => $shareKey) {
// try reusing key file if part file
- if (self::isPartialFilePath($shareKeyPath)) {
- $writePath = $basePath . '/' . \OCA\Encryption\Helper::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
+ if (Helper::isPartialFilePath($shareKeyPath)) {
+ $writePath = $basePath . '/' . Helper::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
} else {
$writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
}
@@ -396,7 +380,7 @@ class Keymanager {
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
- $filename = \OCA\Encryption\Helper::fixPartialFilePath($filename);
+ $filename = Helper::fixPartialFilePath($filename);
// in case of system wide mount points the keys are stored directly in the data directory
if ($util->isSystemWideMountPoint($filename)) {
$shareKeyPath = '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey';
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 6dc5c9ce1b8307a0ec8e2beea6edd04418abc603..e2bc8f6b16387e9365fa3738e6d995cd12823a6d 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -342,7 +342,7 @@ class Proxy extends \OC_FileProxy {
$fileInfo = false;
// get file info from database/cache if not .part file
- if (!Keymanager::isPartialFilePath($path)) {
+ if (!Helper::isPartialFilePath($path)) {
$fileInfo = $view->getFileInfo($path);
}
@@ -353,7 +353,7 @@ class Proxy extends \OC_FileProxy {
$fixSize = $util->getFileSize($path);
$fileInfo['unencrypted_size'] = $fixSize;
// put file info if not .part file
- if (!Keymanager::isPartialFilePath($relativePath)) {
+ if (!Helper::isPartialFilePath($relativePath)) {
$view->putFileInfo($path, $fileInfo);
}
}
@@ -372,7 +372,7 @@ class Proxy extends \OC_FileProxy {
$fileInfo['unencrypted_size'] = $size;
// put file info if not .part file
- if (!Keymanager::isPartialFilePath($relativePath)) {
+ if (!Helper::isPartialFilePath($relativePath)) {
$view->putFileInfo($path, $fileInfo);
}
}
diff --git a/apps/files_encryption/tests/helper.php b/apps/files_encryption/tests/helper.php
new file mode 100644
index 0000000000000000000000000000000000000000..cccf9c7522288c7cf1292bbfc252b65b771a092c
--- /dev/null
+++ b/apps/files_encryption/tests/helper.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../lib/helper.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/util.php';
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Keymanager
+ */
+class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase {
+
+ /**
+ * @medium
+ */
+ function testFixPartialFilePath() {
+
+ $partFilename = 'testfile.txt.part';
+ $filename = 'testfile.txt';
+
+ $this->assertTrue(Encryption\Keymanager::isPartialFilePath($partFilename));
+
+ $this->assertEquals('testfile.txt', Encryption\Helper::fixPartialFilePath($partFilename));
+
+ $this->assertFalse(Encryption\Keymanager::isPartialFilePath($filename));
+
+ $this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($filename));
+ }
+
+
+ /**
+ * @medium
+ */
+ function testFixPartialFileWithTransferIdPath() {
+
+ $partFilename = 'testfile.txt.ocTransferId643653835.part';
+ $filename = 'testfile.txt';
+
+ $this->assertTrue(Encryption\Helper::isPartialFilePath($partFilename));
+
+ $this->assertEquals('testfile.txt', Encryption\Helper::fixPartialFilePath($partFilename));
+
+ $this->assertFalse(Encryption\Helper::isPartialFilePath($filename));
+
+ $this->assertEquals('testfile.txt', Encryption\Helper::fixPartialFilePath($filename));
+ }
+
+}
\ No newline at end of file
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index b2d200cca3e3a830f988fdf201ae9794b084bcfb..ad6bbd3a7e9fe16dced003001ea3d9b39eabd91b 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -188,23 +188,6 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
$this->assertArrayHasKey('key', $sslInfoPrivate);
}
- /**
- * @medium
- */
- function testFixPartialFilePath() {
-
- $partFilename = 'testfile.txt.part';
- $filename = 'testfile.txt';
-
- $this->assertTrue(Encryption\Keymanager::isPartialFilePath($partFilename));
-
- $this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($partFilename));
-
- $this->assertFalse(Encryption\Keymanager::isPartialFilePath($filename));
-
- $this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($filename));
- }
-
/**
* @medium
*/