Page MenuHomePhabricator
Files F15335568

D8786.id.diff
No OneTemporary
Actions

D8786.id.diff
View Options

diff --git a/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php
--- a/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php
@@ -18,16 +18,27 @@
$domain = id(new PhutilURI($uri))->getDomain();
}
- return pht(
- 'Make an HTTP %s request to %s.',
- $this->formatSettingForDescription('method', 'POST'),
- $this->formatValueForDescription($domain));
+ $method = $this->formatSettingForDescription('method', 'POST');
+ $domain = $this->formatValueForDescription($domain);
+
+ if ($this->getSetting('credential')) {
+ return pht(
+ 'Make an authenticated HTTP %s request to %s.',
+ $method,
+ $domain);
+ } else {
+ return pht(
+ 'Make an HTTP %s request to %s.',
+ $method,
+ $domain);
+ }
}
public function execute(
HarbormasterBuild $build,
HarbormasterBuildTarget $build_target) {
+ $viewer = PhabricatorUser::getOmnipotentUser();
$settings = $this->getSettings();
$variables = $build_target->getVariables();
@@ -41,10 +52,21 @@
$method = nonempty(idx($settings, 'method'), 'POST');
- list($status, $body, $headers) = id(new HTTPSFuture($uri))
+ $future = id(new HTTPSFuture($uri))
->setMethod($method)
- ->setTimeout(60)
- ->resolve();
+ ->setTimeout(60);
+
+ $credential_phid = $this->getSetting('credential');
+ if ($credential_phid) {
+ $key = PassphrasePasswordKey::loadFromPHID(
+ $credential_phid,
+ $viewer);
+ $future->setHTTPBasicAuthCredentials(
+ $key->getUsernameEnvelope()->openEnvelope(),
+ $key->getPasswordEnvelope());
+ }
+
+ list($status, $body, $headers) = $future->resolve();
$log_body->append($body);
$log_body->finalize($start);
@@ -66,6 +88,14 @@
'type' => 'select',
'options' => array_fuse(array('POST', 'GET', 'PUT', 'DELETE')),
),
+ 'credential' => array(
+ 'name' => pht('Credentials'),
+ 'type' => 'credential',
+ 'credential.type'
+ => PassphraseCredentialTypePassword::CREDENTIAL_TYPE,
+ 'credential.provides'
+ => PassphraseCredentialTypePassword::PROVIDES_TYPE,
+ ),
);
}

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 9, 4:29 PM (4 d, 5 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7389776
Default Alt Text
D8786.id.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility