improved rename and file size support
fix missing user_id on write
This commit is contained in:
parent
9a0b73070c
commit
6b47da10be
|
@ -288,38 +288,54 @@ class Proxy extends \OC_FileProxy {
|
|||
* @return bool Result of rename()
|
||||
* @note This is pre rather than post because using post didn't work
|
||||
*/
|
||||
public function preRename( $oldPath, $newPath ) {
|
||||
public function preRename( $oldPath, $newPath )
|
||||
{
|
||||
|
||||
// Disable encryption proxy to prevent recursive calls
|
||||
\OC_FileProxy::$enabled = false;
|
||||
// Disable encryption proxy to prevent recursive calls
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
$view = new \OC_FilesystemView( '/' );
|
||||
$view = new \OC_FilesystemView('/');
|
||||
|
||||
$userId = \OCP\USER::getUser();
|
||||
$userId = \OCP\USER::getUser();
|
||||
|
||||
// Format paths to be relative to user files dir
|
||||
$oldTrimmed = ltrim( $oldPath, '/' );
|
||||
$oldSplit = explode( '/', $oldTrimmed );
|
||||
$oldSliced = array_slice( $oldSplit, 2 );
|
||||
$oldRelPath = implode( '/', $oldSliced );
|
||||
$oldKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $oldRelPath . '.key';
|
||||
// Format paths to be relative to user files dir
|
||||
$oldTrimmed = ltrim($oldPath, '/');
|
||||
$oldSplit = explode('/', $oldTrimmed);
|
||||
$oldSliced = array_slice($oldSplit, 2);
|
||||
$oldRelPath = implode('/', $oldSliced);
|
||||
$oldKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $oldRelPath;
|
||||
|
||||
$newTrimmed = ltrim( $newPath, '/' );
|
||||
$newSplit = explode( '/', $newTrimmed );
|
||||
$newSliced = array_slice( $newSplit, 2 );
|
||||
$newRelPath = implode( '/', $newSliced );
|
||||
$newKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $newRelPath . '.key';
|
||||
|
||||
// Rename keyfile so it isn't orphaned
|
||||
$result = $view->rename( $oldKeyfilePath, $newKeyfilePath );
|
||||
$newTrimmed = ltrim($newPath, '/');
|
||||
$newSplit = explode('/', $newTrimmed);
|
||||
$newSliced = array_slice($newSplit, 2);
|
||||
$newRelPath = implode('/', $newSliced);
|
||||
$newKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $newRelPath;
|
||||
|
||||
\OC_FileProxy::$enabled = true;
|
||||
// add key ext if this is not an folder
|
||||
if (!$view->is_dir($oldKeyfilePath)) {
|
||||
$oldKeyfilePath .= '.key';
|
||||
$newKeyfilePath .= '.key';
|
||||
} else {
|
||||
// handle share-keys folders
|
||||
$oldShareKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $oldRelPath;
|
||||
$newShareKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $newRelPath;
|
||||
$view->rename($oldShareKeyfilePath, $newShareKeyfilePath);
|
||||
}
|
||||
|
||||
return $result;
|
||||
//TODO add support for share-keys files
|
||||
//...
|
||||
|
||||
}
|
||||
// Rename keyfile so it isn't orphaned
|
||||
$result = $view->rename($oldKeyfilePath, $newKeyfilePath);
|
||||
|
||||
public function postFopen( $path, &$result ){
|
||||
\OC_FileProxy::$enabled = true;
|
||||
|
||||
return $result;
|
||||
|
||||
}
|
||||
|
||||
public function postFopen( $path, &$result ){
|
||||
|
||||
if ( !$result ) {
|
||||
|
||||
|
@ -422,48 +438,54 @@ class Proxy extends \OC_FileProxy {
|
|||
|
||||
public function postFileSize( $path, $size ) {
|
||||
|
||||
// Reformat path for use with OC_FSV
|
||||
$path_split = explode( '/', $path );
|
||||
$path_f = implode( '/', array_slice( $path_split, 3 ) );
|
||||
// Reformat path for use with OC_FSV
|
||||
$path_split = explode('/', $path);
|
||||
$path_f = implode('/', array_slice($path_split, 3));
|
||||
|
||||
if ( Crypt::isEncryptedMeta( $path_f ) ) {
|
||||
$view = new \OC_FilesystemView( '/' );
|
||||
$userId = \OCP\User::getUser();
|
||||
$util = new Util( $view, $userId );
|
||||
|
||||
// Disable encryption proxy to prevent recursive calls
|
||||
\OC_FileProxy::$enabled = false;
|
||||
if ($util->isEncryptedPath($path)) {
|
||||
|
||||
// get file info
|
||||
$cached = \OC\Files\Filesystem::getFileInfo( $path_f, '' );
|
||||
// Disable encryption proxy to prevent recursive calls
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
// calculate last chunk nr
|
||||
$lastChunckNr = floor( $size / 8192);
|
||||
// get file info
|
||||
$cached = \OC\Files\Filesystem::getFileInfo($path_f, '');
|
||||
|
||||
// open stream
|
||||
$result = fopen( 'crypt://'.$path_f, "r" );
|
||||
// calculate last chunk nr
|
||||
$lastChunckNr = floor($size / 8192);
|
||||
|
||||
// calculate last chunk position
|
||||
$lastChunckPos = ( $lastChunckNr * 8192 );
|
||||
// open stream
|
||||
$result = fopen('crypt://' . $path_f, "r");
|
||||
|
||||
// seek to end
|
||||
fseek( $result, $lastChunckPos );
|
||||
if(is_resource($result)) {
|
||||
// calculate last chunk position
|
||||
$lastChunckPos = ($lastChunckNr * 8192);
|
||||
|
||||
// get the content of the last chunck
|
||||
$lastChunkContent = fgets( $result );
|
||||
// seek to end
|
||||
fseek($result, $lastChunckPos);
|
||||
|
||||
// calc the real filesize with the size of the last chunk
|
||||
$realSize = ( ( $lastChunckNr * 6126 ) + strlen( $lastChunkContent ) );
|
||||
// get the content of the last chunck
|
||||
$lastChunkContent = fgets($result);
|
||||
|
||||
// enable proxy
|
||||
\OC_FileProxy::$enabled = true;
|
||||
// calc the real file size with the size of the last chunk
|
||||
$realSize = (($lastChunckNr * 6126) + strlen($lastChunkContent));
|
||||
|
||||
// set the size
|
||||
$cached['size'] = $realSize;
|
||||
// set the size
|
||||
$cached['size'] = $realSize;
|
||||
}
|
||||
|
||||
return $cached['size'];
|
||||
// enable proxy
|
||||
\OC_FileProxy::$enabled = true;
|
||||
|
||||
} else {
|
||||
return $cached['size'];
|
||||
|
||||
return $size;
|
||||
} else {
|
||||
|
||||
}
|
||||
return $size;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -101,6 +101,9 @@ class Stream {
|
|||
|
||||
} else {
|
||||
|
||||
// Disable fileproxies so we can get the file size and open the source file without recursive encryption
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
if (
|
||||
$mode == 'w'
|
||||
or $mode == 'w+'
|
||||
|
@ -119,9 +122,6 @@ class Stream {
|
|||
|
||||
}
|
||||
|
||||
// Disable fileproxies so we can open the source file without recursive encryption
|
||||
\OC_FileProxy::$enabled = false;
|
||||
|
||||
//$this->handle = fopen( $this->rawPath, $mode );
|
||||
|
||||
$this->handle = $this->rootView->fopen( $this->rawPath, $mode );
|
||||
|
@ -241,13 +241,12 @@ class Stream {
|
|||
// Avoid problems with .part file extensions
|
||||
$this->relPath = Keymanager::fixPartialFilePath( $this->relPath );
|
||||
|
||||
// Fetch and decrypt keyfile
|
||||
// Fetch existing keyfile
|
||||
$this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath );
|
||||
|
||||
// If a keyfile already exists
|
||||
if ( $this->rootView->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->relPath . '.key' ) ) {
|
||||
|
||||
// Fetch and decrypt keyfile
|
||||
// Fetch existing keyfile
|
||||
$this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath );
|
||||
|
||||
if ( $this->encKeyfile ) {
|
||||
$this->setUserProperty();
|
||||
|
||||
$session = new Session( $this->rootView );
|
||||
|
@ -339,10 +338,14 @@ class Stream {
|
|||
// Get all users sharing the file
|
||||
$uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath );
|
||||
|
||||
// allways add current user
|
||||
$uniqueUserIds[] = $this->userId;
|
||||
array_unique( $uniqueUserIds );
|
||||
|
||||
// Fetch public keys for all sharing users
|
||||
$publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
|
||||
|
||||
// Encrypt enc key for all sharing users
|
||||
// Encrypt enc key for all sharing users
|
||||
$this->encKeyfiles = Crypt::multiKeyEncrypt( $this->plainKey, $publicKeys );
|
||||
|
||||
$view = new \OC_FilesystemView( '/' );
|
||||
|
@ -429,7 +432,7 @@ class Stream {
|
|||
|
||||
$encrypted = $this->preWriteEncrypt( $chunk, $this->plainKey );
|
||||
|
||||
trigger_error("\$encrypted = $encrypted");
|
||||
//trigger_error("\$encrypted = $encrypted");
|
||||
|
||||
// Write the data chunk to disk. This will be
|
||||
// attended to the last data chunk if the file
|
||||
|
|
Loading…
Reference in New Issue