diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-05-04 16:14:38 +0200 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-05-04 16:14:38 +0200 |
| commit | c8946ea6086c642a5c367f2e5f63d58bc185c331 (patch) | |
| tree | aacba56be830d53517a958a222470414b1297d79 /apps/files_encryption/lib/session.php | |
| parent | 9605d14a17522dd47c760a1c37a0374cfb0551b9 (diff) | |
| download | nextcloud-server-c8946ea6086c642a5c367f2e5f63d58bc185c331.tar.gz nextcloud-server-c8946ea6086c642a5c367f2e5f63d58bc185c331.zip | |
Added support for user-specified password for adminRecovery account in admin settings page
Made encryptAll() (file migration for unencrypted + legacy encrypted files) run only on first login for each user (status stored in DB)
Made recoveryAdmin user member of 'admin' user group automatically
Set recoveryadmin settings to only display on user settings if enabled by an admin
Updated encryption db xml schema
Diffstat (limited to 'apps/files_encryption/lib/session.php')
| -rw-r--r-- | apps/files_encryption/lib/session.php | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php index 0e6bb96605f..22453131db7 100644 --- a/apps/files_encryption/lib/session.php +++ b/apps/files_encryption/lib/session.php @@ -57,23 +57,23 @@ class Session { // our app.php is being executed 18 times per page load // , causing 18 new keypairs and huge performance hit. - $keypair = Crypt::createKeypair(); - - \OC_FileProxy::$enabled = false; - - // Save public key - - if (!$view->is_dir('/public-keys')) { - $view->mkdir('/public-keys'); - } - - $this->view->file_put_contents( '/public-keys/owncloud.public.key', $keypair['publicKey'] ); - - // Encrypt private key empthy passphrase - $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], '' ); - - // Save private key - $this->view->file_put_contents( '/owncloud_private_key/owncloud.private.key', $encryptedPrivateKey ); +// $keypair = Crypt::createKeypair(); +// +// \OC_FileProxy::$enabled = false; +// +// // Save public key +// +// if (!$view->is_dir('/public-keys')) { +// $view->mkdir('/public-keys'); +// } +// +// $this->view->file_put_contents( '/public-keys/owncloud.public.key', $keypair['publicKey'] ); +// +// // Encrypt private key empthy passphrase +// $encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], '' ); +// +// // Save private key +// $this->view->file_put_contents( '/owncloud_private_key/owncloud.private.key', $encryptedPrivateKey ); \OC_FileProxy::$enabled = true; |