revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-14 10:52:41 +01:00
Code Issues Releases Wiki Activity

Disable personal Herald rules from invalid owners

Browse source 
Summary: Since mailing list rules are now "global", don't run "personal" rules
for disabled/invalid users.

Test Plan: Added a personal rule that matches every revision for a test user.
Created a revision, checked transcript, rule matched. Disabled user, updated
revision, checked transcript, rule got auto-disabled.

Reviewers: btrahan, jungejason, nh, xela

Reviewed By: btrahan

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D1517
This commit is contained in:
epriestley 2012-01-31 12:11:31 -08:00
parent 5954ae84aa
commit 8b4c057c75
3 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/applications/herald/engine/engine/HeraldEngine.php
View file

@ -225,12 +225,10 @@ class HeraldEngine {
} else if (!$conditions) {
$reason = "Rule failed automatically because it has no conditions.";
$result = false;
/* TOOD: Restore this in some form?
} else if (!is_fb_employee($rule->getAuthorPHID())) {
$reason = "Rule failed automatically because its owner is not an ".
"active employee.";
} else if ($rule->hasInvalidOwner()) {
$reason = "Rule failed automatically because its owner is invalid ".
"or disabled.";
$result = false;
*/
} else {
foreach ($conditions as $condition) {
$match = $this->doesConditionMatch($rule, $condition, $object);

31
src/applications/herald/storage/rule/HeraldRule.php
View file

@ -31,6 +31,7 @@ class HeraldRule extends HeraldDAO {
protected $configVersion = 8;
private $ruleApplied = array(); // phids for which this rule has been applied
private $invalidOwner = false;
public static function loadAllByContentTypeWithFullData(
$content_type,
@ -44,6 +45,8 @@ class HeraldRule extends HeraldDAO {
return array();
}
self::flagDisabledUserRules($rules);
$rule_ids = mpull($rules, 'getID');
$conditions = id(new HeraldCondition())->loadAllWhere(
@ -75,6 +78,30 @@ class HeraldRule extends HeraldDAO {
return $rules;
}
private static function flagDisabledUserRules(array $rules) {
$users = array();
foreach ($rules as $rule) {
if ($rule->getRuleType() != HeraldRuleTypeConfig::RULE_TYPE_PERSONAL) {
continue;
}
$users[$rule->getAuthorPHID()] = true;
}
$handles = id(new PhabricatorObjectHandleData(array_keys($users)))
->loadHandles();
foreach ($rules as $key => $rule) {
if ($rule->getRuleType() != HeraldRuleTypeConfig::RULE_TYPE_PERSONAL) {
continue;
}
$handle = $handles[$rule->getAuthorPHID()];
if (!$handle->isComplete() || $handle->isDisabled()) {
$rule->invalidOwner = true;
}
}
}
public function getRuleApplied($phid) {
if (idx($this->ruleApplied, $phid) === null) {
throw new Exception("Call setRuleApplied() before getRuleApplied()!");
@ -207,4 +234,8 @@ class HeraldRule extends HeraldDAO {
// $this->saveTransaction();
}
public function hasInvalidOwner() {
return $this->invalidOwner;
}
}

2
src/applications/herald/storage/rule/__init__.php
View file

@ -6,10 +6,12 @@
phutil_require_module('phabricator', 'applications/herald/config/ruletype');
phutil_require_module('phabricator', 'applications/herald/storage/action');
phutil_require_module('phabricator', 'applications/herald/storage/base');
phutil_require_module('phabricator', 'applications/herald/storage/condition');
phutil_require_module('phabricator', 'applications/herald/storage/edithistory');
phutil_require_module('phabricator', 'applications/phid/handle/data');
phutil_require_module('phabricator', 'storage/queryfx');
phutil_require_module('phutil', 'utils');