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

Fixed stream{} reading of encrypted files (stream_read())

This commit is contained in:
Sam Tuke 2013-04-16 14:50:20 +02:00
parent b4dd6ae36c
commit 770dcbf663
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files_encryption/lib/stream.php
View File

@ -239,13 +239,15 @@ class Stream {
// Fetch existing keyfile // Fetch existing keyfile
$this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath ); $this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath );
$this->getUser(); $this->setUserProperty();
$session = new Session( $this->rootView ); $session = new Session( $this->rootView );
$privateKey = $session->getPrivateKey( $this->userId ); $privateKey = $session->getPrivateKey( $this->userId );
$this->keyfile = Crypt::keyDecrypt( $this->encKeyfile, $privateKey ); $shareKey = Keymanager::getShareKey( $this->rootView, $this->userId, $this->relPath );
$this->keyfile = Crypt::multiKeyDecrypt( $this->encKeyfile, $shareKey, $privateKey );
return true; return true;
@ -257,7 +259,7 @@ class Stream {
} }
public function getuser() { public function setUserProperty() {
// Only get the user again if it isn't already set // Only get the user again if it isn't already set
if ( empty( $this->userId ) ) { if ( empty( $this->userId ) ) {