sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

also delete share keys if a different user than the owner deletes a shared file

remotes/origin/stable6
Björn Schießle 2013-03-26 16:17:26 +07:00
parent b1d620300e
commit 6beeb2466f
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files_encryption/lib/keymanager.php
Unescape Escape View File

@ -363,11 +363,7 @@ class Keymanager {
\OC_FileProxy::$enabled = false;
$util = new Util( $view, $userId );
list($owner, $filename) = $util->getUidAndFilename($filePath);
$shareKeyPath = '/' . $owner . '/files_encryption/share-keys/' . $filename;
$shareKeyPath = '/' . $userId . '/files_encryption/share-keys/' . $filePath;
$absPath = $view->getLocalFile($shareKeyPath);

17
apps/files_encryption/lib/proxy.php
Unescape Escape View File

@ -291,17 +291,22 @@ class Proxy extends \OC_FileProxy {
\OC_FileProxy::$enabled = false;
$view = new \OC_FilesystemView( '/' );
$userId = \OCP\USER::getUser();
$util = new Util( $view, $userId );
// Format path to be relative to user files dir
$trimmed = ltrim( $path, '/' );
$split = explode( '/', $trimmed );
$sliced = array_slice( $split, 2 );
$relPath = implode( '/', $sliced );
$filePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/'. $relPath;
list($owner, $ownerPath) = $util->getUidAndFilename($relPath);
$filePath = $owner . '/' . 'files_encryption' . '/' . 'keyfiles' . '/'. $ownerPath;
if ( $view->is_dir( $path ) ) {
if ( $view->is_dir( $ownerPath ) ) {
// Dirs must be handled separately as deleteFileKey
// doesn't handle them
@ -312,8 +317,8 @@ class Proxy extends \OC_FileProxy {
// Delete keyfile & shareKey so it isn't orphaned
if (
! (
Keymanager::deleteFileKey( $view, $userId, $relPath )
&& Keymanager::delShareKey( $view, $userId, $relPath )
Keymanager::deleteFileKey( $view, $owner, $ownerPath )
&& Keymanager::delShareKey( $view, $owner, $ownerPath )
)
) {