mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-25 16:22:43 +01:00
In "bin/ssh-auth", cache a structure instead of a flat file because paths may change at runtime
Summary: Fixes T12397. Ref T13164. See PHI801. Several installs have hit various use cases where the path on disk where Phabricator lives changes at runtime. Currently, `bin/ssh-auth` caches a flat file which includes the path to `bin/ssh-exec`, so this may fall out of date if `phabricator/` moves. These use cases have varying strengths of legitimacy, but "we're migrating to a new set of hosts and the pool is half old machines and half new machines" seems reasonably compelling and not a problem entirely of one's own making. Test Plan: - Compared output on `master` to output after change, found them byte-for-byte identical. - Moved `phabricator/` to `phabricator2/`, ran `bin/ssh-auth`, got updated output. - Added a new SSH key, saw it appear in the output. - Grepped for `AUTHFILE_CACHEKEY` (no hits). - Dropped the cache, verified that the file regenerates cleanly. Reviewers: amckinley Reviewed By: amckinley Maniphest Tasks: T13164, T12397 Differential Revision: https://secure.phabricator.com/D19568
This commit is contained in:
parent
df31405d64
commit
6df278bea8
2 changed files with 64 additions and 29 deletions
|
@ -2,13 +2,27 @@
|
|||
<?php
|
||||
|
||||
$root = dirname(dirname(dirname(__FILE__)));
|
||||
require_once $root.'/scripts/__init_script__.php';
|
||||
require_once $root.'/scripts/init/init-script.php';
|
||||
|
||||
// NOTE: We are caching a datastructure rather than the flat key file because
|
||||
// the path on disk to "ssh-exec" is arbitrarily mutable at runtime. See T12397.
|
||||
|
||||
$cache = PhabricatorCaches::getMutableCache();
|
||||
$authfile_key = PhabricatorAuthSSHKeyQuery::AUTHFILE_CACHEKEY;
|
||||
$authfile = $cache->getKey($authfile_key);
|
||||
$authstruct_key = PhabricatorAuthSSHKeyQuery::AUTHSTRUCT_CACHEKEY;
|
||||
$authstruct_raw = $cache->getKey($authstruct_key);
|
||||
|
||||
if ($authfile === null) {
|
||||
$authstruct = null;
|
||||
|
||||
if (strlen($authstruct_raw)) {
|
||||
try {
|
||||
$authstruct = phutil_json_decode($authstruct_raw);
|
||||
} catch (Exception $ex) {
|
||||
// Ignore any issues with the cached data; we'll just rebuild the
|
||||
// structure below.
|
||||
}
|
||||
}
|
||||
|
||||
if ($authstruct === null) {
|
||||
$keys = id(new PhabricatorAuthSSHKeyQuery())
|
||||
->setViewer(PhabricatorUser::getOmnipotentUser())
|
||||
->withIsActive(true)
|
||||
|
@ -19,7 +33,7 @@ if ($authfile === null) {
|
|||
exit(1);
|
||||
}
|
||||
|
||||
$bin = $root.'/bin/ssh-exec';
|
||||
$key_list = array();
|
||||
foreach ($keys as $ssh_key) {
|
||||
$key_argv = array();
|
||||
$object = $ssh_key->getObject();
|
||||
|
@ -42,18 +56,7 @@ if ($authfile === null) {
|
|||
$key_argv[] = '--phabricator-ssh-key';
|
||||
$key_argv[] = $ssh_key->getID();
|
||||
|
||||
$cmd = csprintf('%s %Ls', $bin, $key_argv);
|
||||
|
||||
$instance = PhabricatorEnv::getEnvConfig('cluster.instance');
|
||||
if (strlen($instance)) {
|
||||
$cmd = csprintf('PHABRICATOR_INSTANCE=%s %C', $instance, $cmd);
|
||||
}
|
||||
|
||||
// This is additional escaping for the SSH 'command="..."' string.
|
||||
$cmd = addcslashes($cmd, '"\\');
|
||||
|
||||
// Strip out newlines and other nonsense from the key type and key body.
|
||||
|
||||
$type = $ssh_key->getKeyType();
|
||||
$type = preg_replace('@[\x00-\x20]+@', '', $type);
|
||||
if (!strlen($type)) {
|
||||
|
@ -66,6 +69,40 @@ if ($authfile === null) {
|
|||
continue;
|
||||
}
|
||||
|
||||
$key_list[] = array(
|
||||
'argv' => $key_argv,
|
||||
'type' => $type,
|
||||
'key' => $key,
|
||||
);
|
||||
}
|
||||
|
||||
$authstruct = array(
|
||||
'keys' => $key_list,
|
||||
);
|
||||
|
||||
$authstruct_raw = phutil_json_encode($authstruct);
|
||||
$ttl = phutil_units('24 hours in seconds');
|
||||
$cache->setKey($authstruct_key, $authstruct_raw, $ttl);
|
||||
}
|
||||
|
||||
$bin = $root.'/bin/ssh-exec';
|
||||
$instance = PhabricatorEnv::getEnvConfig('cluster.instance');
|
||||
|
||||
$lines = array();
|
||||
foreach ($authstruct['keys'] as $key_struct) {
|
||||
$key_argv = $key_struct['argv'];
|
||||
$key = $key_struct['key'];
|
||||
$type = $key_struct['type'];
|
||||
|
||||
$cmd = csprintf('%s %Ls', $bin, $key_argv);
|
||||
|
||||
if (strlen($instance)) {
|
||||
$cmd = csprintf('PHABRICATOR_INSTANCE=%s %C', $instance, $cmd);
|
||||
}
|
||||
|
||||
// This is additional escaping for the SSH 'command="..."' string.
|
||||
$cmd = addcslashes($cmd, '"\\');
|
||||
|
||||
$options = array(
|
||||
'command="'.$cmd.'"',
|
||||
'no-port-forwarding',
|
||||
|
@ -79,9 +116,7 @@ if ($authfile === null) {
|
|||
}
|
||||
|
||||
$authfile = implode('', $lines);
|
||||
$ttl = phutil_units('24 hours in seconds');
|
||||
$cache->setKey($authfile_key, $authfile, $ttl);
|
||||
}
|
||||
|
||||
echo $authfile;
|
||||
|
||||
exit(0);
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
final class PhabricatorAuthSSHKeyQuery
|
||||
extends PhabricatorCursorPagedPolicyAwareQuery {
|
||||
|
||||
const AUTHFILE_CACHEKEY = 'ssh.authfile';
|
||||
const AUTHSTRUCT_CACHEKEY = 'ssh.authstruct';
|
||||
|
||||
private $ids;
|
||||
private $phids;
|
||||
|
@ -13,7 +13,7 @@ final class PhabricatorAuthSSHKeyQuery
|
|||
|
||||
public static function deleteSSHKeyCache() {
|
||||
$cache = PhabricatorCaches::getMutableCache();
|
||||
$authfile_key = self::AUTHFILE_CACHEKEY;
|
||||
$authfile_key = self::AUTHSTRUCT_CACHEKEY;
|
||||
$cache->deleteKey($authfile_key);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue