Page MenuHomePhorge
Files F2894100

No OneTemporary
Actions

View Options

diff --git a/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php
index c9f0b9dc9e..1830f503f2 100644
--- a/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php
@@ -1,87 +1,95 @@
<?php
final class HarbormasterHTTPRequestBuildStepImplementation
extends VariableBuildStepImplementation {
public function getName() {
return pht('Make HTTP Request');
}
public function getGenericDescription() {
return pht('Make an HTTP request.');
}
public function getDescription() {
$settings = $this->getSettings();
$uri = new PhutilURI($settings['uri']);
$domain = $uri->getDomain();
return pht('Make an HTTP %s request to %s', $settings['method'], $domain);
}
public function execute(
HarbormasterBuild $build,
HarbormasterBuildTarget $build_target) {
$settings = $this->getSettings();
$variables = $build_target->getVariables();
$uri = $this->mergeVariables(
'vurisprintf',
$settings['uri'],
$variables);
$log_body = $build->createLog($build_target, $uri, 'http-body');
$start = $log_body->start();
$method = 'POST';
if ($settings['method'] !== '') {
$method = $settings['method'];
}
list($status, $body, $headers) = id(new HTTPSFuture($uri))
->setMethod($method)
->setTimeout(60)
->resolve();
$log_body->append($body);
$log_body->finalize($start);
if ($status->getStatusCode() != 200) {
$build->setBuildStatus(HarbormasterBuild::STATUS_FAILED);
}
}
public function validateSettings() {
$settings = $this->getSettings();
if ($settings['uri'] === null || !is_string($settings['uri'])) {
return false;
}
- if ($settings['method'] === null || $settings['method'] != '' &&
- !in_array ($settings['method'],
- array('GET', 'PUT', 'DELETE', 'POST'))) {
- return false;
+ $methods = array(
+ 'GET' => true,
+ 'POST' => true,
+ 'DELETE' => true,
+ 'PUT' => true,
+ );
+
+ $method = idx($settings, 'method');
+ if (strlen($method)) {
+ if (empty($methods[$method])) {
+ return false;
+ }
}
return true;
}
public function getSettingDefinitions() {
return array(
'uri' => array(
'name' => 'URI',
'description' => pht('The URI to request.'),
'type' => BuildStepImplementation::SETTING_TYPE_STRING,
),
'method' => array(
'name' => 'Method',
'description' =>
pht('Request type. Should be GET, POST, PUT, or DELETE.'),
'type' => BuildStepImplementation::SETTING_TYPE_STRING,
),
);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Sun, Jan 19, 19:23 (1 d, 20 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1127932
Default Alt Text
(2 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0