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

removed dead code for delShareKey

Browse source
This commit is contained in:
Florin Peter 2013-05-20 21:24:39 +02:00
parent 8e0540d0e4
commit 1fa2f19ee4
2 changed files with 16 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,13 +67,13 @@ class Hooks {
// If migration not yet done
if ( ! $migrationCompleted ) {
$view1 = new \OC_FilesystemView( '/' . $params['uid'] );
$userView = new \OC_FilesystemView( '/' . $params['uid'] );
// Set legacy encryption key if it exists, to support
// depreciated encryption system
if (
$view1->file_exists( 'encryption.key' )
&& $encLegacyKey = $view1->file_get_contents( 'encryption.key' )
if (
$userView->file_exists( 'encryption.key' )
&& $encLegacyKey = $userView->file_get_contents( 'encryption.key' )
) {
$plainLegacyKey = Crypt::legacyDecrypt( $encLegacyKey, $params['password'] );
@ -412,25 +412,11 @@ class Hooks {
// Unshare every user who no longer has access to the file
$delUsers = array_diff( $userIds, $sharingUsers);
if ( !Keymanager::delShareKey( $view, $delUsers, $path ) ) {
$failed[] = $path;
}
// delete share key
Keymanager::delShareKey( $view, $delUsers, $path );
}
// If no attempts to set keyfiles failed
if ( empty( $failed ) ) {
return true;
} else {
return false;
}
}
}

28
apps/files_encryption/lib/keymanager.php
View file

@ -540,32 +540,23 @@ class Keymanager
$shareKeyPath = '/' . $owner . '/files_encryption/share-keys/' . $filename;
$result = false;
if ($view->is_dir($shareKeyPath)) {
$localPath = \OC_Filesystem::normalizePath($view->getLocalFolder($shareKeyPath));
$result = self::recursiveDelShareKeys($localPath, $userIds);
$localPath = \OC\Files\Filesystem::normalizePath($view->getLocalFolder($shareKeyPath));
self::recursiveDelShareKeys($localPath, $userIds);
} else {
foreach ($userIds as $userId) {
$view->unlink($shareKeyPath . '.' . $userId . '.shareKey');
if (!$view->unlink($shareKeyPath . '.' . $userId . '.shareKey')) {
\OC_Log::write('Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath . '.' . $userId . '.shareKey"', \OC_Log::ERROR);
}
}
$result = true;
}
if (!$result) {
\OC_Log::write('Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath, \OC_Log::ERROR);
}
\OC_FileProxy::$enabled = $proxyStatus;
return $result;
}
/**
@ -582,13 +573,14 @@ class Keymanager
}
/** @var $matches array */
foreach ($matches as $ma) {
unlink($ma);
if (!unlink($ma)) {
\OC_Log::write('Encryption library', 'Could not delete shareKey; does not exist: "' . $ma . '"', \OC_Log::ERROR);
}
}
$subdirs = $directories = glob(preg_quote($dir) . '/*', GLOB_ONLYDIR);
foreach ($subdirs as $subdir) {
self::recursiveDelShareKeys($subdir, $userIds);
}
return true;
}
/**