nextcloud / server

apps/encryption/lib/Migration.php

Indentation +358 added lines, -358 removed lines

@@ -33,362 +33,362 @@
 
 class Migration {
 
-	private $moduleId;
-	/** @var \OC\Files\View */
-	private $view;
-	/** @var \OCP\IDBConnection */
-	private $connection;
-	/** @var IConfig */
-	private $config;
-	/** @var  ILogger */
-	private $logger;
-	/** @var string*/
-	protected $installedVersion;
-	/** @var IAppManager */
-	protected $appManager;
-
-	/**
-	 * @param IConfig $config
-	 * @param View $view
-	 * @param IDBConnection $connection
-	 * @param ILogger $logger
-	 */
-	public function __construct(IConfig $config, View $view, IDBConnection $connection, ILogger $logger, IAppManager $appManager) {
-		$this->view = $view;
-		$this->view->disableCacheUpdate();
-		$this->connection = $connection;
-		$this->moduleId = \OCA\Encryption\Crypto\Encryption::ID;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->installedVersion = $this->config->getAppValue('files_encryption', 'installed_version', '-1');
-		$this->appManager = $appManager;
-	}
-
-	public function finalCleanUp() {
-		$this->view->deleteAll('files_encryption/public_keys');
-		$this->updateFileCache();
-		$this->config->deleteAppValue('files_encryption', 'installed_version');
-	}
-
-	/**
-	 * update file cache, copy unencrypted_size to the 'size' column
-	 */
-	private function updateFileCache() {
-		// make sure that we don't update the file cache multiple times
-		// only update during the first run
-		if ($this->installedVersion !== '-1') {
-			$query = $this->connection->getQueryBuilder();
-			$query->update('filecache')
-				->set('size', 'unencrypted_size')
-				->where($query->expr()->eq('encrypted', $query->createParameter('encrypted')))
-				->setParameter('encrypted', 1);
-			$query->execute();
-		}
-	}
-
-	/**
-	 * iterate through users and reorganize the folder structure
-	 */
-	public function reorganizeFolderStructure() {
-		$this->reorganizeSystemFolderStructure();
-
-		$limit = 500;
-		$offset = 0;
-		do {
-			$users = \OCP\User::getUsers('', $limit, $offset);
-			foreach ($users as $user) {
-				$this->reorganizeFolderStructureForUser($user);
-			}
-			$offset += $limit;
-		} while (count($users) >= $limit);
-	}
-
-	/**
-	 * reorganize system wide folder structure
-	 */
-	public function reorganizeSystemFolderStructure() {
-
-		$this->createPathForKeys('/files_encryption');
-
-		// backup system wide folders
-		$this->backupSystemWideKeys();
-
-		// rename system wide mount point
-		$this->renameFileKeys('', '/files_encryption/keys');
-
-		// rename system private keys
-		$this->renameSystemPrivateKeys();
-
-		$storage = $this->view->getMount('')->getStorage();
-		$storage->getScanner()->scan('files_encryption');
-	}
-
-
-	/**
-	 * reorganize folder structure for user
-	 *
-	 * @param string $user
-	 */
-	public function reorganizeFolderStructureForUser($user) {
-		// backup all keys
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
-		if ($this->backupUserKeys($user)) {
-			// rename users private key
-			$this->renameUsersPrivateKey($user);
-			$this->renameUsersPublicKey($user);
-			// rename file keys
-			$path = '/files_encryption/keys';
-			$this->renameFileKeys($user, $path);
-			$trashPath = '/files_trashbin/keys';
-			if ($this->appManager->isEnabledForUser('files_trashbin') && $this->view->is_dir($user . '/' . $trashPath)) {
-				$this->renameFileKeys($user, $trashPath, true);
-				$this->view->deleteAll($trashPath);
-			}
-			// delete old folders
-			$this->deleteOldKeys($user);
-			$this->view->getMount('/' . $user)->getStorage()->getScanner()->scan('files_encryption');
-		}
-	}
-
-	/**
-	 * update database
-	 */
-	public function updateDB() {
-
-		// make sure that we don't update the file cache multiple times
-		// only update during the first run
-		if ($this->installedVersion === '-1') {
-			return;
-		}
-
-		// delete left-over from old encryption which is no longer needed
-		$this->config->deleteAppValue('files_encryption', 'ocsid');
-		$this->config->deleteAppValue('files_encryption', 'types');
-		$this->config->deleteAppValue('files_encryption', 'enabled');
-
-		$oldAppValues = $this->connection->getQueryBuilder();
-		$oldAppValues->select('*')
-			->from('appconfig')
-			->where($oldAppValues->expr()->eq('appid', $oldAppValues->createParameter('appid')))
-			->setParameter('appid', 'files_encryption');
-		$appSettings = $oldAppValues->execute();
-
-		while ($row = $appSettings->fetch()) {
-			// 'installed_version' gets deleted at the end of the migration process
-			if ($row['configkey'] !== 'installed_version' ) {
-				$this->config->setAppValue('encryption', $row['configkey'], $row['configvalue']);
-				$this->config->deleteAppValue('files_encryption', $row['configkey']);
-			}
-		}
-
-		$oldPreferences = $this->connection->getQueryBuilder();
-		$oldPreferences->select('*')
-			->from('preferences')
-			->where($oldPreferences->expr()->eq('appid', $oldPreferences->createParameter('appid')))
-			->setParameter('appid', 'files_encryption');
-		$preferenceSettings = $oldPreferences->execute();
-
-		while ($row = $preferenceSettings->fetch()) {
-			$this->config->setUserValue($row['userid'], 'encryption', $row['configkey'], $row['configvalue']);
-			$this->config->deleteUserValue($row['userid'], 'files_encryption', $row['configkey']);
-		}
-	}
-
-	/**
-	 * create backup of system-wide keys
-	 */
-	private function backupSystemWideKeys() {
-		$backupDir = 'encryption_migration_backup_' . date("Y-m-d_H-i-s");
-		$this->view->mkdir($backupDir);
-		$this->view->copy('files_encryption', $backupDir . '/files_encryption');
-	}
-
-	/**
-	 * create backup of user specific keys
-	 *
-	 * @param string $user
-	 * @return bool
-	 */
-	private function backupUserKeys($user) {
-		$encryptionDir = $user . '/files_encryption';
-		if ($this->view->is_dir($encryptionDir)) {
-			$backupDir = $user . '/encryption_migration_backup_' . date("Y-m-d_H-i-s");
-			$this->view->mkdir($backupDir);
-			$this->view->copy($encryptionDir, $backupDir);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * rename system-wide private keys
-	 */
-	private function renameSystemPrivateKeys() {
-		$dh = $this->view->opendir('files_encryption');
-		$this->createPathForKeys('/files_encryption/' . $this->moduleId );
-		if (is_resource($dh)) {
-			while (($privateKey = readdir($dh)) !== false) {
-				if (!\OC\Files\Filesystem::isIgnoredDir($privateKey) ) {
-					if (!$this->view->is_dir('/files_encryption/' . $privateKey)) {
-						$this->view->rename('files_encryption/' . $privateKey, 'files_encryption/' . $this->moduleId . '/' . $privateKey);
-						$this->renameSystemPublicKey($privateKey);
-					}
-				}
-			}
-			closedir($dh);
-		}
-	}
-
-	/**
-	 * rename system wide public key
-	 *
-	 * @param string $privateKey private key for which we want to rename the corresponding public key
-	 */
-	private function renameSystemPublicKey($privateKey) {
-		$publicKey = substr($privateKey,0 , strrpos($privateKey, '.privateKey')) . '.publicKey';
-		$this->view->rename('files_encryption/public_keys/' . $publicKey, 'files_encryption/' . $this->moduleId . '/' . $publicKey);
-	}
-
-	/**
-	 * rename user-specific private keys
-	 *
-	 * @param string $user
-	 */
-	private function renameUsersPrivateKey($user) {
-		$oldPrivateKey = $user . '/files_encryption/' . $user . '.privateKey';
-		$newPrivateKey = $user . '/files_encryption/' . $this->moduleId . '/' . $user . '.privateKey';
-		if ($this->view->file_exists($oldPrivateKey)) {
-			$this->createPathForKeys(dirname($newPrivateKey));
-			$this->view->rename($oldPrivateKey, $newPrivateKey);
-		}
-	}
-
-	/**
-	 * rename user-specific public keys
-	 *
-	 * @param string $user
-	 */
-	private function renameUsersPublicKey($user) {
-		$oldPublicKey = '/files_encryption/public_keys/' . $user . '.publicKey';
-		$newPublicKey = $user . '/files_encryption/' . $this->moduleId . '/' . $user . '.publicKey';
-		if ($this->view->file_exists($oldPublicKey)) {
-			$this->createPathForKeys(dirname($newPublicKey));
-			$this->view->rename($oldPublicKey, $newPublicKey);
-		}
-	}
-
-	/**
-	 * rename file keys
-	 *
-	 * @param string $user
-	 * @param string $path
-	 * @param bool $trash
-	 */
-	private function renameFileKeys($user, $path, $trash = false) {
-
-		if ($this->view->is_dir($user . '/' . $path) === false) {
-			$this->logger->info('Skip dir /' . $user . '/' . $path . ': does not exist');
-			return;
-		}
-
-		$dh = $this->view->opendir($user . '/' . $path);
-
-		if (is_resource($dh)) {
-			while (($file = readdir($dh)) !== false) {
-				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
-					if ($this->view->is_dir($user . '/' . $path . '/' . $file)) {
-						$this->renameFileKeys($user, $path . '/' . $file, $trash);
-					} else {
-						$target = $this->getTargetDir($user, $path, $file, $trash);
-						if ($target !== false) {
-							$this->createPathForKeys(dirname($target));
-							$this->view->rename($user . '/' . $path . '/' . $file, $target);
-						} else {
-							$this->logger->warning(
-								'did not move key "' . $file
-								. '" could not find the corresponding file in /data/' . $user . '/files.'
-							. 'Most likely the key was already moved in a previous migration run and is already on the right place.');
-						}
-					}
-				}
-			}
-			closedir($dh);
-		}
-	}
-
-	/**
-	 * get system mount points
-	 * wrap static method so that it can be mocked for testing
-	 *
-	 * @internal
-	 * @return array
-	 */
-	protected function getSystemMountPoints() {
-		return \OC_Mount_Config::getSystemMountPoints();
-	}
-
-	/**
-	 * generate target directory
-	 *
-	 * @param string $user
-	 * @param string $keyPath
-	 * @param string $filename
-	 * @param bool $trash
-	 * @return string
-	 */
-	private function getTargetDir($user, $keyPath, $filename, $trash) {
-		if ($trash) {
-			$filePath = substr($keyPath, strlen('/files_trashbin/keys/'));
-			$targetDir = $user . '/files_encryption/keys/files_trashbin/' . $filePath . '/' . $this->moduleId . '/' . $filename;
-		} else {
-			$filePath = substr($keyPath, strlen('/files_encryption/keys/'));
-			$targetDir = $user . '/files_encryption/keys/files/' . $filePath . '/' . $this->moduleId . '/' . $filename;
-		}
-
-		if ($user === '') {
-			// for system wide mounts we need to check if the mount point really exists
-			$normalized = \OC\Files\Filesystem::normalizePath($filePath);
-			$systemMountPoints = $this->getSystemMountPoints();
-			foreach ($systemMountPoints as $mountPoint) {
-				$normalizedMountPoint = \OC\Files\Filesystem::normalizePath($mountPoint['mountpoint']) . '/';
-				if (strpos($normalized, $normalizedMountPoint) === 0)
-					return $targetDir;
-			}
-		} else if ($trash === false && $this->view->file_exists('/' . $user. '/files/' . $filePath)) {
-			return $targetDir;
-		} else if ($trash === true && $this->view->file_exists('/' . $user. '/files_trashbin/' . $filePath)) {
-				return $targetDir;
-			}
-
-		return false;
-	}
-
-	/**
-	 * delete old keys
-	 *
-	 * @param string $user
-	 */
-	private function deleteOldKeys($user) {
-		$this->view->deleteAll($user . '/files_encryption/keyfiles');
-		$this->view->deleteAll($user . '/files_encryption/share-keys');
-	}
-
-	/**
-	 * create directories for the keys recursively
-	 *
-	 * @param string $path
-	 */
-	private function createPathForKeys($path) {
-		if (!$this->view->file_exists($path)) {
-			$sub_dirs = explode('/', $path);
-			$dir = '';
-			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
-				if (!$this->view->is_dir($dir)) {
-					$this->view->mkdir($dir);
-				}
-			}
-		}
-	}
+    private $moduleId;
+    /** @var \OC\Files\View */
+    private $view;
+    /** @var \OCP\IDBConnection */
+    private $connection;
+    /** @var IConfig */
+    private $config;
+    /** @var  ILogger */
+    private $logger;
+    /** @var string*/
+    protected $installedVersion;
+    /** @var IAppManager */
+    protected $appManager;
+
+    /**
+     * @param IConfig $config
+     * @param View $view
+     * @param IDBConnection $connection
+     * @param ILogger $logger
+     */
+    public function __construct(IConfig $config, View $view, IDBConnection $connection, ILogger $logger, IAppManager $appManager) {
+        $this->view = $view;
+        $this->view->disableCacheUpdate();
+        $this->connection = $connection;
+        $this->moduleId = \OCA\Encryption\Crypto\Encryption::ID;
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->installedVersion = $this->config->getAppValue('files_encryption', 'installed_version', '-1');
+        $this->appManager = $appManager;
+    }
+
+    public function finalCleanUp() {
+        $this->view->deleteAll('files_encryption/public_keys');
+        $this->updateFileCache();
+        $this->config->deleteAppValue('files_encryption', 'installed_version');
+    }
+
+    /**
+     * update file cache, copy unencrypted_size to the 'size' column
+     */
+    private function updateFileCache() {
+        // make sure that we don't update the file cache multiple times
+        // only update during the first run
+        if ($this->installedVersion !== '-1') {
+            $query = $this->connection->getQueryBuilder();
+            $query->update('filecache')
+                ->set('size', 'unencrypted_size')
+                ->where($query->expr()->eq('encrypted', $query->createParameter('encrypted')))
+                ->setParameter('encrypted', 1);
+            $query->execute();
+        }
+    }
+
+    /**
+     * iterate through users and reorganize the folder structure
+     */
+    public function reorganizeFolderStructure() {
+        $this->reorganizeSystemFolderStructure();
+
+        $limit = 500;
+        $offset = 0;
+        do {
+            $users = \OCP\User::getUsers('', $limit, $offset);
+            foreach ($users as $user) {
+                $this->reorganizeFolderStructureForUser($user);
+            }
+            $offset += $limit;
+        } while (count($users) >= $limit);
+    }
+
+    /**
+     * reorganize system wide folder structure
+     */
+    public function reorganizeSystemFolderStructure() {
+
+        $this->createPathForKeys('/files_encryption');
+
+        // backup system wide folders
+        $this->backupSystemWideKeys();
+
+        // rename system wide mount point
+        $this->renameFileKeys('', '/files_encryption/keys');
+
+        // rename system private keys
+        $this->renameSystemPrivateKeys();
+
+        $storage = $this->view->getMount('')->getStorage();
+        $storage->getScanner()->scan('files_encryption');
+    }
+
+
+    /**
+     * reorganize folder structure for user
+     *
+     * @param string $user
+     */
+    public function reorganizeFolderStructureForUser($user) {
+        // backup all keys
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
+        if ($this->backupUserKeys($user)) {
+            // rename users private key
+            $this->renameUsersPrivateKey($user);
+            $this->renameUsersPublicKey($user);
+            // rename file keys
+            $path = '/files_encryption/keys';
+            $this->renameFileKeys($user, $path);
+            $trashPath = '/files_trashbin/keys';
+            if ($this->appManager->isEnabledForUser('files_trashbin') && $this->view->is_dir($user . '/' . $trashPath)) {
+                $this->renameFileKeys($user, $trashPath, true);
+                $this->view->deleteAll($trashPath);
+            }
+            // delete old folders
+            $this->deleteOldKeys($user);
+            $this->view->getMount('/' . $user)->getStorage()->getScanner()->scan('files_encryption');
+        }
+    }
+
+    /**
+     * update database
+     */
+    public function updateDB() {
+
+        // make sure that we don't update the file cache multiple times
+        // only update during the first run
+        if ($this->installedVersion === '-1') {
+            return;
+        }
+
+        // delete left-over from old encryption which is no longer needed
+        $this->config->deleteAppValue('files_encryption', 'ocsid');
+        $this->config->deleteAppValue('files_encryption', 'types');
+        $this->config->deleteAppValue('files_encryption', 'enabled');
+
+        $oldAppValues = $this->connection->getQueryBuilder();
+        $oldAppValues->select('*')
+            ->from('appconfig')
+            ->where($oldAppValues->expr()->eq('appid', $oldAppValues->createParameter('appid')))
+            ->setParameter('appid', 'files_encryption');
+        $appSettings = $oldAppValues->execute();
+
+        while ($row = $appSettings->fetch()) {
+            // 'installed_version' gets deleted at the end of the migration process
+            if ($row['configkey'] !== 'installed_version' ) {
+                $this->config->setAppValue('encryption', $row['configkey'], $row['configvalue']);
+                $this->config->deleteAppValue('files_encryption', $row['configkey']);
+            }
+        }
+
+        $oldPreferences = $this->connection->getQueryBuilder();
+        $oldPreferences->select('*')
+            ->from('preferences')
+            ->where($oldPreferences->expr()->eq('appid', $oldPreferences->createParameter('appid')))
+            ->setParameter('appid', 'files_encryption');
+        $preferenceSettings = $oldPreferences->execute();
+
+        while ($row = $preferenceSettings->fetch()) {
+            $this->config->setUserValue($row['userid'], 'encryption', $row['configkey'], $row['configvalue']);
+            $this->config->deleteUserValue($row['userid'], 'files_encryption', $row['configkey']);
+        }
+    }
+
+    /**
+     * create backup of system-wide keys
+     */
+    private function backupSystemWideKeys() {
+        $backupDir = 'encryption_migration_backup_' . date("Y-m-d_H-i-s");
+        $this->view->mkdir($backupDir);
+        $this->view->copy('files_encryption', $backupDir . '/files_encryption');
+    }
+
+    /**
+     * create backup of user specific keys
+     *
+     * @param string $user
+     * @return bool
+     */
+    private function backupUserKeys($user) {
+        $encryptionDir = $user . '/files_encryption';
+        if ($this->view->is_dir($encryptionDir)) {
+            $backupDir = $user . '/encryption_migration_backup_' . date("Y-m-d_H-i-s");
+            $this->view->mkdir($backupDir);
+            $this->view->copy($encryptionDir, $backupDir);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * rename system-wide private keys
+     */
+    private function renameSystemPrivateKeys() {
+        $dh = $this->view->opendir('files_encryption');
+        $this->createPathForKeys('/files_encryption/' . $this->moduleId );
+        if (is_resource($dh)) {
+            while (($privateKey = readdir($dh)) !== false) {
+                if (!\OC\Files\Filesystem::isIgnoredDir($privateKey) ) {
+                    if (!$this->view->is_dir('/files_encryption/' . $privateKey)) {
+                        $this->view->rename('files_encryption/' . $privateKey, 'files_encryption/' . $this->moduleId . '/' . $privateKey);
+                        $this->renameSystemPublicKey($privateKey);
+                    }
+                }
+            }
+            closedir($dh);
+        }
+    }
+
+    /**
+     * rename system wide public key
+     *
+     * @param string $privateKey private key for which we want to rename the corresponding public key
+     */
+    private function renameSystemPublicKey($privateKey) {
+        $publicKey = substr($privateKey,0 , strrpos($privateKey, '.privateKey')) . '.publicKey';
+        $this->view->rename('files_encryption/public_keys/' . $publicKey, 'files_encryption/' . $this->moduleId . '/' . $publicKey);
+    }
+
+    /**
+     * rename user-specific private keys
+     *
+     * @param string $user
+     */
+    private function renameUsersPrivateKey($user) {
+        $oldPrivateKey = $user . '/files_encryption/' . $user . '.privateKey';
+        $newPrivateKey = $user . '/files_encryption/' . $this->moduleId . '/' . $user . '.privateKey';
+        if ($this->view->file_exists($oldPrivateKey)) {
+            $this->createPathForKeys(dirname($newPrivateKey));
+            $this->view->rename($oldPrivateKey, $newPrivateKey);
+        }
+    }
+
+    /**
+     * rename user-specific public keys
+     *
+     * @param string $user
+     */
+    private function renameUsersPublicKey($user) {
+        $oldPublicKey = '/files_encryption/public_keys/' . $user . '.publicKey';
+        $newPublicKey = $user . '/files_encryption/' . $this->moduleId . '/' . $user . '.publicKey';
+        if ($this->view->file_exists($oldPublicKey)) {
+            $this->createPathForKeys(dirname($newPublicKey));
+            $this->view->rename($oldPublicKey, $newPublicKey);
+        }
+    }
+
+    /**
+     * rename file keys
+     *
+     * @param string $user
+     * @param string $path
+     * @param bool $trash
+     */
+    private function renameFileKeys($user, $path, $trash = false) {
+
+        if ($this->view->is_dir($user . '/' . $path) === false) {
+            $this->logger->info('Skip dir /' . $user . '/' . $path . ': does not exist');
+            return;
+        }
+
+        $dh = $this->view->opendir($user . '/' . $path);
+
+        if (is_resource($dh)) {
+            while (($file = readdir($dh)) !== false) {
+                if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+                    if ($this->view->is_dir($user . '/' . $path . '/' . $file)) {
+                        $this->renameFileKeys($user, $path . '/' . $file, $trash);
+                    } else {
+                        $target = $this->getTargetDir($user, $path, $file, $trash);
+                        if ($target !== false) {
+                            $this->createPathForKeys(dirname($target));
+                            $this->view->rename($user . '/' . $path . '/' . $file, $target);
+                        } else {
+                            $this->logger->warning(
+                                'did not move key "' . $file
+                                . '" could not find the corresponding file in /data/' . $user . '/files.'
+                            . 'Most likely the key was already moved in a previous migration run and is already on the right place.');
+                        }
+                    }
+                }
+            }
+            closedir($dh);
+        }
+    }
+
+    /**
+     * get system mount points
+     * wrap static method so that it can be mocked for testing
+     *
+     * @internal
+     * @return array
+     */
+    protected function getSystemMountPoints() {
+        return \OC_Mount_Config::getSystemMountPoints();
+    }
+
+    /**
+     * generate target directory
+     *
+     * @param string $user
+     * @param string $keyPath
+     * @param string $filename
+     * @param bool $trash
+     * @return string
+     */
+    private function getTargetDir($user, $keyPath, $filename, $trash) {
+        if ($trash) {
+            $filePath = substr($keyPath, strlen('/files_trashbin/keys/'));
+            $targetDir = $user . '/files_encryption/keys/files_trashbin/' . $filePath . '/' . $this->moduleId . '/' . $filename;
+        } else {
+            $filePath = substr($keyPath, strlen('/files_encryption/keys/'));
+            $targetDir = $user . '/files_encryption/keys/files/' . $filePath . '/' . $this->moduleId . '/' . $filename;
+        }
+
+        if ($user === '') {
+            // for system wide mounts we need to check if the mount point really exists
+            $normalized = \OC\Files\Filesystem::normalizePath($filePath);
+            $systemMountPoints = $this->getSystemMountPoints();
+            foreach ($systemMountPoints as $mountPoint) {
+                $normalizedMountPoint = \OC\Files\Filesystem::normalizePath($mountPoint['mountpoint']) . '/';
+                if (strpos($normalized, $normalizedMountPoint) === 0)
+                    return $targetDir;
+            }
+        } else if ($trash === false && $this->view->file_exists('/' . $user. '/files/' . $filePath)) {
+            return $targetDir;
+        } else if ($trash === true && $this->view->file_exists('/' . $user. '/files_trashbin/' . $filePath)) {
+                return $targetDir;
+            }
+
+        return false;
+    }
+
+    /**
+     * delete old keys
+     *
+     * @param string $user
+     */
+    private function deleteOldKeys($user) {
+        $this->view->deleteAll($user . '/files_encryption/keyfiles');
+        $this->view->deleteAll($user . '/files_encryption/share-keys');
+    }
+
+    /**
+     * create directories for the keys recursively
+     *
+     * @param string $path
+     */
+    private function createPathForKeys($path) {
+        if (!$this->view->file_exists($path)) {
+            $sub_dirs = explode('/', $path);
+            $dir = '';
+            foreach ($sub_dirs as $sub_dir) {
+                $dir .= '/' . $sub_dir;
+                if (!$this->view->is_dir($dir)) {
+                    $this->view->mkdir($dir);
+                }
+            }
+        }
+    }
 }

Spacing +33 added lines, -33 removed lines

@@ -141,13 +141,13 @@ 
 			$path = '/files_encryption/keys';
 			$this->renameFileKeys($user, $path);
 			$trashPath = '/files_trashbin/keys';
-			if ($this->appManager->isEnabledForUser('files_trashbin') && $this->view->is_dir($user . '/' . $trashPath)) {
+			if ($this->appManager->isEnabledForUser('files_trashbin') && $this->view->is_dir($user.'/'.$trashPath)) {
 				$this->renameFileKeys($user, $trashPath, true);
 				$this->view->deleteAll($trashPath);
 			}
 			// delete old folders
 			$this->deleteOldKeys($user);
-			$this->view->getMount('/' . $user)->getStorage()->getScanner()->scan('files_encryption');
+			$this->view->getMount('/'.$user)->getStorage()->getScanner()->scan('files_encryption');
 		}
 	}
 
