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

Fix an issue where handles could load with the incorrect viewer when building mail about changes to related objects

Browse source 
Summary:
See <https://phabricator.wikimedia.org/T179591>. Some time ago, all handle rendering preloaded handles: things emitted a list of PHIDs they'd need handles for, then later used only those PHIDs.

Later, we introduced `HandlePool` and lazy/on-demand handle loading. Modern transactions mostly use this to render object PHIDs.

When we build mail, many newer transactions use an on-demand load to fetch handles to render transactions. This on-demand load may use the original viewer (the acting user) instead of the correct viewer (the mail recipient): we fetch and reset handles using the correct viewer, but do not overwrite the active viewer for on-demand loading. This could cause mail to leak the titles of related objects to users who don't have permission to see them.

Instead, just reload the transactions with the correct viewer when building mail instead of playing a bunch of `setViewer()` and `clone` games. Until we're 100% on modular transactions, several pieces of the stack cache viewer or state information.

Test Plan:
  - Created task A (public) with subtask B (private).
  - Closed subtask B as a user with access to it.
  - Viewed mail sent to subscribers of task A who can not see subtask B.
    - Before change: mail discloses title of subtask B.
    - After change: mail properly labels subtask B as "Restricted Task".

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D20525
This commit is contained in:
epriestley 2019-05-19 15:55:59 -07:00
parent 06778ea550
commit b8f6248e07
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
View file

@ -3048,6 +3048,8 @@ abstract class PhabricatorApplicationTransactionEditor
// Set this explicitly before we start swapping out the effective actor. // Set this explicitly before we start swapping out the effective actor.
$this->setActingAsPHID($this->getActingAsPHID()); $this->setActingAsPHID($this->getActingAsPHID());
$xaction_phids = mpull($xactions, 'getPHID');
$messages = array(); $messages = array();
foreach ($targets as $target) { foreach ($targets as $target) {
$original_actor = $this->getActor(); $original_actor = $this->getActor();
@ -3059,10 +3061,25 @@ abstract class PhabricatorApplicationTransactionEditor
$caught = null; $caught = null;
$mail = null; $mail = null;
try { try {
// Reload handles for the new viewer. // Reload the transactions for the current viewer.
$this->loadHandles($xactions); if ($xaction_phids) {
$query = PhabricatorApplicationTransactionQuery::newQueryForObject(
$object);
$mail = $this->buildMailForTarget($object, $xactions, $target); $mail_xactions = $query
->setViewer($viewer)
->withObjectPHIDs(array($object->getPHID()))
->withPHIDs($xaction_phids)
->execute();
} else {
$mail_xactions = array();
}
// Reload handles for the current viewer. This covers older code which
// emits a list of handle PHIDs upfront.
$this->loadHandles($mail_xactions);
$mail = $this->buildMailForTarget($object, $mail_xactions, $target);
if ($mail) { if ($mail) {
if ($this->mustEncrypt) { if ($this->mustEncrypt) {