mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-03 04:02:43 +01:00
45b386596e
Summary: Ref T11357. When creating a file, callers can currently specify a `ttl`. However, it isn't unambiguous what you're supposed to pass, and some callers get it wrong. For example, to mean "this file expires in 60 minutes", you might pass either of these: - `time() + phutil_units('60 minutes in seconds')` - `phutil_units('60 minutes in seconds')` The former means "60 minutes from now". The latter means "1 AM, January 1, 1970". In practice, because the GC normally runs only once every four hours (at least, until recently), and all the bad TTLs are cases where files are normally accessed immediately, these 1970 TTLs didn't cause any real problems. Split `ttl` into `ttl.relative` and `ttl.absolute`, and make sure the values are sane. Then correct all callers, and simplify out the `time()` calls where possible to make switching to `PhabricatorTime` easier. Test Plan: - Generated an SSH keypair. - Viewed a changeset. - Viewed a raw diff. - Viewed a commit's file data. - Viewed a temporary file's details, saw expiration date and relative time. - Ran unit tests. - (Didn't really test Phragment.) Reviewers: chad Reviewed By: chad Subscribers: hach-que Maniphest Tasks: T11357 Differential Revision: https://secure.phabricator.com/D17616
97 lines
2.5 KiB
PHP
97 lines
2.5 KiB
PHP
<?php
|
|
|
|
final class PhragmentPatchController extends PhragmentController {
|
|
|
|
public function shouldAllowPublic() {
|
|
return true;
|
|
}
|
|
|
|
public function handleRequest(AphrontRequest $request) {
|
|
$viewer = $request->getViewer();
|
|
$aid = $request->getURIData('aid');
|
|
$bid = $request->getURIData('bid');
|
|
|
|
// If "aid" is "x", then it means the user wants to generate
|
|
// a patch of an empty file to the version specified by "bid".
|
|
|
|
$ids = array($aid, $bid);
|
|
if ($aid === 'x') {
|
|
$ids = array($bid);
|
|
}
|
|
|
|
$versions = id(new PhragmentFragmentVersionQuery())
|
|
->setViewer($viewer)
|
|
->withIDs($ids)
|
|
->execute();
|
|
|
|
$version_a = null;
|
|
if ($aid !== 'x') {
|
|
$version_a = idx($versions, $aid, null);
|
|
if ($version_a === null) {
|
|
return new Aphront404Response();
|
|
}
|
|
}
|
|
|
|
$version_b = idx($versions, $bid, null);
|
|
if ($version_b === null) {
|
|
return new Aphront404Response();
|
|
}
|
|
|
|
$file_phids = array();
|
|
if ($version_a !== null) {
|
|
$file_phids[] = $version_a->getFilePHID();
|
|
}
|
|
$file_phids[] = $version_b->getFilePHID();
|
|
|
|
$files = id(new PhabricatorFileQuery())
|
|
->setViewer($viewer)
|
|
->withPHIDs($file_phids)
|
|
->execute();
|
|
$files = mpull($files, null, 'getPHID');
|
|
|
|
$file_a = null;
|
|
if ($version_a != null) {
|
|
$file_a = idx($files, $version_a->getFilePHID(), null);
|
|
}
|
|
$file_b = idx($files, $version_b->getFilePHID(), null);
|
|
|
|
$patch = PhragmentPatchUtil::calculatePatch($file_a, $file_b);
|
|
|
|
if ($patch === null) {
|
|
// There are no differences between the two files, so we output
|
|
// an empty patch.
|
|
$patch = '';
|
|
}
|
|
|
|
$a_sequence = 'x';
|
|
if ($version_a !== null) {
|
|
$a_sequence = $version_a->getSequence();
|
|
}
|
|
|
|
$name =
|
|
$version_b->getFragment()->getName().'.'.
|
|
$a_sequence.'.'.
|
|
$version_b->getSequence().'.patch';
|
|
|
|
$return = $version_b->getURI();
|
|
if ($request->getExists('return')) {
|
|
$return = $request->getStr('return');
|
|
}
|
|
|
|
$result = PhabricatorFile::buildFromFileDataOrHash(
|
|
$patch,
|
|
array(
|
|
'name' => $name,
|
|
'mime-type' => 'text/plain',
|
|
'ttl.relative' => phutil_units('24 hours in seconds'),
|
|
));
|
|
|
|
$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
|
|
$result->attachToObject($version_b->getFragmentPHID());
|
|
unset($unguarded);
|
|
|
|
return id(new AphrontRedirectResponse())
|
|
->setURI($result->getDownloadURI($return));
|
|
}
|
|
|
|
}
|