mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4708 from owncloud/encryption_fixes 

make sure that initial encryption also starts for a fresh installation
This commit is contained in:
Björn Schießle 2013-09-18 01:33:52 -07:00
parent 2e79aab0ce 72eaf2894a
commit e0f18ec72b
3 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_encryption/appinfo/app.php
View File

@ -25,7 +25,9 @@ if (!OC_Config::getValue('maintenance', false)) {
// App manager related hooks
OCA\Encryption\Helper::registerAppHooks();
if(!in_array('crypt', stream_get_wrappers())) {
stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
}
// check if we are logged in
if (OCP\User::isLoggedIn()) {

9
apps/files_encryption/hooks/hooks.php
View File

@ -44,16 +44,21 @@ class Hooks {
\OC_Util::setupFS($params['uid']);
}
$util = new Util($view, $params['uid']);
$privateKey = \OCA\Encryption\Keymanager::getPrivateKey($view, $params['uid']);
// if no private key exists, check server configuration
if(!$privateKey) {
//check if all requirements are met
if(!$util->ready() && (!Helper::checkRequirements() || !Helper::checkConfiguration())) {
if(!Helper::checkRequirements() || !Helper::checkConfiguration()) {
$error_msg = $l->t("Missing requirements.");
$hint = $l->t('Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.');
\OC_App::disable('files_encryption');
\OCP\Util::writeLog('Encryption library', $error_msg . ' ' . $hint, \OCP\Util::ERROR);
\OCP\Template::printErrorPage($error_msg, $hint);
}
}
$util = new Util($view, $params['uid']);
// setup user, if user not ready force relogin
if (Helper::setupUser($util, $params['password']) === false) {

3
apps/files_encryption/lib/util.php
View File

@ -201,10 +201,11 @@ class Util {
if (false === $this->recoveryEnabledForUser()) {
// create database configuration
$sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`) VALUES (?,?,?)';
$sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`,`migration_status`) VALUES (?,?,?,?)';
$args = array(
$this->userId,
'server-side',
0,
0
);
$query = \OCP\DB::prepare($sql);