make sure that only one process can enter the migration mode

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index c4b247da1edba153e2fcf41720626e89b1ae50c6..9f36393d5912e3097e7621f53b97032096c869ad 100644 (file)
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -67,10 +67,10 @@ class Hooks {
                $session->setPrivateKey($privateKey, $params['uid']);\r
 \r
                // Check if first-run file migration has already been performed\r
-               $migrationCompleted = $util->getMigrationStatus();\r
+               $ready = $util->beginMigration();\r
 \r
                // If migration not yet done\r
-               if (!$migrationCompleted) {\r
+               if ($ready) {\r
 \r
                        $userView = new \OC_FilesystemView('/' . $params['uid']);\r
 \r
@@ -102,7 +102,7 @@ class Hooks {
                        }\r
 \r
                        // Register successful migration in DB\r
-                       $util->setMigrationStatus(1);\r
+                       $util->finishMigration();\r
 \r
                }\r
 \r

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index a6711880c20413207efc74f53c9d824d54c1ec6c..82b6ca2f32124f2195fc434de474f42c4e429291 100644 (file)
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1058,7 +1058,7 @@ class Util {
         * @param $status
         * @return bool
         */
-       public function setMigrationStatus($status) {
+       private function setMigrationStatus($status) {
 
                $sql = 'UPDATE `*PREFIX*encryption` SET `migration_status` = ? WHERE `uid` = ?';
 
@@ -1074,7 +1074,7 @@ class Util {
                        return true;
 
                } else {
-
+                       \OCP\Util::writeLog('Encryption library', "Could not set migration status for " . $this->userId, \OCP\Util::ERROR);
                        return false;
 
                }
@@ -1082,12 +1082,80 @@ class Util {
        }
 
        /**
-        * @brief Check whether pwd recovery is enabled for a given user
-        * @return bool 1 = yes, 0 = no, false = no record
+        * @brief start migration mode to initially encrypt users data
+        * @return boolean
+        */
+       public function beginMigration() {
+               
+               $return = false;
+
+               $transaction = \OC_DB::beginTransaction();
+
+               if ($transaction === false) {
+                       \OCP\Util::writeLog('Encryption library', "Your database migration doesn't support transactions", \OCP\Util::WARN);
+               }
+
+               $migrationStatus = $this->getMigrationStatus();
+
+               if ($migrationStatus === '0') {
+
+                       $return = $this->setMigrationStatus(-1);
+
+                       if ($return === true) {
+                               \OCP\Util::writeLog('Encryption library', "Enter migration mode for initial encryption for user " . $this->userId, \OCP\Util::INFO);
+                       } else {
+                               \OCP\Util::writeLog('Encryption library', "Could not activate migration mode for " . $this->userId . ", encryption aborted", \OCP\Util::ERROR);
+                       }
+               } else {
+                       \OCP\Util::writeLog('Encryption library', "Another process already performs the migration for user " . $this->userId, \OCP\Util::INFO);
+               }
+               
+               \OC_DB::commit();
+
+               return $return;
+       }
+
+       /**
+        * @brief close migration mode after users data has been encrypted successfully
+        * @return boolean
+        */
+       public function finishMigration() {
+
+               $return = false;
+
+               $transaction = \OC_DB::beginTransaction();
+
+               if ($transaction === false) {
+                       \OCP\Util::writeLog('Encryption library', "Your database migration doesn't support transactions", \OCP\Util::WARN);
+               }
+
+               $migrationStatus = $this->getMigrationStatus();
+
+               if ($migrationStatus === '-1') {
+
+                       $return = $this->setMigrationStatus(1);
+
+                       if ($return === true) {
+                               \OCP\Util::writeLog('Encryption library', "Leave migration mode for: " . $this->userId . " successfully.", \OCP\Util::INFO);
+                       } else {
+                               \OCP\Util::writeLog('Encryption library', "Could not deactivate migration mode for " . $this->userId, \OCP\Util::ERROR);
+                       }
+               } else {
+                       \OCP\Util::writeLog('Encryption library', "Someone else finished the migration mode to early for user " . $this->userId, \OCP\Util::ERROR);
+               }
+
+               \OC_DB::commit();
+
+               return $return;
+       }
+
+       /**
+        * @brief check if files are already migrated to the encryption system
+        * @return '1' = yes, '0' = no, '-1' =  migration in progress, false = no record
         * @note If records are not being returned, check for a hidden space
         *       at the start of the uid in db
         */
-       public function getMigrationStatus() {
+       private function getMigrationStatus() {
 
                $sql = 'SELECT `migration_status` FROM `*PREFIX*encryption` WHERE `uid` = ?';
 
@@ -1112,14 +1180,11 @@ class Util {
 
                // If no record is found
                if (empty($migrationStatus)) {
-
+                       \OCP\Util::writeLog('Encryption library', "Could not get migration status for " . $this->userId . ", no record found", \OCP\Util::ERROR);
                        return false;
-
                        // If a record is found
                } else {
-
                        return $migrationStatus[0];
-
                }
 
        }