View Options

	diff --git a/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php b/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
	index 70b023f2e2..10cc6b904e 100644
	--- a/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
	+++ b/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
	@@ -1,55 +1,72 @@
	<?php

	final class DrydockSSHCommandInterface extends DrydockCommandInterface {

	private $passphraseSSHKey;
	+ private $connectTimeout;

	private function openCredentialsIfNotOpen() {
	if ($this->passphraseSSHKey !== null) {
	return;
	}

	$credential = id(new PassphraseCredentialQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withIDs(array($this->getConfig('credential')))
	->needSecrets(true)
	->executeOne();

	if ($credential->getProvidesType() !==
	PassphraseCredentialTypeSSHPrivateKey::PROVIDES_TYPE) {
	throw new Exception('Only private key credentials are supported.');
	}

	$this->passphraseSSHKey = PassphraseSSHKey::loadFromPHID(
	$credential->getPHID(),
	PhabricatorUser::getOmnipotentUser());
	}

	+ public function setConnectTimeout($timeout) {
	+ $this->connectTimeout = $timeout;
	+ return $this;
	+ }
	+
	public function getExecFuture($command) {
	$this->openCredentialsIfNotOpen();

	$argv = func_get_args();

	// This assumes there's a UNIX shell living at the other
	// end of the connection, which isn't the case for Windows machines.
	if ($this->getConfig('platform') !== 'windows') {
	$argv = $this->applyWorkingDirectoryToArgv($argv);
	}

	$full_command = call_user_func_array('csprintf', $argv);

	if ($this->getConfig('platform') === 'windows') {
	// On Windows platforms we need to execute cmd.exe explicitly since
	// most commands are not really executables.
	$full_command = 'C:\\Windows\\system32\\cmd.exe /C '.$full_command;
	}

	+ $command_timeout = '';
	+ if ($this->connectTimeout !== null) {
	+ $command_timeout = csprintf(
	+ '-o %s',
	+ 'ConnectTimeout='.$this->connectTimeout);
	+ }
	+
	return new ExecFuture(
	- 'ssh -o StrictHostKeyChecking=no -p %s -i %P %P@%s -- %s',
	+ 'ssh '.
	+ '-o StrictHostKeyChecking=no '.
	+ '-o BatchMode=yes '.
	+ '%C -p %s -i %P %P@%s -- %s',
	+ $command_timeout,
	$this->getConfig('port'),
	$this->passphraseSSHKey->getKeyfileEnvelope(),
	$this->passphraseSSHKey->getUsernameEnvelope(),
	$this->getConfig('host'),
	$full_command);
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Aug 14, 5:44 AM (2 d, 11 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 202198
Default Alt Text: (2 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions