Page MenuHomePhabricator
Files F15428348

D7582.id17115.diff
No OneTemporary
Actions

D7582.id17115.diff
View Options

Index: resources/sql/patches/20131112.buildartifact.sql
===================================================================
--- /dev/null
+++ resources/sql/patches/20131112.buildartifact.sql
@@ -0,0 +1,5 @@
+ALTER TABLE {$NAMESPACE}_harbormaster.harbormaster_buildartifact
+ADD COLUMN buildPHID VARCHAR(64) NOT NULL COLLATE utf8_bin;
+
+ALTER TABLE {$NAMESPACE}_harbormaster.harbormaster_buildartifact
+ADD COLUMN buildStepPHID VARCHAR(64) NOT NULL COLLATE utf8_bin;
Index: src/__phutil_library_map__.php
===================================================================
--- src/__phutil_library_map__.php
+++ src/__phutil_library_map__.php
@@ -660,6 +660,7 @@
'FileReplyHandler' => 'applications/files/mail/FileReplyHandler.php',
'HarbormasterBuild' => 'applications/harbormaster/storage/build/HarbormasterBuild.php',
'HarbormasterBuildArtifact' => 'applications/harbormaster/storage/build/HarbormasterBuildArtifact.php',
+ 'HarbormasterBuildArtifactQuery' => 'applications/harbormaster/query/HarbormasterBuildArtifactQuery.php',
'HarbormasterBuildCancelController' => 'applications/harbormaster/controller/HarbormasterBuildCancelController.php',
'HarbormasterBuildItem' => 'applications/harbormaster/storage/build/HarbormasterBuildItem.php',
'HarbormasterBuildItemQuery' => 'applications/harbormaster/query/HarbormasterBuildItemQuery.php',
@@ -681,7 +682,6 @@
'HarbormasterBuildWorker' => 'applications/harbormaster/worker/HarbormasterBuildWorker.php',
'HarbormasterBuildable' => 'applications/harbormaster/storage/HarbormasterBuildable.php',
'HarbormasterBuildableApplyController' => 'applications/harbormaster/controller/HarbormasterBuildableApplyController.php',
- 'HarbormasterBuildableArtifactQuery' => 'applications/harbormaster/query/HarbormasterBuildableArtifactQuery.php',
'HarbormasterBuildableEditController' => 'applications/harbormaster/controller/HarbormasterBuildableEditController.php',
'HarbormasterBuildableListController' => 'applications/harbormaster/controller/HarbormasterBuildableListController.php',
'HarbormasterBuildableQuery' => 'applications/harbormaster/query/HarbormasterBuildableQuery.php',
@@ -2279,6 +2279,7 @@
'SleepBuildStepImplementation' => 'applications/harbormaster/step/SleepBuildStepImplementation.php',
'SlowvoteEmbedView' => 'applications/slowvote/view/SlowvoteEmbedView.php',
'SlowvoteRemarkupRule' => 'applications/slowvote/remarkup/SlowvoteRemarkupRule.php',
+ 'UploadArtifactBuildStepImplementation' => 'applications/harbormaster/step/UploadArtifactBuildStepImplementation.php',
'VariableBuildStepImplementation' => 'applications/harbormaster/step/VariableBuildStepImplementation.php',
),
'function' =>
@@ -2951,6 +2952,7 @@
0 => 'HarbormasterDAO',
1 => 'PhabricatorPolicyInterface',
),
+ 'HarbormasterBuildArtifactQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
'HarbormasterBuildCancelController' => 'HarbormasterController',
'HarbormasterBuildItem' => 'HarbormasterDAO',
'HarbormasterBuildItemQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
@@ -2989,7 +2991,6 @@
1 => 'PhabricatorPolicyInterface',
),
'HarbormasterBuildableApplyController' => 'HarbormasterController',
- 'HarbormasterBuildableArtifactQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
'HarbormasterBuildableEditController' => 'HarbormasterController',
'HarbormasterBuildableListController' =>
array(
@@ -4835,6 +4836,7 @@
'SleepBuildStepImplementation' => 'BuildStepImplementation',
'SlowvoteEmbedView' => 'AphrontView',
'SlowvoteRemarkupRule' => 'PhabricatorRemarkupRuleObject',
+ 'UploadArtifactBuildStepImplementation' => 'VariableBuildStepImplementation',
'VariableBuildStepImplementation' => 'BuildStepImplementation',
),
));
Index: src/applications/harbormaster/controller/HarbormasterBuildViewController.php
===================================================================
--- src/applications/harbormaster/controller/HarbormasterBuildViewController.php
+++ src/applications/harbormaster/controller/HarbormasterBuildViewController.php
@@ -41,13 +41,12 @@
id(new PhabricatorCrumbView())
->setName($title));
- $logs = $this->buildLog($build);
-
return $this->buildApplicationPage(
array(
$crumbs,
$box,
- $logs
+ $this->buildArtifacts($build),
+ $this->buildLog($build)
),
array(
'title' => $title,
@@ -55,6 +54,32 @@
));
}
+ private function buildArtifacts(HarbormasterBuild $build) {
+ $request = $this->getRequest();
+ $viewer = $request->getUser();
+
+ $artifacts = id(new HarbormasterBuildArtifactQuery())
+ ->setViewer($viewer)
+ ->withBuildPHIDs(array($build->getPHID()))
+ ->execute();
+
+ $list = new PHUIObjectItemListView();
+
+ foreach ($artifacts as $artifact) {
+ $list->addItem($artifact->getObjectItemView($viewer));
+ }
+
+ $header = id(new PHUIHeaderView())
+ ->setHeader(pht('Build Artifacts'))
+ ->setUser($viewer);
+
+ $box = id(new PHUIObjectBoxView())
+ ->setHeader($header)
+ ->setForm($list);
+
+ return $box;
+ }
+
private function buildLog(HarbormasterBuild $build) {
$request = $this->getRequest();
$viewer = $request->getUser();
Index: src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php
===================================================================
--- src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php
+++ src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php
@@ -1,10 +1,12 @@
<?php
-final class HarbormasterBuildableArtifactQuery
+final class HarbormasterBuildArtifactQuery
extends PhabricatorCursorPagedPolicyAwareQuery {
private $ids;
private $buildablePHIDs;
+ private $buildPHIDs;
+ private $buildStepPHIDs;
private $artifactTypes;
private $artifactKeys;
@@ -18,6 +20,16 @@
return $this;
}
+ public function withBuildPHIDs(array $build_phids) {
+ $this->buildPHIDs = $build_phids;
+ return $this;
+ }
+
+ public function withBuildStepPHIDs(array $buildstep_phids) {
+ $this->buildStepPHIDs = $buildstep_phids;
+ return $this;
+ }
+
public function withArtifactTypes(array $artifact_types) {
$this->artifactTypes = $artifact_types;
return $this;
@@ -85,6 +97,20 @@
$this->buildablePHIDs);
}
+ if ($this->buildPHIDs) {
+ $where[] = qsprintf(
+ $conn_r,
+ 'buildPHID IN (%Ls)',
+ $this->buildPHIDs);
+ }
+
+ if ($this->buildStepPHIDs) {
+ $where[] = qsprintf(
+ $conn_r,
+ 'buildStepPHID IN (%Ls)',
+ $this->buildStepPHIDs);
+ }
+
if ($this->artifactTypes) {
$where[] = qsprintf(
$conn_r,
Index: src/applications/harbormaster/step/UploadArtifactBuildStepImplementation.php
===================================================================
--- /dev/null
+++ src/applications/harbormaster/step/UploadArtifactBuildStepImplementation.php
@@ -0,0 +1,198 @@
+<?php
+
+final class UploadArtifactBuildStepImplementation
+ extends VariableBuildStepImplementation {
+
+ public function getName() {
+ return pht('Upload Artifact from Build');
+ }
+
+ public function getGenericDescription() {
+ return pht('Upload an artifact from another machine to Phabricator.');
+ }
+
+ public function getDescription() {
+ $settings = $this->getSettings();
+
+ return pht(
+ 'Upload artifact located at \'%s\' on \'%s\'.',
+ $settings['path'],
+ $settings['sshhost']);
+ }
+
+ public function execute(
+ HarbormasterBuild $build,
+ HarbormasterBuildStep $build_step) {
+
+ $settings = $this->getSettings();
+ $variables = $this->retrieveVariablesFromBuild($build);
+
+ $path = $this->mergeVariables(
+ 'vsprintf',
+ $settings['path'],
+ $variables);
+
+ // TODO: We should also offer SCP in the interface, but FreeSSHD / Windows
+ // doesn't support SCP so for now we'll stick with SFTP.
+ $command = 'sftp';
+
+ // Store the content in a unique, temporary file.
+ $target = new TempFile();
+
+ $future = null;
+ if (empty($settings['sshkey'])) {
+ $future = new ExecFuture(
+ '%C -P %s %s',
+ $command,
+ $settings['sshport'],
+ $settings['sshuser'].'@'.$settings['sshhost']);
+ } else {
+ $future = new ExecFuture(
+ '%C -o "StrictHostKeyChecking no" -P %s %s',
+ $command,
+ $settings['sshport'],
+ $settings['sshkey'],
+ $settings['sshuser'].'@'.$settings['sshhost']);
+ }
+
+ $log_stdout = $build->createLog($build_step, "sftp-upload", "stdout");
+ $log_stderr = $build->createLog($build_step, "sftp-upload", "stderr");
+
+ $start_stdout = $log_stdout->start();
+ $start_stderr = $log_stderr->start();
+
+ // Write out the get command.
+ // TODO: What to do with scp? Invocation is probably different anyway...
+ $future->write(csprintf("get %s %s", $path, $target));
+
+ // Read the next amount of available output every second.
+ while (!$future->isReady()) {
+ list($stdout, $stderr) = $future->read();
+ $log_stdout->append($stdout);
+ $log_stderr->append($stderr);
+ $future->discardBuffers();
+
+ // Check to see if we have moved from a "Building" status. This
+ // can occur if the user cancels the build, in which case we want
+ // to terminate whatever we're doing and return as quickly as possible.
+ if ($build->checkForCancellation()) {
+ $log_stdout->finalize($start_stdout);
+ $log_stderr->finalize($start_stderr);
+ $future->resolveKill();
+ return;
+ }
+
+ // Wait one second before querying for more data.
+ sleep(1);
+ }
+
+ // Get the return value so we can log that as well.
+ list($err) = $future->resolve();
+
+ // Retrieve the last few bits of information.
+ list($stdout, $stderr) = $future->read();
+ $log_stdout->append($stdout);
+ $log_stderr->append($stderr);
+ $future->discardBuffers();
+
+ $log_stdout->finalize($start_stdout);
+ $log_stderr->finalize($start_stderr);
+
+ if ($err) {
+ $build->setBuildStatus(HarbormasterBuild::STATUS_FAILED);
+ return;
+ }
+
+ if (!file_exists($target)) {
+ $build->setBuildStatus(HarbormasterBuild::STATUS_FAILED);
+ return;
+ }
+
+ // If we didn't have an error, create an artifact for this build by creating
+ // a new file from the target location.
+ $data = Filesystem::readFile($target);
+ $file = PhabricatorFile::newFromFileData($data);
+ $file->setName($settings['name']);
+ $file->save();
+
+ // Insert the artifact record.
+ $artifact = new HarbormasterBuildArtifact();
+ $artifact->setBuildablePHID($build->getBuildablePHID());
+ $artifact->setBuildPHID($build->getPHID());
+ $artifact->setBuildStepPHID($build_step->getPHID());
+ $artifact->setArtifactType(HarbormasterBuildArtifact::TYPE_FILE);
+ $artifact->setArtifactKey(uniqid(rand(), true));
+ $artifact->setArtifactData(array(
+ 'filePHID' => $file->getPHID()));
+ $artifact->save();
+ }
+
+ public function validateSettings() {
+ $settings = $this->getSettings();
+
+ if ($settings['path'] === null || !is_string($settings['path'])) {
+ return false;
+ }
+ if ($settings['name'] === null || !is_string($settings['name'])) {
+ return false;
+ }
+ if ($settings['sshhost'] === null || !is_string($settings['sshhost'])) {
+ return false;
+ }
+ if ($settings['sshuser'] === null || !is_string($settings['sshuser'])) {
+ return false;
+ }
+ if ($settings['sshkey'] === null || !is_string($settings['sshkey'])) {
+ return false;
+ }
+ if ($settings['sshport'] === null || !is_int($settings['sshport']) ||
+ $settings['sshport'] <= 0 || $settings['sshport'] >= 65536) {
+ return false;
+ }
+
+ $whitelist = PhabricatorEnv::getEnvConfig(
+ 'harbormaster.temporary.hosts.whitelist');
+ if (!in_array($settings['sshhost'], $whitelist)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ public function getSettingDefinitions() {
+ return array(
+ 'path' => array(
+ 'name' => 'Path',
+ 'description' =>
+ 'The path of the file that should be retrieved. Note that on '.
+ 'Windows machines running FreeSSHD, this path will be relative '.
+ 'to the SFTP root path (configured under the SFTP tab). You can '.
+ 'not specify an absolute path for Windows machines.',
+ 'type' => BuildStepImplementation::SETTING_TYPE_STRING),
+ 'name' => array(
+ 'name' => 'Local Name',
+ 'description' =>
+ 'The name for the file when it is stored in Phabricator.',
+ 'type' => BuildStepImplementation::SETTING_TYPE_STRING),
+ 'sshhost' => array(
+ 'name' => 'SSH Host',
+ 'description' => 'The SSH host that the command will be run on.',
+ 'type' => BuildStepImplementation::SETTING_TYPE_STRING),
+ 'sshport' => array(
+ 'name' => 'SSH Port',
+ 'description' => 'The SSH port to connect to.',
+ 'type' => BuildStepImplementation::SETTING_TYPE_INTEGER,
+ 'default' => 22), // TODO: 'default' doesn't do anything yet..
+ 'sshuser' => array(
+ 'name' => 'SSH Username',
+ 'description' => 'The SSH username to use.',
+ 'type' => BuildStepImplementation::SETTING_TYPE_STRING),
+ 'sshkey' => array(
+ 'name' => 'SSH Identity File',
+ 'description' =>
+ 'The path to the SSH identity file (private key) '.
+ 'on the local web server.',
+ 'type' => BuildStepImplementation::SETTING_TYPE_STRING));
+ }
+
+}
Index: src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
===================================================================
--- src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
+++ src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
@@ -4,11 +4,15 @@
implements PhabricatorPolicyInterface {
protected $buildablePHID;
+ protected $buildPHID;
+ protected $buildStepPHID;
protected $artifactType;
protected $artifactIndex;
protected $artifactKey;
protected $artifactData = array();
+ const TYPE_FILE = 'file';
+
public function getConfiguration() {
return array(
self::CONFIG_SERIALIZATION => array(
@@ -32,6 +36,23 @@
return $this;
}
+ public function getObjectItemView(PhabricatorUser $viewer) {
+ $data = $this->getArtifactData();
+ switch ($this->getArtifactType()) {
+ case self::TYPE_FILE:
+ $handle = id(new PhabricatorHandleQuery())
+ ->setViewer($viewer)
+ ->withPHIDs($data)
+ ->executeOne();
+
+ return id(new PHUIObjectItemView())
+ ->setObjectName(pht('File'))
+ ->setHeader($handle->getFullName())
+ ->setHref($handle->getURI());
+ default:
+ return null;
+ }
+ }
/* -( PhabricatorPolicyInterface )----------------------------------------- */
Index: src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
===================================================================
--- src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
+++ src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
@@ -1756,6 +1756,10 @@
'type' => 'php',
'name' => $this->getPatchPath('20131112.userverified.2.mig.php'),
),
+ '20131112.buildartifact.sql' => array(
+ 'type' => 'sql',
+ 'name' => $this->getPatchPath('20131112.buildartifact.sql'),
+ ),
);
}
}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 24, 7:46 PM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7703927
Default Alt Text
D7582.id17115.diff (15 KB)

Event Timeline

Phabricator · Built by Phacility