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

Added pre_share hook

Browse source 
Switched it for post_share hook in encryption hooks
Stop a file from being shared if the encryption procedure fails for any users
This commit is contained in:
Sam Tuke 2013-05-08 16:22:08 +02:00
parent fdc49e7acb
commit 28866de44b
4 changed files with 130 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_encryption/appinfo/app.php
View file

@ -16,7 +16,7 @@ OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login'
OCP\Util::connectHook( 'OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
// Sharing-related hooks
OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
OCP\Util::connectHook( 'OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared' );
OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', 'postUnshareAll' );

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

@ -183,7 +183,7 @@ class Hooks {
/**
* @brief
*/
public static function postShared( $params ) {
public static function preShared( $params ) {
// NOTE: $params has keys:
// [itemType] => file
@ -201,6 +201,7 @@ class Hooks {
// [fileTarget] => /test8
// [id] => 10
// [token] =>
// [run] => whether emitting script should continue to run
// TODO: Should other kinds of item be encrypted too?
if ( $params['itemType'] === 'file' || $params['itemType'] === 'folder' ) {
@ -296,14 +297,12 @@ class Hooks {
}
}
// If no attempts to set keyfiles failed
if ( empty( $failed ) ) {
// If some attempts to set keyfiles failed
if ( ! empty( $failed ) ) {
return true;
} else {
return false;
// Set flag var 'run' to notify emitting
// script that hook execution failed
$params['run']->run = false;
}
}

5
apps/files_encryption/lib/util.php
View file

@ -861,9 +861,8 @@ class Util {
if ( ! empty( $filteredUids['unready'] ) ) {
// Notify user of unready userDir
// TODO: Move this out of here; it belongs somewhere else
\OCP\JSON::error();
// TODO: Notify user of unready userDir
\OC_Log::write( 'Encryption library', 'Sharing to these user(s) failed as they are unready for encryption:"'.print_r( $filteredUids['unready'], 1 ), \OC_Log::WARN );
}

65
lib/public/share.php
View file

@ -1223,6 +1223,37 @@ class Share {
} else {
$groupFileTarget = null;
}
// Trigger hooks before the share is added to DB
// Set flag indicating if execution should continue.
// Use an object as workaround for pass by reference issues
$run = new \stdClass();
$run->run = true;
$params = array(
'itemType' => $itemType,
'itemSource' => $itemSource,
'itemTarget' => $groupItemTarget,
'parent' => $parent,
'shareType' => $shareType,
'shareWith' => $shareWith['group'],
'uidOwner' => $uidOwner,
'permissions' => $permissions,
'fileSource' => $fileSource,
'fileTarget' => $groupFileTarget,
'id' => $parent,
'token' => $token,
'run' => $run
);
$run = \OC_Hook::emit(
'OCP\Share'
, 'pre_shared'
, $params
);
// If hook execution didn't encounter errors
if ( ! $run->run ) {
$message = 'Sharing '.$itemSource.' failed, because pre share hooks failed';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
return false;
} else {
$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType,
$shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget, $token));
// Save this id, any extra rows for this group share will need to reference it
@ -1276,6 +1307,7 @@ class Share {
// Return parent folders to preserve file target paths for potential children
return $parentFolders;
}
}
} else {
$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
$suggestedItemTarget);
@ -1296,6 +1328,38 @@ class Share {
} else {
$fileTarget = null;
}
// Trigger hooks before the share is added to DB
// Set flag indicating if execution should continue.
// Use an object as workaround for pass by reference issues
$run = new \stdClass();
$run->run = true;
// NOTE: [id] isn't included as it's not yet available
// (hasn't been inserted)
$params = array(
'itemType' => $itemType,
'itemSource' => $itemSource,
'itemTarget' => $itemTarget,
'parent' => $parent,
'shareType' => $shareType,
'shareWith' => $shareWith,
'uidOwner' => $uidOwner,
'permissions' => $permissions,
'fileSource' => $fileSource,
'fileTarget' => $fileTarget,
'token' => $token,
'run' => $run
);
\OC_Hook::emit(
'OCP\Share'
, 'pre_shared'
, $params
);
// If hook execution didn't encounter errors
if ( ! $run->run ) {
$message = 'Sharing '.$itemSource.' failed, because pre share hooks failed';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
return false;
} else {
$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner,
$permissions, time(), $fileSource, $fileTarget, $token));
$id = \OC_DB::insertid('*PREFIX*share');
@ -1319,6 +1383,7 @@ class Share {
return $parentFolders;
}
}
}
return true;
}