Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix activity.getcount function to filter out unpermitted activities. #13377

Merged
merged 1 commit into from
Jan 11, 2019
Merged

Fix activity.getcount function to filter out unpermitted activities. #13377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions CRM/Activity/BAO/Activity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,6 +1117,22 @@ public static function deprecatedGetActivities($input) {
return $values;
}

/**
* @inheritDoc
*/
public function addSelectWhereClause() {
$clauses = parent::addSelectWhereClause();
if (!CRM_Core_Permission::check('view all activities')) {
$permittedActivityTypeIDs = self::getPermittedActivityTypes();
if (empty($permittedActivityTypeIDs)) {
// This just prevents a mysql fail if they have no access - should be extremely edge case.
$permittedActivityTypeIDs = [0];
}
$clauses['activity_type_id'] = ('IN (' . implode(', ', $permittedActivityTypeIDs) . ')');
}
return $clauses;
}

/**
* Get an array of components that are accessible by the currenct user.
*
Expand Down Expand Up @@ -2694,6 +2710,8 @@ public static function checkPermission($activityId, $action) {
}

if (!self::hasPermissionForActivityType($activity->activity_type_id)) {
// this check is redundant for api access / anything that calls the selectWhereClause
// to determine ACLs.
return FALSE;
}
// Return early when it is case activity.
Expand Down Expand Up @@ -2799,7 +2817,7 @@ protected static function hasPermissionForActivityType($activityTypeID) {
*
* @return array
*/
public static function getPermittedActivityTypes() {
protected static function getPermittedActivityTypes() {
colemanw marked this conversation as resolved.
Show resolved Hide resolved
$userID = (int) CRM_Core_Session::getLoggedInContactID();
if (!isset(Civi::$statics[__CLASS__]['permitted_activity_types'][$userID])) {
$permittedActivityTypes = [];
Expand All @@ -2813,7 +2831,7 @@ public static function getPermittedActivityTypes() {
INNER JOIN civicrm_option_group grp ON (grp.id = option_group_id AND grp.name = 'activity_type')
WHERE component_id IS NULL $componentClause")->fetchAll();
foreach ($types as $type) {
$permittedActivityTypes[$type['activity_type_id']] = $type['activity_type_id'];
$permittedActivityTypes[$type['activity_type_id']] = (int) $type['activity_type_id'];
}
Civi::$statics[__CLASS__]['permitted_activity_types'][$userID] = $permittedActivityTypes;
}
Expand Down
3 changes: 3 additions & 0 deletions tests/phpunit/api/v3/ACLPermissionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,8 @@ public function testGetActivityCheckPermissionsByComponent() {
$this->hookClass->setHook('civicrm_aclWhereClause', array($this, 'aclWhereHookAllResults'));
$this->setPermissions(['access CiviCRM', 'access CiviContribute']);
$this->callAPISuccessGetSingle('Activity', ['check_permissions' => 1, 'id' => ['IN' => [$activity['id'], $activity2['id']]]]);
$this->callAPISuccessGetCount('Activity', ['check_permissions' => 1, 'id' => ['IN' => [$activity['id'], $activity2['id']]]], 1);

}

/**
Expand All @@ -515,6 +517,7 @@ public function testGetActivityCheckPermissionsByCaseComponent() {
$this->hookClass->setHook('civicrm_aclWhereClause', array($this, 'aclWhereHookAllResults'));
$this->setPermissions(['access CiviCRM', 'access CiviContribute', 'access all cases and activities']);
$this->callAPISuccessGetSingle('Activity', ['check_permissions' => 1, 'id' => ['IN' => [$activity['id'], $activity2['id']]]]);
$this->callAPISuccessGetCount('Activity', ['check_permissions' => 1, 'id' => ['IN' => [$activity['id'], $activity2['id']]]], 1);
}

/**
Expand Down