From 6f879559707c57006a1a95d839e2e2e6c64a5ff6 Mon Sep 17 00:00:00 2001 From: epriestley Date: Thu, 16 Mar 2017 09:06:22 -0700 Subject: [PATCH] (stable) Correct an issue where "View Raw File" in Differential generated a file with overbroad permissions Summary: Via HackerOne. When you view a raw file in Differential, we currently generate a permanent file with default permissions. This may be incorrect: default permissions may be broader than the diff's permissions. The other three methods of downloading/viewing raw files ("Download" in Diffusion and Differential, "View Raw" in Diffusion and Differential) already apply policies correctly and generate temporary files. However, this workflow was missed when other workflows were updated. Beyond updating the workflow, delete any files we've generated in the past. This wipes the slate clean on any security issues and frees up a little disk space. Test Plan: - Ran migration script, saw existing files get purged. - Did "View Raw File", got a new file. - Verified that the file was temporary and properly attached to the diff, with "NO ONE" permissions. - Double-checked that Diffusion already runs policy logic correctly and applies appropriate policies. - Double-checked that "Download Raw Diff" in Differential already runs policy logic correctly. - Double-chekced that "Download Raw Diff" in Diffusion already runs policy logic correctly. Reviewers: chad Reviewed By: chad Differential Revision: https://secure.phabricator.com/D17504 --- .../sql/autopatches/20170316.rawfiles.01.php | 53 +++++++++++++++++++ .../DifferentialChangesetViewController.php | 8 ++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 resources/sql/autopatches/20170316.rawfiles.01.php diff --git a/resources/sql/autopatches/20170316.rawfiles.01.php b/resources/sql/autopatches/20170316.rawfiles.01.php new file mode 100644 index 0000000000..df2fa93c9a --- /dev/null +++ b/resources/sql/autopatches/20170316.rawfiles.01.php @@ -0,0 +1,53 @@ +establishConnection('w'); +$viewer = PhabricatorUser::getOmnipotentUser(); + +$iterator = new LiskRawMigrationIterator( + $conn, + $table->getTableName()); + +echo tsprintf( + "%s\n", + pht('Purging old raw changeset file caches...')); + +$keys = array( + 'raw:new:phid', + 'raw:old:phid', +); + +foreach ($iterator as $changeset) { + try { + $metadata = phutil_json_decode($changeset['metadata']); + + $phids = array(); + foreach ($keys as $key) { + if (isset($metadata[$key])) { + $phids[] = $metadata[$key]; + } + } + + foreach ($phids as $phid) { + $file = id(new PhabricatorFileQuery()) + ->setViewer($viewer) + ->withPHIDs(array($phid)) + ->executeOne(); + if ($file) { + id(new PhabricatorDestructionEngine()) + ->destroyObject($file); + } + } + + // NOTE: We don't bother updating the changeset record itself: we already + // regenerate the cache properly if the stored value isn't valid. + + } catch (Exception $ex) { + // Just move on if we run into trouble. + } +} diff --git a/src/applications/differential/controller/DifferentialChangesetViewController.php b/src/applications/differential/controller/DifferentialChangesetViewController.php index ff0da2f821..b5bfe7464d 100644 --- a/src/applications/differential/controller/DifferentialChangesetViewController.php +++ b/src/applications/differential/controller/DifferentialChangesetViewController.php @@ -350,13 +350,19 @@ final class DifferentialChangesetViewController extends DifferentialController { $data = $changeset->makeOldFile(); } + $diff = $changeset->getDiff(); + $file = PhabricatorFile::newFromFileData( $data, array( - 'name' => $changeset->getFilename(), + 'name' => $changeset->getFilename(), 'mime-type' => 'text/plain', + 'ttl' => phutil_units('24 hours in seconds'), + 'viewPolicy' => PhabricatorPolicies::POLICY_NOONE, )); + $file->attachToObject($diff->getPHID()); + $metadata[$key] = $file->getPHID(); $changeset->setMetadata($metadata); $changeset->save();