@@ -176,7 +176,7 @@ 
 
 		while ($row = $appSettings->fetch()) {
 			// 'installed_version' gets deleted at the end of the migration process
-			if ($row['configkey'] !== 'installed_version' ) {
+			if ($row['configkey'] !== 'installed_version') {
 				$this->config->setAppValue('encryption', $row['configkey'], $row['configvalue']);
 				$this->config->deleteAppValue('files_encryption', $row['configkey']);
 			}
@@ -199,9 +199,9 @@ 
 	 * create backup of system-wide keys
 	 */
 	private function backupSystemWideKeys() {
-		$backupDir = 'encryption_migration_backup_' . date("Y-m-d_H-i-s");
+		$backupDir = 'encryption_migration_backup_'.date("Y-m-d_H-i-s");
 		$this->view->mkdir($backupDir);
-		$this->view->copy('files_encryption', $backupDir . '/files_encryption');
+		$this->view->copy('files_encryption', $backupDir.'/files_encryption');
 	}
 
 	/**
@@ -211,9 +211,9 @@ 
 	 * @return bool
 	 */
 	private function backupUserKeys($user) {
-		$encryptionDir = $user . '/files_encryption';
+		$encryptionDir = $user.'/files_encryption';
 		if ($this->view->is_dir($encryptionDir)) {
-			$backupDir = $user . '/encryption_migration_backup_' . date("Y-m-d_H-i-s");
+			$backupDir = $user.'/encryption_migration_backup_'.date("Y-m-d_H-i-s");
 			$this->view->mkdir($backupDir);
 			$this->view->copy($encryptionDir, $backupDir);
 			return true;
@@ -226,12 +226,12 @@ 
 	 */
 	private function renameSystemPrivateKeys() {
 		$dh = $this->view->opendir('files_encryption');
-		$this->createPathForKeys('/files_encryption/' . $this->moduleId );
+		$this->createPathForKeys('/files_encryption/'.$this->moduleId);
 		if (is_resource($dh)) {
 			while (($privateKey = readdir($dh)) !== false) {
-				if (!\OC\Files\Filesystem::isIgnoredDir($privateKey) ) {
-					if (!$this->view->is_dir('/files_encryption/' . $privateKey)) {
-						$this->view->rename('files_encryption/' . $privateKey, 'files_encryption/' . $this->moduleId . '/' . $privateKey);
+				if (!\OC\Files\Filesystem::isIgnoredDir($privateKey)) {
+					if (!$this->view->is_dir('/files_encryption/'.$privateKey)) {
+						$this->view->rename('files_encryption/'.$privateKey, 'files_encryption/'.$this->moduleId.'/'.$privateKey);
 						$this->renameSystemPublicKey($privateKey);
 					}
 				}
@@ -246,8 +246,8 @@ 
 	 * @param string $privateKey private key for which we want to rename the corresponding public key
 	 */
 	private function renameSystemPublicKey($privateKey) {
-		$publicKey = substr($privateKey,0 , strrpos($privateKey, '.privateKey')) . '.publicKey';
-		$this->view->rename('files_encryption/public_keys/' . $publicKey, 'files_encryption/' . $this->moduleId . '/' . $publicKey);
+		$publicKey = substr($privateKey, 0, strrpos($privateKey, '.privateKey')).'.publicKey';
+		$this->view->rename('files_encryption/public_keys/'.$publicKey, 'files_encryption/'.$this->moduleId.'/'.$publicKey);
 	}
 
 	/**
@@ -256,8 +256,8 @@ 
 	 * @param string $user
 	 */
 	private function renameUsersPrivateKey($user) {
-		$oldPrivateKey = $user . '/files_encryption/' . $user . '.privateKey';
-		$newPrivateKey = $user . '/files_encryption/' . $this->moduleId . '/' . $user . '.privateKey';
+		$oldPrivateKey = $user.'/files_encryption/'.$user.'.privateKey';
+		$newPrivateKey = $user.'/files_encryption/'.$this->moduleId.'/'.$user.'.privateKey';
 		if ($this->view->file_exists($oldPrivateKey)) {
 			$this->createPathForKeys(dirname($newPrivateKey));
 			$this->view->rename($oldPrivateKey, $newPrivateKey);
@@ -270,8 +270,8 @@ 
 	 * @param string $user
 	 */
 	private function renameUsersPublicKey($user) {
-		$oldPublicKey = '/files_encryption/public_keys/' . $user . '.publicKey';
-		$newPublicKey = $user . '/files_encryption/' . $this->moduleId . '/' . $user . '.publicKey';
+		$oldPublicKey = '/files_encryption/public_keys/'.$user.'.publicKey';
+		$newPublicKey = $user.'/files_encryption/'.$this->moduleId.'/'.$user.'.publicKey';
 		if ($this->view->file_exists($oldPublicKey)) {
 			$this->createPathForKeys(dirname($newPublicKey));
 			$this->view->rename($oldPublicKey, $newPublicKey);
@@ -287,27 +287,27 @@ 
 	 */
 	private function renameFileKeys($user, $path, $trash = false) {
 
-		if ($this->view->is_dir($user . '/' . $path) === false) {
-			$this->logger->info('Skip dir /' . $user . '/' . $path . ': does not exist');
+		if ($this->view->is_dir($user.'/'.$path) === false) {
+			$this->logger->info('Skip dir /'.$user.'/'.$path.': does not exist');
 			return;
 		}
 
-		$dh = $this->view->opendir($user . '/' . $path);
+		$dh = $this->view->opendir($user.'/'.$path);
 
 		if (is_resource($dh)) {
 			while (($file = readdir($dh)) !== false) {
 				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
-					if ($this->view->is_dir($user . '/' . $path . '/' . $file)) {
-						$this->renameFileKeys($user, $path . '/' . $file, $trash);
+					if ($this->view->is_dir($user.'/'.$path.'/'.$file)) {
+						$this->renameFileKeys($user, $path.'/'.$file, $trash);
 					} else {
 						$target = $this->getTargetDir($user, $path, $file, $trash);
 						if ($target !== false) {
 							$this->createPathForKeys(dirname($target));
-							$this->view->rename($user . '/' . $path . '/' . $file, $target);
+							$this->view->rename($user.'/'.$path.'/'.$file, $target);
 						} else {
 							$this->logger->warning(
-								'did not move key "' . $file
-								. '" could not find the corresponding file in /data/' . $user . '/files.'
+								'did not move key "'.$file
+								. '" could not find the corresponding file in /data/'.$user.'/files.'
 							. 'Most likely the key was already moved in a previous migration run and is already on the right place.');
 						}
 					}
@@ -340,10 +340,10 @@ 
 	private function getTargetDir($user, $keyPath, $filename, $trash) {
 		if ($trash) {
 			$filePath = substr($keyPath, strlen('/files_trashbin/keys/'));
-			$targetDir = $user . '/files_encryption/keys/files_trashbin/' . $filePath . '/' . $this->moduleId . '/' . $filename;
+			$targetDir = $user.'/files_encryption/keys/files_trashbin/'.$filePath.'/'.$this->moduleId.'/'.$filename;
 		} else {
 			$filePath = substr($keyPath, strlen('/files_encryption/keys/'));
-			$targetDir = $user . '/files_encryption/keys/files/' . $filePath . '/' . $this->moduleId . '/' . $filename;
+			$targetDir = $user.'/files_encryption/keys/files/'.$filePath.'/'.$this->moduleId.'/'.$filename;
 		}
 
 		if ($user === '') {
@@ -351,13 +351,13 @@ 
 			$normalized = \OC\Files\Filesystem::normalizePath($filePath);
 			$systemMountPoints = $this->getSystemMountPoints();
 			foreach ($systemMountPoints as $mountPoint) {
-				$normalizedMountPoint = \OC\Files\Filesystem::normalizePath($mountPoint['mountpoint']) . '/';
+				$normalizedMountPoint = \OC\Files\Filesystem::normalizePath($mountPoint['mountpoint']).'/';
 				if (strpos($normalized, $normalizedMountPoint) === 0)
 					return $targetDir;
 			}
-		} else if ($trash === false && $this->view->file_exists('/' . $user. '/files/' . $filePath)) {
+		} else if ($trash === false && $this->view->file_exists('/'.$user.'/files/'.$filePath)) {
 			return $targetDir;
-		} else if ($trash === true && $this->view->file_exists('/' . $user. '/files_trashbin/' . $filePath)) {
+		} else if ($trash === true && $this->view->file_exists('/'.$user.'/files_trashbin/'.$filePath)) {
 				return $targetDir;
 			}
 
@@ -370,8 +370,8 @@ 
 	 * @param string $user
 	 */
 	private function deleteOldKeys($user) {
-		$this->view->deleteAll($user . '/files_encryption/keyfiles');
-		$this->view->deleteAll($user . '/files_encryption/share-keys');
+		$this->view->deleteAll($user.'/files_encryption/keyfiles');
+		$this->view->deleteAll($user.'/files_encryption/share-keys');
 	}
 
 	/**
@@ -384,7 +384,7 @@ 
 			$sub_dirs = explode('/', $path);
 			$dir = '';
 			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
+				$dir .= '/'.$sub_dir;
 				if (!$this->view->is_dir($dir)) {
 					$this->view->mkdir($dir);
 				}

settings/Controller/EncryptionController.php

Indentation +113 added lines, -113 removed lines

@@ -40,119 +40,119 @@
  */
 class EncryptionController extends Controller {
 
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var View */
-	private $view;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param IDBConnection $connection
-	 * @param IUserManager $userManager
-	 * @param View $view
-	 * @param ILogger $logger
-	 * @param IAppManager $appManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IL10N $l10n,
-								IConfig $config,
-								IDBConnection $connection,
-								IUserManager $userManager,
-								View $view,
-								ILogger $logger,
-								IAppManager $appManager) {
-		parent::__construct($appName, $request);
-		$this->l10n = $l10n;
-		$this->config = $config;
-		$this->connection = $connection;
-		$this->view = $view;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * @param IConfig $config
-	 * @param View $view
-	 * @param IDBConnection $connection
-	 * @param ILogger $logger
-	 * @param IAppManager $appManager
-	 * @return Migration
-	 */
-	protected function getMigration(IConfig $config,
-								 View $view,
-								 IDBConnection $connection,
-								 ILogger $logger,
-								 IAppManager $appManager) {
-		return new Migration($config, $view, $connection, $logger, $appManager);
-	}
-
-	/**
-	 * start migration
-	 *
-	 * @return array
-	 */
-	public function startMigration() {
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var View */
+    private $view;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IAppManager */
+    private $appManager;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param IDBConnection $connection
+     * @param IUserManager $userManager
+     * @param View $view
+     * @param ILogger $logger
+     * @param IAppManager $appManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                IConfig $config,
+                                IDBConnection $connection,
+                                IUserManager $userManager,
+                                View $view,
+                                ILogger $logger,
+                                IAppManager $appManager) {
+        parent::__construct($appName, $request);
+        $this->l10n = $l10n;
+        $this->config = $config;
+        $this->connection = $connection;
+        $this->view = $view;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * @param IConfig $config
+     * @param View $view
+     * @param IDBConnection $connection
+     * @param ILogger $logger
+     * @param IAppManager $appManager
+     * @return Migration
+     */
+    protected function getMigration(IConfig $config,
+                                    View $view,
+                                    IDBConnection $connection,
+                                    ILogger $logger,
+                                    IAppManager $appManager) {
+        return new Migration($config, $view, $connection, $logger, $appManager);
+    }
+
+    /**
+     * start migration
+     *
+     * @return array
+     */
+    public function startMigration() {
         // allow as long execution on the web server as possible
-		if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-			@set_time_limit(0);
-		}
-
-		try {
-
-			$migration = $this->getMigration($this->config, $this->view, $this->connection, $this->logger, $this->appManager);
-			$migration->reorganizeSystemFolderStructure();
-			$migration->updateDB();
-
-			foreach ($this->userManager->getBackends() as $backend) {
-				$limit = 500;
-				$offset = 0;
-				do {
-					$users = $backend->getUsers('', $limit, $offset);
-					foreach ($users as $user) {
-						$migration->reorganizeFolderStructureForUser($user);
-					}
-					$offset += $limit;
-				} while (count($users) >= $limit);
-			}
-
-			$migration->finalCleanUp();
-
-		} catch (\Exception $e) {
-			return [
-				'data' => [
-					'message' => (string)$this->l10n->t('A problem occurred, please check your log files (Error: %s)', [$e->getMessage()]),
-				],
-				'status' => 'error',
-			];
-		}
-
-		return [
-			'data' => [
-				'message' => (string) $this->l10n->t('Migration Completed'),
-				],
-			'status' => 'success',
-		];
-	}
+        if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+            @set_time_limit(0);
+        }
+
+        try {
+
+            $migration = $this->getMigration($this->config, $this->view, $this->connection, $this->logger, $this->appManager);
+            $migration->reorganizeSystemFolderStructure();
+            $migration->updateDB();
+
+            foreach ($this->userManager->getBackends() as $backend) {
+                $limit = 500;
+                $offset = 0;
+                do {
+                    $users = $backend->getUsers('', $limit, $offset);
+                    foreach ($users as $user) {
+                        $migration->reorganizeFolderStructureForUser($user);
+                    }
+                    $offset += $limit;
+                } while (count($users) >= $limit);
+            }
+
+            $migration->finalCleanUp();
+
+        } catch (\Exception $e) {
+            return [
+                'data' => [
+                    'message' => (string)$this->l10n->t('A problem occurred, please check your log files (Error: %s)', [$e->getMessage()]),
+                ],
+                'status' => 'error',
+            ];
+        }
+
+        return [
+            'data' => [
+                'message' => (string) $this->l10n->t('Migration Completed'),
+                ],
+            'status' => 'success',
+        ];
+    }
 
 }