Page MenuHomePhabricator

D15650.diff
No OneTemporary

D15650.diff

diff --git a/src/applications/files/controller/PhabricatorFileDataController.php b/src/applications/files/controller/PhabricatorFileDataController.php
--- a/src/applications/files/controller/PhabricatorFileDataController.php
+++ b/src/applications/files/controller/PhabricatorFileDataController.php
@@ -119,22 +119,46 @@
return new Aphront404Response();
}
+ // We may be on the CDN domain, so we need to use a fully-qualified URI
+ // here to make sure we end up back on the main domain.
+ $info_uri = PhabricatorEnv::getURI($file->getInfoURI());
+
+
if (!$file->validateSecretKey($this->key)) {
- return new Aphront403Response();
+ $dialog = $this->newDialog()
+ ->setTitle(pht('Invalid Authorization'))
+ ->appendParagraph(
+ pht(
+ 'The link you followed to access this file is no longer '.
+ 'valid. The visibility of the file may have changed after '.
+ 'the link was generated.'))
+ ->appendParagraph(
+ pht(
+ 'You can continue to the file detail page to get more '.
+ 'information and attempt to access the file.'))
+ ->addCancelButton($info_uri, pht('Continue'));
+
+ return id(new AphrontDialogResponse())
+ ->setDialog($dialog)
+ ->setHTTPResponseCode(404);
}
if ($file->getIsPartial()) {
- // We may be on the CDN domain, so we need to use a fully-qualified URI
- // here to make sure we end up back on the main domain.
- $info_uri = PhabricatorEnv::getURI($file->getInfoURI());
-
- return $this->newDialog()
+ $dialog = $this->newDialog()
->setTitle(pht('Partial Upload'))
->appendParagraph(
pht(
'This file has only been partially uploaded. It must be '.
'uploaded completely before you can download it.'))
- ->addCancelButton($info_uri);
+ ->appendParagraph(
+ pht(
+ 'You can continue to the file detail page to monitor the '.
+ 'upload progress of the file.'))
+ ->addCancelButton($info_uri, pht('Continue'));
+
+ return id(new AphrontDialogResponse())
+ ->setDialog($dialog)
+ ->setHTTPResponseCode(404);
}
$this->file = $file;

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 25, 9:55 PM (11 h, 39 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6927724
Default Alt Text
D15650.diff (2 KB)

Event Timeline