Skip to content
Snippets Groups Projects
Unverified Commit 678ae0b2 authored by Seamus Lee's avatar Seamus Lee
Browse files

[REF] Modify the ACL Contact Cache table to be domain aware 

Fix upgrade step and Contact Selector Test failure
parent fd934ea7
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CRM/Contact/BAO/Contact/Permission.php
+ 23
− 11
View file @ 678ae0b2
......@@ -210,8 +210,17 @@ WHERE contact_a.id = %1 AND $permission
// that somebody might flush the cache away from under our feet,
// but the alternative would be a SQL call every time this is called,
// and a complete rebuild if the result was an empty set...
$currentDomainID = CRM_Core_Config::domainID();
if (!isset(Civi::$statics[__CLASS__]['processed'])) {
Civi::$statics[__CLASS__]['processed'] = [
$currentDomainID => [
CRM_Core_Permission::VIEW => [],
CRM_Core_Permission::EDIT => [],
],
];
}
elseif (!isset(Civi::$statics[__CLASS__]['processed'][$currentDomainID])) {
Civi::$statics[__CLASS__]['processed'][$currentDomainID] = [
CRM_Core_Permission::VIEW => [],
CRM_Core_Permission::EDIT => [],
];
......@@ -225,11 +234,11 @@ WHERE contact_a.id = %1 AND $permission
$operationClause = " operation = 'Edit' ";
$operation = 'Edit';
}
$queryParams = [1 => [$userID, 'Integer']];
$queryParams = [1 => [$userID, 'Integer'], 2 => [$currentDomainID, 'Integer']];
if (!$force) {
// skip if already calculated
if (!empty(Civi::$statics[__CLASS__]['processed'][$type][$userID])) {
if (!empty(Civi::$statics[__CLASS__]['processed'][$currentDomainID][$type][$userID])) {
// \Civi::log()->debug("CRM_Contact_BAO_Contact_Permission::cache already called. Operation: $operation; UserID: $userID");
return;
}
......@@ -258,10 +267,11 @@ SELECT count(*)
FROM civicrm_acl_contact_cache
WHERE user_id = %1
AND $operationClause
AND domain_id = %2
";
$count = CRM_Core_DAO::singleValueQuery($sql, $queryParams);
if ($count > 0) {
Civi::$statics[__CLASS__]['processed'][$type][$userID] = 1;
Civi::$statics[__CLASS__]['processed'][$currentDomainID][$type][$userID] = 1;
$lock->release();
// \Civi::log()->debug("CRM_Contact_BAO_Contact_Permission::cache already called via check query. Operation: $operation; UserID: $userID");
return;
......@@ -289,19 +299,19 @@ AND $operationClause
AND ac.user_id IS NULL
";*/
$sql = " $from WHERE $permission";
$sql = "SELECT $userID as user_id, contact_a.id as contact_id, '{$operation}' as operation" . $sql . ' GROUP BY contact_a.id';
CRM_Core_DAO::executeQuery("INSERT INTO civicrm_acl_contact_cache (user_id, contact_id, operation) {$sql}");
$sql = "SELECT $userID as user_id, contact_a.id as contact_id, '{$operation}' as operation, '{$currentDomainID}' as domain_id" . $sql . ' GROUP BY contact_a.id';
CRM_Core_DAO::executeQuery("INSERT INTO civicrm_acl_contact_cache (user_id, contact_id, operation, domain_id) {$sql}");
// Add in a row for the logged in contact. Do not try to combine with the above query or an ugly OR will appear in
// the permission clause.
if ($userID && (CRM_Core_Permission::check('edit my contact') ||
($type == CRM_Core_Permission::VIEW && CRM_Core_Permission::check('view my contact')))) {
if (!CRM_Core_DAO::singleValueQuery("
SELECT count(*) FROM civicrm_acl_contact_cache WHERE user_id = %1 AND contact_id = %1 AND operation = '{$operation}' LIMIT 1", $queryParams)) {
CRM_Core_DAO::executeQuery("INSERT INTO civicrm_acl_contact_cache ( user_id, contact_id, operation ) VALUES(%1, %1, '{$operation}')", $queryParams);
SELECT count(*) FROM civicrm_acl_contact_cache WHERE user_id = %1 AND contact_id = %1 AND operation = '{$operation}' AND domain_id = '{$currentDomainID}' LIMIT 1", $queryParams)) {
CRM_Core_DAO::executeQuery("INSERT INTO civicrm_acl_contact_cache ( user_id, contact_id, operation, domain_id ) VALUES(%1, %1, '{$operation}', '{$currentDomainID}')", $queryParams);
}
}
Civi::$statics[__CLASS__]['processed'][$type][$userID] = 1;
Civi::$statics[__CLASS__]['processed'][$currentDomainID][$type][$userID] = 1;
$lock->release();
}
......@@ -329,12 +339,13 @@ AND $operationClause
$contactID = (int) CRM_Core_Session::getLoggedInContactID();
self::cache($contactID);
$domainID = CRM_Core_Config::domainID();
if (is_array($contactAlias) && !empty($contactAlias)) {
//More than one contact alias
$clauses = [];
foreach ($contactAlias as $k => $alias) {
$clauses[] = " INNER JOIN civicrm_acl_contact_cache aclContactCache_{$k} ON {$alias}.id = aclContactCache_{$k}.contact_id AND aclContactCache_{$k}.user_id = $contactID ";
$clauses[] = " INNER JOIN civicrm_acl_contact_cache aclContactCache_{$k} ON {$alias}.id = aclContactCache_{$k}.contact_id AND aclContactCache_{$k}.user_id = $contactID AND aclContactCache_{$k}.domain_id = {$domainID} ";
}
$fromClause = implode(" ", $clauses);
......@@ -342,7 +353,7 @@ AND $operationClause
}
else {
$fromClause = " INNER JOIN civicrm_acl_contact_cache aclContactCache ON {$contactAlias}.id = aclContactCache.contact_id ";
$whereClause = " aclContactCache.user_id = $contactID";
$whereClause = " aclContactCache.user_id = $contactID AND aclContactCache.domain_id = {$domainID}";
if (!CRM_Core_Permission::check('access deleted contacts')) {
$whereClause .= " AND $contactAlias.is_deleted = 0";
}
......@@ -361,8 +372,9 @@ AND $operationClause
public static function cacheSubquery() {
if (!CRM_Core_Permission::check([['view all contacts', 'edit all contacts']])) {
$contactID = (int) CRM_Core_Session::getLoggedInContactID();
$domainID = CRM_Core_Config::domainID();
self::cache($contactID);
return "IN (SELECT contact_id FROM civicrm_acl_contact_cache WHERE user_id = $contactID)";
return "IN (SELECT contact_id FROM civicrm_acl_contact_cache WHERE user_id = $contactID AND domain_id = {$domainID})";
}
return NULL;
}
......
CRM/Upgrade/Incremental/php/SixTwo.php
+ 8
− 0
View file @ 678ae0b2
......@@ -78,6 +78,14 @@ class CRM_Upgrade_Incremental_php_SixTwo extends CRM_Upgrade_Incremental_Base {
'callback' => ['CRM_Core_SelectValues', 'customGroupStyle'],
],
]);
$this->addTask('Add in domain_id column to the civicrm_acl_contact_cache_table', 'alterSchemaField', 'ACLContactCache', 'domain_id', [
'title' => ts('Domain'),
'sql_type' => 'int unsigned',
'input_type' => 'Number',
'description' => ts('Implicit FK to civicrm_domain'),
'required' => TRUE,
'default' => 1,
]);
}
public static function setFileUploadDate(): bool {
......
schema/Contact/ACLContactCache.entityType.php
+ 15
− 0
View file @ 678ae0b2
......@@ -20,6 +20,12 @@ return [
'unique' => TRUE,
'add' => '3.1',
],
'Index_domain_id' => [
'fields' => [
'domain_id' => TRUE,
],
'add' => '6.2',
],
],
'getFields' => fn() => [
'id' => [
......@@ -61,5 +67,14 @@ return [
'callback' => ['CRM_ACL_BAO_ACL', 'operation'],
],
],
'domain_id' => [
'title' => ts('Domain'),
'sql_type' => 'int unsigned',
'input_type' => 'Number',
'description' => ts('Implicit FK to civicrm_domain'),
'add' => '6.2',
'required' => TRUE,
'default' => 1,
],
],
];
tests/phpunit/CRM/Contact/SelectorTest.php
+ 2
− 2
View file @ 678ae0b2
......@@ -372,7 +372,7 @@ class CRM_Contact_SelectorTest extends CiviUnitTestCase {
'expected_query' => [
0 => self::getDefaultSelectString(),
1 => 'FROM civicrm_contact contact_a LEFT JOIN civicrm_address ON ( contact_a.id = civicrm_address.contact_id AND civicrm_address.is_primary = 1 ) LEFT JOIN civicrm_country ON ( civicrm_address.country_id = civicrm_country.id ) LEFT JOIN civicrm_email ON (contact_a.id = civicrm_email.contact_id AND civicrm_email.is_primary = 1) LEFT JOIN civicrm_phone ON (contact_a.id = civicrm_phone.contact_id AND civicrm_phone.is_primary = 1) LEFT JOIN civicrm_im ON (contact_a.id = civicrm_im.contact_id AND civicrm_im.is_primary = 1) LEFT JOIN civicrm_worldregion ON civicrm_country.region_id = civicrm_worldregion.id INNER JOIN civicrm_acl_contact_cache aclContactCache ON contact_a.id = aclContactCache.contact_id',
2 => "WHERE ( civicrm_email.email LIKE 'mickey@mouseville.com%' AND ( ( ( contact_a.sort_name LIKE 'Mouse%' ) OR ( civicrm_email.email LIKE 'Mouse%' ) ) ) ) AND aclContactCache.user_id = 0 AND (contact_a.is_deleted)",
2 => "WHERE ( civicrm_email.email LIKE 'mickey@mouseville.com%' AND ( ( ( contact_a.sort_name LIKE 'Mouse%' ) OR ( civicrm_email.email LIKE 'Mouse%' ) ) ) ) AND aclContactCache.user_id = 0 AND aclContactCache.domain_id = 1 AND (contact_a.is_deleted)",
],
],
],
......@@ -392,7 +392,7 @@ class CRM_Contact_SelectorTest extends CiviUnitTestCase {
'expected_query' => [
0 => self::getDefaultSelectString(),
1 => 'FROM civicrm_contact contact_a LEFT JOIN civicrm_address ON ( contact_a.id = civicrm_address.contact_id AND civicrm_address.is_primary = 1 ) LEFT JOIN civicrm_country ON ( civicrm_address.country_id = civicrm_country.id ) LEFT JOIN civicrm_email ON (contact_a.id = civicrm_email.contact_id AND civicrm_email.is_primary = 1) LEFT JOIN civicrm_phone ON (contact_a.id = civicrm_phone.contact_id AND civicrm_phone.is_primary = 1) LEFT JOIN civicrm_im ON (contact_a.id = civicrm_im.contact_id AND civicrm_im.is_primary = 1) LEFT JOIN civicrm_worldregion ON civicrm_country.region_id = civicrm_worldregion.id INNER JOIN civicrm_acl_contact_cache aclContactCache ON contact_a.id = aclContactCache.contact_id',
2 => "WHERE ( civicrm_email.email LIKE 'mickey@mouseville.com%' AND ( ( ( contact_a.sort_name LIKE 'Mouse%' ) OR ( civicrm_email.email LIKE 'Mouse%' ) ) ) ) AND aclContactCache.user_id = 0 AND (contact_a.is_deleted = 0)",
2 => "WHERE ( civicrm_email.email LIKE 'mickey@mouseville.com%' AND ( ( ( contact_a.sort_name LIKE 'Mouse%' ) OR ( civicrm_email.email LIKE 'Mouse%' ) ) ) ) AND aclContactCache.user_id = 0 AND aclContactCache.domain_id = 1 AND (contact_a.is_deleted = 0)",
],
],
],
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment