upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_all

Browse source 
close encryption session after decryption was finished
This commit is contained in:
Vincent Petry 2014-02-27 11:10:45 +01:00
commit 577e47e207
3 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/files_encryption/lib/session.php
View file

@ -134,6 +134,14 @@ class Session {
}
/**
* @brief remove encryption keys and init status from session
*/
public function closeSession() {
\OC::$session->remove('encryptionInitialized');
\OC::$session->remove('privateKey');
}
/**
* @brief Gets status if we already tried to initialize the encryption app

8
apps/files_encryption/lib/util.php
View file

@ -1772,4 +1772,12 @@ class Util {
return $session;
}
/*
* @brief remove encryption related keys from the session
*/
public function closeEncryptionSession() {
$session = new \OCA\Encryption\Session($this->view);
$session->closeSession();
}
}

2
settings/ajax/decryptall.php
View file

@ -24,6 +24,8 @@ if ($result !== false) {
$successful = false;
}
$util->closeEncryptionSession();
if ($successful === true) {
\OCP\JSON::success(array('data' => array('message' => 'Files decrypted successfully')));
} else {