diff --git a/scripts/ssh/ssh-auth.php b/scripts/ssh/ssh-auth.php index dc7b4d098..aba2b20f0 100755 --- a/scripts/ssh/ssh-auth.php +++ b/scripts/ssh/ssh-auth.php @@ -1,48 +1,53 @@ #!/usr/bin/env php establishConnection('r'); $rows = queryfx_all( $conn_r, 'SELECT userName, keyBody, keyType FROM %T u JOIN %T ssh ON u.phid = ssh.userPHID', $user_dao->getTableName(), $ssh_dao->getTableName()); +if (!$rows) { + echo pht("No keys found.")."\n"; + exit(1); +} + $bin = $root.'/bin/ssh-exec'; foreach ($rows as $row) { $user = $row['userName']; $cmd = csprintf('%s --phabricator-ssh-user %s', $bin, $user); // 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 = $row['keyType']; $type = preg_replace('@[\x00-\x20]+@', '', $type); $key = $row['keyBody']; $key = preg_replace('@[\x00-\x20]+@', '', $key); $options = array( 'command="'.$cmd.'"', 'no-port-forwarding', 'no-X11-forwarding', 'no-agent-forwarding', 'no-pty', ); $options = implode(',', $options); $lines[] = $options.' '.$type.' '.$key."\n"; } echo implode('', $lines); exit(0);