No OneTemporary
Actions

Size

3 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/scripts/ssh/ssh-connect.php b/scripts/ssh/ssh-connect.php
	index fac8d19130..d42a542140 100755
	--- a/scripts/ssh/ssh-connect.php
	+++ b/scripts/ssh/ssh-connect.php
	@@ -1,96 +1,111 @@
	#!/usr/bin/env php
	<?php

	// This is a wrapper script for Git, Mercurial, and Subversion. It primarily
	// serves to inject "-o StrictHostKeyChecking=no" into the SSH arguments.

	+// In some cases, Subversion sends us SIGTERM. If we don't catch the signal and
	+// react to it, we won't run object destructors by default and thus won't clean
	+// up temporary files. Declare ticks so we can install a signal handler.
	+declare(ticks=1);
	+
	$root = dirname(dirname(dirname(__FILE__)));
	require_once $root.'/scripts/__init_script__.php';

	// Contrary to the documentation, Git may pass a "-p" flag. If it does, respect
	// it and move it before the "--" argument.
	$args = new PhutilArgumentParser($argv);
	$args->parsePartial(
	array(
	array(
	'name' => 'port',
	'short' => 'p',
	'param' => pht('port'),
	'help' => pht('Port number to connect to.'),
	),
	));
	$unconsumed_argv = $args->getUnconsumedArgumentVector();

	+if (function_exists('pcntl_signal')) {
	+ pcntl_signal(SIGTERM, 'ssh_connect_signal');
	+}
	+
	+function ssh_connect_signal($signo) {
	+ // This is just letting destructors fire. In particular, we want to clean
	+ // up any temporary files we wrote. See T10547.
	+ exit(128 + $signo);
	+}
	+
	$pattern = array();
	$arguments = array();

	$pattern[] = 'ssh';

	$pattern[] = '-o';
	$pattern[] = 'StrictHostKeyChecking=no';

	// This prevents "known host" failures, and covers for issues where HOME is set
	// to something unusual.
	$pattern[] = '-o';
	$pattern[] = 'UserKnownHostsFile=/dev/null';

	$as_device = getenv('PHABRICATOR_AS_DEVICE');
	$credential_phid = getenv('PHABRICATOR_CREDENTIAL');

	if ($as_device) {
	$device = AlmanacKeys::getLiveDevice();
	if (!$device) {
	throw new Exception(
	pht(
	'Attempting to create an SSH connection that authenticates with '.
	'the current device, but this host is not configured as a cluster '.
	'device.'));
	}

	if ($credential_phid) {
	throw new Exception(
	pht(
	'Attempting to proxy an SSH connection that authenticates with '.
	'both the current device and a specific credential. These options '.
	'are mutually exclusive.'));
	}
	}

	if ($credential_phid) {
	$viewer = PhabricatorUser::getOmnipotentUser();
	$key = PassphraseSSHKey::loadFromPHID($credential_phid, $viewer);

	$pattern[] = '-l %P';
	$arguments[] = $key->getUsernameEnvelope();
	$pattern[] = '-i %P';
	$arguments[] = $key->getKeyfileEnvelope();
	}

	if ($as_device) {
	$pattern[] = '-l %R';
	$arguments[] = AlmanacKeys::getClusterSSHUser();
	$pattern[] = '-i %R';
	$arguments[] = AlmanacKeys::getKeyPath('device.key');
	}

	$port = $args->getArg('port');
	if ($port) {
	$pattern[] = '-p %d';
	$arguments[] = $port;
	}

	$pattern[] = '--';

	$passthru_args = $unconsumed_argv;
	foreach ($passthru_args as $passthru_arg) {
	$pattern[] = '%s';
	$arguments[] = $passthru_arg;
	}

	$pattern = implode(' ', $pattern);
	array_unshift($arguments, $pattern);

	$err = newv('PhutilExecPassthru', $arguments)
	->execute();

	exit($err);

File Metadata

Mime Type: text/x-diff
Expires: Mon, Mar 17, 4:11 AM (1 d, 18 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 72254
Default Alt Text: (3 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions