wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

delete old keys if file was moved to a different mount point

Browse source
This commit is contained in:
Bjoern Schiessle 2014-11-28 17:53:21 +01:00
parent 49cfc30359
commit 2e78217f17
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/files_encryption/hooks/hooks.php
View file

@ -432,15 +432,18 @@ class Hooks {
$mp1 = $view->getMountPoint('/' . $user . '/files/' . $params['oldpath']); $mp1 = $view->getMountPoint('/' . $user . '/files/' . $params['oldpath']);
$mp2 = $view->getMountPoint('/' . $user . '/files/' . $params['newpath']); $mp2 = $view->getMountPoint('/' . $user . '/files/' . $params['newpath']);
$oldKeysPath = Keymanager::getKeyPath($view, $util, $params['oldpath']);
if ($mp1 === $mp2) { if ($mp1 === $mp2) {
$oldKeysPath = Keymanager::getKeyPath($view, $util, $params['oldpath']);
self::$renamedFiles[$params['oldpath']] = array( self::$renamedFiles[$params['oldpath']] = array(
'operation' => $operation, 'operation' => $operation,
'oldKeysPath' => $oldKeysPath, 'oldKeysPath' => $oldKeysPath,
); );
} else {
self::$renamedFiles[$params['oldpath']] = array(
'operation' => 'cleanup',
'oldKeysPath' => $oldKeysPath,
);
} }
} }
@ -464,6 +467,9 @@ class Hooks {
$operation = self::$renamedFiles[$params['oldpath']]['operation']; $operation = self::$renamedFiles[$params['oldpath']]['operation'];
$oldKeysPath = self::$renamedFiles[$params['oldpath']]['oldKeysPath']; $oldKeysPath = self::$renamedFiles[$params['oldpath']]['oldKeysPath'];
unset(self::$renamedFiles[$params['oldpath']]); unset(self::$renamedFiles[$params['oldpath']]);
if ($operation === 'cleanup') {
return $view->unlink($oldKeysPath);
}
} else { } else {
\OCP\Util::writeLog('Encryption library', "can't get path and owner from the file before it was renamed", \OCP\Util::DEBUG); \OCP\Util::writeLog('Encryption library', "can't get path and owner from the file before it was renamed", \OCP\Util::DEBUG);
return false; return false;