mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-26 00:32:41 +01:00
6507be27ae
Summary: Ref T7148. When uploading files from the CLI with a particular view policy, we may not respect it if the file is unique (so the data isn't already known) and small (so it doesn't invoke the chunker). This is rare (and may never have happened outside of testing) because: - production dumps are always larger than the minimum chunk size; - only cluster stuff uses `setViewPolicy()`; - the default policy is "Administrators" anyway, which is safe. However, I caught it in local testing, so fix it up. Test Plan: Used `bin/host upload --file ...` to upload a small, unique file. Verified it uploaded with the correct custom view policy ("No One") rather than the default view policy ("Administrators"). Reviewers: chad Reviewed By: chad Maniphest Tasks: T7148 Differential Revision: https://secure.phabricator.com/D16408
323 lines
8.2 KiB
PHP
323 lines
8.2 KiB
PHP
<?php
|
|
|
|
/**
|
|
* Upload a list of @{class:ArcanistFileDataRef} objects over Conduit.
|
|
*
|
|
* // Create a new uploader.
|
|
* $uploader = id(new ArcanistFileUploader())
|
|
* ->setConduitClient($conduit);
|
|
*
|
|
* // Queue one or more files to be uploaded.
|
|
* $file = id(new ArcanistFileDataRef())
|
|
* ->setName('example.jpg')
|
|
* ->setPath('/path/to/example.jpg');
|
|
* $uploader->addFile($file);
|
|
*
|
|
* // Upload the files.
|
|
* $files = $uploader->uploadFiles();
|
|
*
|
|
* For details about building file references, see @{class:ArcanistFileDataRef}.
|
|
*
|
|
* @task config Configuring the Uploader
|
|
* @task add Adding Files
|
|
* @task upload Uploading Files
|
|
* @task internal Internals
|
|
*/
|
|
final class ArcanistFileUploader extends Phobject {
|
|
|
|
private $conduit;
|
|
private $files = array();
|
|
|
|
|
|
/* -( Configuring the Uploader )------------------------------------------- */
|
|
|
|
|
|
/**
|
|
* Provide a Conduit client to choose which server to upload files to.
|
|
*
|
|
* @param ConduitClient Configured client.
|
|
* @return this
|
|
* @task config
|
|
*/
|
|
public function setConduitClient(ConduitClient $conduit) {
|
|
$this->conduit = $conduit;
|
|
return $this;
|
|
}
|
|
|
|
|
|
/* -( Adding Files )------------------------------------------------------- */
|
|
|
|
|
|
/**
|
|
* Add a file to the list of files to be uploaded.
|
|
*
|
|
* You can optionally provide an explicit key which will be used to identify
|
|
* the file. After adding files, upload them with @{method:uploadFiles}.
|
|
*
|
|
* @param ArcanistFileDataRef File data to upload.
|
|
* @param null|string Optional key to use to identify this file.
|
|
* @return this
|
|
* @task add
|
|
*/
|
|
public function addFile(ArcanistFileDataRef $file, $key = null) {
|
|
|
|
if ($key === null) {
|
|
$this->files[] = $file;
|
|
} else {
|
|
if (isset($this->files[$key])) {
|
|
throw new Exception(
|
|
pht(
|
|
'Two files were added with identical explicit keys ("%s"); each '.
|
|
'explicit key must be unique.',
|
|
$key));
|
|
}
|
|
$this->files[$key] = $file;
|
|
}
|
|
|
|
return $this;
|
|
}
|
|
|
|
|
|
/* -( Uploading Files )---------------------------------------------------- */
|
|
|
|
|
|
/**
|
|
* Upload files to the server.
|
|
*
|
|
* This transfers all files which have been queued with @{method:addFiles}
|
|
* over the Conduit link configured with @{method:setConduitClient}.
|
|
*
|
|
* This method returns a map of all file data references. If references were
|
|
* added with an explicit key when @{method:addFile} was called, the key is
|
|
* retained in the result map.
|
|
*
|
|
* On return, files are either populated with a PHID (indicating a successful
|
|
* upload) or a list of errors. See @{class:ArcanistFileDataRef} for
|
|
* details.
|
|
*
|
|
* @return map<string, ArcanistFileDataRef> Files with results populated.
|
|
* @task upload
|
|
*/
|
|
public function uploadFiles() {
|
|
if (!$this->conduit) {
|
|
throw new PhutilInvalidStateException('setConduitClient');
|
|
}
|
|
|
|
$files = $this->files;
|
|
foreach ($files as $key => $file) {
|
|
try {
|
|
$file->willUpload();
|
|
} catch (Exception $ex) {
|
|
$file->didFail($ex->getMessage());
|
|
unset($files[$key]);
|
|
}
|
|
}
|
|
|
|
$conduit = $this->conduit;
|
|
$futures = array();
|
|
foreach ($files as $key => $file) {
|
|
$params = $this->getUploadParameters($file) + array(
|
|
'contentLength' => $file->getByteSize(),
|
|
'contentHash' => $file->getContentHash(),
|
|
);
|
|
|
|
$delete_after = $file->getDeleteAfterEpoch();
|
|
if ($delete_after !== null) {
|
|
$params['deleteAfterEpoch'] = $delete_after;
|
|
}
|
|
|
|
$futures[$key] = $conduit->callMethod('file.allocate', $params);
|
|
}
|
|
|
|
$iterator = id(new FutureIterator($futures))->limit(4);
|
|
$chunks = array();
|
|
foreach ($iterator as $key => $future) {
|
|
try {
|
|
$result = $future->resolve();
|
|
} catch (Exception $ex) {
|
|
// The most likely cause for a failure here is that the server does
|
|
// not support `file.allocate`. In this case, we'll try the older
|
|
// upload method below.
|
|
continue;
|
|
}
|
|
|
|
$phid = $result['filePHID'];
|
|
$file = $files[$key];
|
|
|
|
// We don't need to upload any data. Figure out why not: this can either
|
|
// be because of an error (server can't accept the data) or because the
|
|
// server already has the data.
|
|
if (!$result['upload']) {
|
|
if (!$phid) {
|
|
$file->didFail(
|
|
pht(
|
|
'Unable to upload file: the server refused to accept file '.
|
|
'"%s". This usually means it is too large.',
|
|
$file->getName()));
|
|
} else {
|
|
// These server completed the upload by creating a reference to known
|
|
// file data. We don't need to transfer the actual data, and are all
|
|
// set.
|
|
$file->setPHID($phid);
|
|
}
|
|
unset($files[$key]);
|
|
continue;
|
|
}
|
|
|
|
// The server wants us to do an upload.
|
|
if ($phid) {
|
|
$chunks[$key] = array(
|
|
'file' => $file,
|
|
'phid' => $phid,
|
|
);
|
|
}
|
|
}
|
|
|
|
foreach ($chunks as $key => $chunk) {
|
|
$file = $chunk['file'];
|
|
$phid = $chunk['phid'];
|
|
try {
|
|
$this->uploadChunks($file, $phid);
|
|
$file->setPHID($phid);
|
|
} catch (Exception $ex) {
|
|
$file->didFail(
|
|
pht(
|
|
'Unable to upload file chunks: %s',
|
|
$ex->getMessage()));
|
|
}
|
|
unset($files[$key]);
|
|
}
|
|
|
|
foreach ($files as $key => $file) {
|
|
try {
|
|
$phid = $this->uploadData($file);
|
|
$file->setPHID($phid);
|
|
} catch (Exception $ex) {
|
|
$file->didFail(
|
|
pht(
|
|
'Unable to upload file data: %s',
|
|
$ex->getMessage()));
|
|
}
|
|
unset($files[$key]);
|
|
}
|
|
|
|
foreach ($this->files as $file) {
|
|
$file->didUpload();
|
|
}
|
|
|
|
return $this->files;
|
|
}
|
|
|
|
|
|
/* -( Internals )---------------------------------------------------------- */
|
|
|
|
|
|
/**
|
|
* Upload missing chunks of a large file by calling `file.uploadchunk` over
|
|
* Conduit.
|
|
*
|
|
* @task internal
|
|
*/
|
|
private function uploadChunks(ArcanistFileDataRef $file, $file_phid) {
|
|
$conduit = $this->conduit;
|
|
|
|
$chunks = $conduit->callMethodSynchronous(
|
|
'file.querychunks',
|
|
array(
|
|
'filePHID' => $file_phid,
|
|
));
|
|
|
|
$remaining = array();
|
|
foreach ($chunks as $chunk) {
|
|
if (!$chunk['complete']) {
|
|
$remaining[] = $chunk;
|
|
}
|
|
}
|
|
|
|
$done = (count($chunks) - count($remaining));
|
|
|
|
if ($done) {
|
|
$this->writeStatus(
|
|
pht(
|
|
'Resuming upload (%s of %s chunks remain).',
|
|
phutil_count($remaining),
|
|
phutil_count($chunks)));
|
|
} else {
|
|
$this->writeStatus(
|
|
pht(
|
|
'Uploading chunks (%s chunks to upload).',
|
|
phutil_count($remaining)));
|
|
}
|
|
|
|
$progress = new PhutilConsoleProgressBar();
|
|
$progress->setTotal(count($chunks));
|
|
|
|
for ($ii = 0; $ii < $done; $ii++) {
|
|
$progress->update(1);
|
|
}
|
|
|
|
$progress->draw();
|
|
|
|
// TODO: We could do these in parallel to improve upload performance.
|
|
foreach ($remaining as $chunk) {
|
|
$data = $file->readBytes($chunk['byteStart'], $chunk['byteEnd']);
|
|
|
|
$conduit->callMethodSynchronous(
|
|
'file.uploadchunk',
|
|
array(
|
|
'filePHID' => $file_phid,
|
|
'byteStart' => $chunk['byteStart'],
|
|
'dataEncoding' => 'base64',
|
|
'data' => base64_encode($data),
|
|
));
|
|
|
|
$progress->update(1);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* Upload an entire file by calling `file.upload` over Conduit.
|
|
*
|
|
* @task internal
|
|
*/
|
|
private function uploadData(ArcanistFileDataRef $file) {
|
|
$conduit = $this->conduit;
|
|
|
|
$data = $file->readBytes(0, $file->getByteSize());
|
|
|
|
return $conduit->callMethodSynchronous(
|
|
'file.upload',
|
|
$this->getUploadParameters($file) + array(
|
|
'data_base64' => base64_encode($data),
|
|
));
|
|
}
|
|
|
|
|
|
/**
|
|
* Get common parameters for file uploads.
|
|
*/
|
|
private function getUploadParameters(ArcanistFileDataRef $file) {
|
|
$params = array(
|
|
'name' => $file->getName(),
|
|
);
|
|
|
|
$view_policy = $file->getViewPolicy();
|
|
if ($view_policy !== null) {
|
|
$params['viewPolicy'] = $view_policy;
|
|
}
|
|
|
|
return $params;
|
|
}
|
|
|
|
|
|
/**
|
|
* Write a status message.
|
|
*
|
|
* @task internal
|
|
*/
|
|
private function writeStatus($message) {
|
|
fwrite(STDERR, $message."\n");
|
|
}
|
|
|
|
}
|