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

Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption

This commit is contained in:
Björn Schießle 2013-05-15 16:13:29 +02:00
parent 64d94c540a 63a790b415
commit 1f5ed65b12
2 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,26 +26,27 @@ OCA\Encryption\Helper::registerFilesystemHooks();
stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
$view = new OC_FilesystemView( '/' );
// check if we are logged in
if (OCP\User::isLoggedIn()) {
$view = new OC_FilesystemView('/');
$session = new \OCA\Encryption\Session($view);
//$session = new \OCA\Encryption\Session( $view );
//
//if (
// ! $session->getPrivateKey( \OCP\USER::getUser() )
// && OCP\User::isLoggedIn()
// && OCA\Encryption\Crypt::mode() == 'server'
//) {
//
// // Force the user to log-in again if the encryption key isn't unlocked
// // (happens when a user is logged in before the encryption app is
// // enabled)
// OCP\User::logout();
//
// header( "Location: " . OC::$WEBROOT.'/' );
//
// exit();
//
//}
// check if user has a private key
if (
!$session->getPrivateKey(\OCP\USER::getUser())
&& OCA\Encryption\Crypt::mode() === 'server'
) {
// Force the user to log-in again if the encryption key isn't unlocked
// (happens when a user is logged in before the encryption app is
// enabled)
OCP\User::logout();
header("Location: " . OC::$WEBROOT . '/');
exit();
}
}
// Register settings scripts
OCP\App::registerAdmin( 'files_encryption', 'settings-admin' );

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

@ -52,16 +52,11 @@ class Hooks {
if(Helper::setupUser($util, $params['password']) === false) {
return false;
}
\OC_FileProxy::$enabled = false;
$encryptedKey = Keymanager::getPrivateKey( $view, $params['uid'] );
\OC_FileProxy::$enabled = true;
//$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, "helloworld" );
$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
$session = new Session( $view );
$session->setPrivateKey( $privateKey, $params['uid'] );
@ -86,13 +81,9 @@ class Hooks {
$session->setLegacyKey( $plainLegacyKey );
}
\OC_FileProxy::$enabled = false;
$publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
\OC_FileProxy::$enabled = false;
// Encrypt existing user files:
// This serves to upgrade old versions of the encryption
// app (see appinfo/spec.txt)