Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
This commit is contained in:
Florin Peter
commit
f82fb0e160
|
|
@ -183,7 +183,7 @@ class Hooks {
|
||||||
/**
|
/**
|
||||||
* @brief
|
* @brief
|
||||||
*/
|
*/
|
||||||
public static function postShared($params) {
|
public static function postShared( $params ) {
|
||||||
|
|
||||||
// NOTE: $params has keys:
|
// NOTE: $params has keys:
|
||||||
// [itemType] => file
|
// [itemType] => file
|
||||||
|
|
@ -202,89 +202,109 @@ class Hooks {
|
||||||
// [id] => 10
|
// [id] => 10
|
||||||
// [token] =>
|
// [token] =>
|
||||||
// TODO: Should other kinds of item be encrypted too?
|
// TODO: Should other kinds of item be encrypted too?
|
||||||
if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
|
|
||||||
|
|
||||||
$view = new \OC_FilesystemView('/');
|
if ( $params['itemType'] === 'file' || $params['itemType'] === 'folder' ) {
|
||||||
|
|
||||||
|
$view = new \OC_FilesystemView( '/' );
|
||||||
$session = new Session($view);
|
$session = new Session($view);
|
||||||
$userId = \OCP\User::getUser();
|
$userId = \OCP\User::getUser();
|
||||||
$util = new Util($view, $userId);
|
$util = new Util($view, $userId);
|
||||||
$path = $util->fileIdToPath($params['itemSource']);
|
$path = $util->fileIdToPath( $params['itemSource'] );
|
||||||
|
|
||||||
//if parent is set, then this is a re-share action
|
//if parent is set, then this is a re-share action
|
||||||
if($params['parent']) {
|
if( $params['parent'] ) {
|
||||||
|
|
||||||
// get the parent from current share
|
// get the parent from current share
|
||||||
$parent = $util->getShareParent($params['parent']);
|
$parent = $util->getShareParent( $params['parent'] );
|
||||||
|
|
||||||
// if parent is file the it is an 1:1 share
|
// if parent is file the it is an 1:1 share
|
||||||
if($parent['item_type'] === 'file') {
|
if($parent['item_type'] === 'file') {
|
||||||
|
|
||||||
// prefix path with Shared
|
// prefix path with Shared
|
||||||
$path = '/Shared'.$parent['file_target'];
|
$path = '/Shared'.$parent['file_target'];
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// parent is folder but shared was a file!
|
|
||||||
// we try to rebuild the missing path
|
|
||||||
// some examples we face here
|
|
||||||
// user1 share folder1 with user2 folder1 has the following structure /folder1/subfolder1/subsubfolder1/somefile.txt
|
|
||||||
// user2 re-share subfolder2 with user3
|
|
||||||
// user3 re-share somefile.txt user4
|
|
||||||
// so our path should be /Shared/subfolder1/subsubfolder1/somefile.txt while user3 is sharing
|
|
||||||
if($params['itemType'] === 'file') {
|
|
||||||
// get target path
|
|
||||||
$targetPath = $util->fileIdToPath($params['fileSource']);
|
|
||||||
$targetPathSplit = array_reverse(explode('/', $targetPath));
|
|
||||||
|
|
||||||
// init values
|
// NOTE: parent is folder but shared was a file!
|
||||||
$path = '';
|
// we try to rebuild the missing path
|
||||||
$sharedPart = ltrim( $parent['file_target'], '/' );
|
// some examples we face here
|
||||||
|
// user1 share folder1 with user2 folder1 has
|
||||||
|
// the following structure
|
||||||
|
// /folder1/subfolder1/subsubfolder1/somefile.txt
|
||||||
|
// user2 re-share subfolder2 with user3
|
||||||
|
// user3 re-share somefile.txt user4
|
||||||
|
// so our path should be
|
||||||
|
// /Shared/subfolder1/subsubfolder1/somefile.txt
|
||||||
|
// while user3 is sharing
|
||||||
|
|
||||||
// rebuild path
|
if ( $params['itemType'] === 'file' ) {
|
||||||
foreach ($targetPathSplit as $pathPart) {
|
// get target path
|
||||||
if($pathPart !== $sharedPart) {
|
$targetPath = $util->fileIdToPath( $params['fileSource'] );
|
||||||
$path = '/'.$pathPart.$path;
|
$targetPathSplit = array_reverse( explode( '/', $targetPath ) );
|
||||||
} else {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// prefix path with Shared
|
// init values
|
||||||
$path = '/Shared'.$parent['file_target'].$path;
|
$path = '';
|
||||||
|
$sharedPart = ltrim( $parent['file_target'], '/' );
|
||||||
|
|
||||||
} else {
|
// rebuild path
|
||||||
|
foreach ( $targetPathSplit as $pathPart ) {
|
||||||
|
|
||||||
// prefix path with Shared
|
if( $pathPart !== $sharedPart ) {
|
||||||
$path = '/Shared'.$parent['file_target'].$params['fileTarget'];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$sharingEnabled = \OCP\Share::isEnabled();
|
$path = '/' . $pathPart . $path;
|
||||||
|
|
||||||
// if a folder was shared, get a list if all (sub-)folders
|
} else {
|
||||||
if ($params['itemType'] === 'folder') {
|
|
||||||
$allFiles = $util->getAllFiles($path);
|
break;
|
||||||
} else {
|
|
||||||
$allFiles = array($path);
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// prefix path with Shared
|
||||||
|
$path = '/Shared'.$parent['file_target'].$path;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
// prefix path with Shared
|
||||||
|
$path = '/Shared'.$parent['file_target'].$params['fileTarget'];
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($allFiles as $path) {
|
$sharingEnabled = \OCP\Share::isEnabled();
|
||||||
$usersSharing = $util->getSharingUsersArray($sharingEnabled, $path);
|
|
||||||
|
// if a folder was shared, get a list if all (sub-)folders
|
||||||
|
if ( $params['itemType'] === 'folder' ) {
|
||||||
|
$allFiles = $util->getAllFiles($path);
|
||||||
|
} else {
|
||||||
|
|
||||||
|
$allFiles = array( $path );
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ( $allFiles as $path ) {
|
||||||
|
|
||||||
|
$usersSharing = $util->getSharingUsersArray( $sharingEnabled, $path );
|
||||||
|
|
||||||
$failed = array();
|
$failed = array();
|
||||||
|
|
||||||
// Attempt to set shareKey
|
// Attempt to set shareKey
|
||||||
if (!$util->setSharedFileKeyfiles($session, $usersSharing, $path)) {
|
if ( !$util->setSharedFileKeyfiles( $session, $usersSharing, $path ) ) {
|
||||||
|
|
||||||
$failed[] = $path;
|
$failed[] = $path;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If no attempts to set keyfiles failed
|
// If no attempts to set keyfiles failed
|
||||||
if (empty($failed)) {
|
if ( empty( $failed ) ) {
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -292,85 +312,104 @@ class Hooks {
|
||||||
/**
|
/**
|
||||||
* @brief
|
* @brief
|
||||||
*/
|
*/
|
||||||
public static function postUnshare($params)
|
public static function postUnshare( $params ) {
|
||||||
{
|
|
||||||
|
|
||||||
// NOTE: $params has keys:
|
// NOTE: $params has keys:
|
||||||
// [itemType] => file
|
// [itemType] => file
|
||||||
// [itemSource] => 13
|
// [itemSource] => 13
|
||||||
// [shareType] => 0
|
// [shareType] => 0
|
||||||
// [shareWith] => test1
|
// [shareWith] => test1
|
||||||
// [itemParent] =>
|
// [itemParent] =>
|
||||||
|
|
||||||
if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
|
if ( $params['itemType'] === 'file' || $params['itemType'] === 'folder' ) {
|
||||||
|
|
||||||
$view = new \OC_FilesystemView('/');
|
$view = new \OC_FilesystemView( '/' );
|
||||||
$userId = \OCP\User::getUser();
|
$userId = \OCP\User::getUser();
|
||||||
$util = new Util($view, $userId);
|
$util = new Util( $view, $userId);
|
||||||
$path = $util->fileIdToPath($params['itemSource']);
|
$path = $util->fileIdToPath( $params['itemSource'] );
|
||||||
|
|
||||||
// check if this is a re-share
|
// check if this is a re-share
|
||||||
if ($params['itemParent']) {
|
if ( $params['itemParent'] ) {
|
||||||
|
|
||||||
// get the parent from current share
|
// get the parent from current share
|
||||||
$parent = $util->getShareParent($params['itemParent']);
|
$parent = $util->getShareParent( $params['itemParent'] );
|
||||||
|
|
||||||
// get target path
|
// get target path
|
||||||
$targetPath = $util->fileIdToPath($params['itemSource']);
|
$targetPath = $util->fileIdToPath( $params['itemSource'] );
|
||||||
$targetPathSplit = array_reverse(explode('/', $targetPath));
|
$targetPathSplit = array_reverse( explode( '/', $targetPath ) );
|
||||||
|
|
||||||
// init values
|
// init values
|
||||||
$path = '';
|
$path = '';
|
||||||
$sharedPart = ltrim($parent['file_target'], '/');
|
$sharedPart = ltrim( $parent['file_target'], '/' );
|
||||||
|
|
||||||
// rebuild path
|
// rebuild path
|
||||||
foreach ($targetPathSplit as $pathPart) {
|
foreach ( $targetPathSplit as $pathPart ) {
|
||||||
if ($pathPart !== $sharedPart) {
|
|
||||||
$path = '/' . $pathPart . $path;
|
|
||||||
} else {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// prefix path with Shared
|
if ( $pathPart !== $sharedPart ) {
|
||||||
$path = '/Shared' . $parent['file_target'] . $path;
|
|
||||||
}
|
|
||||||
|
|
||||||
// for group shares get a list of the group members
|
$path = '/' . $pathPart . $path;
|
||||||
if ($params['shareType'] == \OCP\Share::SHARE_TYPE_GROUP) {
|
|
||||||
$userIds = \OC_Group::usersInGroup($params['shareWith']);
|
|
||||||
} else {
|
|
||||||
$userIds = array($params['shareWith']);
|
|
||||||
}
|
|
||||||
|
|
||||||
// if we unshare a folder we need a list of all (sub-)files
|
} else {
|
||||||
if ($params['itemType'] === 'folder') {
|
|
||||||
$allFiles = $util->getAllFiles($path);
|
|
||||||
} else {
|
|
||||||
$allFiles = array($path);
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($allFiles as $path) {
|
break;
|
||||||
|
|
||||||
// check if the user still has access to the file, otherwise delete share key
|
}
|
||||||
$sharingUsers = $util->getSharingUsersArray(true, $path);
|
|
||||||
|
|
||||||
// Unshare every user who no longer has access to the file
|
}
|
||||||
$delUsers = array_diff($userIds, $sharingUsers);
|
|
||||||
if (!Keymanager::delShareKey($view, $delUsers, $path)) {
|
|
||||||
$failed[] = $path;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
// prefix path with Shared
|
||||||
|
$path = '/Shared' . $parent['file_target'] . $path;
|
||||||
|
}
|
||||||
|
|
||||||
// If no attempts to set keyfiles failed
|
// for group shares get a list of the group members
|
||||||
if (empty($failed)) {
|
if ( $params['shareType'] == \OCP\Share::SHARE_TYPE_GROUP ) {
|
||||||
return true;
|
|
||||||
} else {
|
$userIds = \OC_Group::usersInGroup($params['shareWith']);
|
||||||
return false;
|
|
||||||
}
|
} else {
|
||||||
}
|
|
||||||
}
|
$userIds = array( $params['shareWith'] );
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// if we unshare a folder we need a list of all (sub-)files
|
||||||
|
if ( $params['itemType'] === 'folder' ) {
|
||||||
|
|
||||||
|
$allFiles = $util->getAllFiles( $path );
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
$allFiles = array( $path );
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ( $allFiles as $path ) {
|
||||||
|
|
||||||
|
// check if the user still has access to the file, otherwise delete share key
|
||||||
|
$sharingUsers = $util->getSharingUsersArray( true, $path );
|
||||||
|
|
||||||
|
// Unshare every user who no longer has access to the file
|
||||||
|
$delUsers = array_diff( $userIds, $sharingUsers);
|
||||||
|
|
||||||
|
if ( !Keymanager::delShareKey( $view, $delUsers, $path ) ) {
|
||||||
|
|
||||||
|
$failed[] = $path;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// If no attempts to set keyfiles failed
|
||||||
|
if ( empty( $failed ) ) {
|
||||||
|
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief
|
* @brief
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue