Page MenuHomePhabricator
Files F15378555

D10410.id25052.diff
No OneTemporary
Actions

D10410.id25052.diff
View Options

diff --git a/src/applications/files/query/PhabricatorFileQuery.php b/src/applications/files/query/PhabricatorFileQuery.php
--- a/src/applications/files/query/PhabricatorFileQuery.php
+++ b/src/applications/files/query/PhabricatorFileQuery.php
@@ -117,9 +117,9 @@
// First, load the edges.
$edge_type = PhabricatorEdgeConfig::TYPE_FILE_HAS_OBJECT;
- $phids = mpull($files, 'getPHID');
+ $file_phids = mpull($files, 'getPHID');
$edges = id(new PhabricatorEdgeQuery())
- ->withSourcePHIDs($phids)
+ ->withSourcePHIDs($file_phids)
->withEdgeTypes(array($edge_type))
->execute();
@@ -131,6 +131,21 @@
$object_phids[$phid] = true;
}
}
+
+ // If this file is a transform of another file, load that file too. If you
+ // can see the original file, you can see the thumbnail.
+
+ // TODO: It might be nice to put this directly on PhabricatorFile and remove
+ // the PhabricatorTransformedFile table, which would be a little simpler.
+
+ $xforms = id(new PhabricatorTransformedFile())->loadAllWhere(
+ 'transformedPHID IN (%Ls)',
+ $file_phids);
+ $xform_phids = mpull($xforms, 'getOriginalPHID', 'getTransformedPHID');
+ foreach ($xform_phids as $derived_phid => $original_phid) {
+ $object_phids[$original_phid] = true;
+ }
+
$object_phids = array_keys($object_phids);
// Now, load the objects.
@@ -156,6 +171,27 @@
$file->attachObjects($file_objects);
}
+ foreach ($files as $key => $file) {
+ $original_phid = idx($xform_phids, $file->getPHID());
+ if ($original_phid == PhabricatorPHIDConstants::PHID_VOID) {
+ // This is a special case for builtin files, which are handled
+ // oddly.
+ $original = null;
+ } else if ($original_phid) {
+ $original = idx($objects, $original_phid);
+ if (!$original) {
+ // If the viewer can't see the original file, also prevent them from
+ // seeing the transformed file.
+ $this->didRejectResult($file);
+ unset($files[$key]);
+ continue;
+ }
+ } else {
+ $original = null;
+ }
+ $file->attachOriginalFile($original);
+ }
+
return $files;
}
diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -50,6 +50,7 @@
private $objects = self::ATTACHABLE;
private $objectPHIDs = self::ATTACHABLE;
+ private $originalFile = self::ATTACHABLE;
public function getConfiguration() {
return array(
@@ -848,6 +849,15 @@
return $this;
}
+ public function getOriginalFile() {
+ return $this->assertAttached($this->originalFile);
+ }
+
+ public function attachOriginalFile(PhabricatorFile $file = null) {
+ $this->originalFile = $file;
+ return $this;
+ }
+
public function getImageHeight() {
if (!$this->isViewableImage()) {
return null;
@@ -1033,6 +1043,12 @@
switch ($capability) {
case PhabricatorPolicyCapability::CAN_VIEW:
+ // If you can see the file this file is a transform of, you can see
+ // this file.
+ if ($this->getOriginalFile()) {
+ return true;
+ }
+
// If you can see any object this file is attached to, you can see
// the file.
return (count($this->getObjects()) > 0);
@@ -1049,6 +1065,9 @@
$out[] = pht(
'Files attached to objects are visible to users who can view '.
'those objects.');
+ $out[] = pht(
+ 'Thumbnails are visible only to users who can view the original '.
+ 'file.');
break;
}

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 14, 3:12 PM (3 w, 9 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7660421
Default Alt Text
D10410.id25052.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility