Browse Source

Initial implementation of the hooked access callback...

...  Now have to make it get used everywhere.
pull/352/head
Adam Vessey 12 years ago
parent
commit
f0a52f2bda
  1. 39
      islandora.api.php
  2. 73
      islandora.module

39
islandora.api.php

@ -443,3 +443,42 @@ function hook_islandora_ingest_steps(array $form_state) {
*/
function hook_CMODEL_PID_islandora_ingest_steps(array $form_state) {
}
/**
* Hookable access hook.
*
* @param string $op
* A string define an operation to check. Should be defined via
* hook_permission().
* @param AbstractObject $object
* An object to check the operation on.
* @param object $user
* A loaded user object, as the global $user variable might contain.
*
* @return bool|NULL
* Either boolean TRUE or FALSE to explicitly allow or deny the operation on
* the given object, or NULL to indicate that we are making no assertion
* about the outcome.
*/
function hook_islandora_access($op, $object, $user) {
switch ($op) {
case 'create stuff':
return TRUE;
case 'break stuff':
return FALSE;
case 'do a barrel roll!':
return NULL;
}
}
/**
* Content model specific version of hook_islandora_access().
*
* @see hook_islandora_access
*/
function hook_CMODEL_PID_islandora_access($op, $object, $user) {
}

73
islandora.module

@ -1126,3 +1126,76 @@ function islandora_file_mimetype_mapping_alter(&$mapping) {
$mapping['extensions'][$ext] = key($mapping['mimetypes']);
}
}
/**
* Hookable access callback.
*
* @param string $op
* String identifying an operation to check. Should correspond to a
* permission declared via hook_permission().
* @param AbstractObject $object
* An object to check for permissions.
* @param object $user
* An optional loaded user object. Defaults to the global $user.
*
* @return bool
* TRUE if at least one implementation of hook_islandora_access() returned
* TRUE, and no implementation return FALSE; FALSE otherwise.
*/
function islandora_access($op, $object = NULL, $user = NULL) {
$cache = &drupal_static(__FUNCTION__);
if (empty($object)) {
$pid = variable_get('islandora_repository_pid', 'islandora:root');
$object = islandora_object_load($pid);
}
if (!$object) {
// The object could not be loaded... Presumably, we don't have
// permission.
return FALSE;
}
if ($user === NULL) {
global $user;
}
// Populate the cache on a miss.
if (!isset($cache[$op][$object->id][$user->uid])) {
module_load_include('inc', 'islandora', 'includes/utilities');
$results = islandora_invoke_hook_list('islandora_access', $object->models, array(
$op,
$object,
$user,
));
// Nothing returned FALSE, and something returned TRUE.
$cache[$op][$object->id][$user->uid] = (!in_array(FALSE, $results, TRUE) && in_array(TRUE, $results, TRUE));
}
return $cache[$op][$object->id][$user->uid];
}
/**
* Implements hook_islandora_access().
*
* Denies according to PID namespace restrictions, passes according to
* user_access(), and makes no indication if namespace restrictions passed but
* user_access() returned a fail, to allow other modules to allow an operation.
*/
function islandora_islandora_access($op, $object, $user) {
module_load_include('inc', 'islandora', 'includes/utilities');
$to_return = islandora_namespace_accessible($object->id);
if ($to_return && user_access($op, $user)) {
// Straight Drupal permissions, let's allow it.
return TRUE;
}
elseif ($to_return === FALSE) {
// PID namespace is outside of those allowed. Forbid!
return FALSE;
}
else {
// Neither allowing of forbidding, to allow other modules to override.
return NULL;
}
}

Loading…
Cancel
Save