recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Remove code which overrides "diffusion.ssh-username" when instanced

Summary:
Ref T13529. Now that instances can be renamed, an instance may have multiple valid SSH usernames and the preferred SSH username may not be the intenal instance name.

`PhacilitySiteSource` should already always set `diffusion.ssh-username` correctly, to the current preferred SSH username (which may be "new-name" after a rename from "old-name"), so we should never be able to reach this code without an accurate `diffusion.ssh-username` value available.

The code to resolve names into instances also already works for both "ssh old-name@..." and "ssh new-name@...".

So I believe this code has no beneficial effects and only causes harm: it may force us to return "old-name" when falling through would correctly return "new-name".

Test Plan:
- Previously: renamed an instance, then SSH'd to it using both the old and new names. Both work.
- Previously: verified that `diffusion.ssh-username` is set correctly after a rename.
- Verified that Diffusion "Clone" UI now shows "new-name" after an instance rename.
- The real question here is: does this break something I'm not thinking of? And the change probably has to go to production to answer that.

Maniphest Tasks: T13529

Differential Revision: https://secure.phabricator.com/D21259

epriestley b1351d0f 3ee6b539

-9
-9
src/applications/almanac/util/AlmanacKeys.php
··· 57 57 } 58 58 59 59 public static function getClusterSSHUser() { 60 - // NOTE: When instancing, we currently use the SSH username to figure out 61 - // which instance you are connecting to. We can't use the host name because 62 - // we have no way to tell which host you think you're reaching: the SSH 63 - // protocol does not have a mechanism like a "Host" header. 64 - $username = PhabricatorEnv::getEnvConfig('cluster.instance'); 65 - if (strlen($username)) { 66 - return $username; 67 - } 68 - 69 60 $username = PhabricatorEnv::getEnvConfig('diffusion.ssh-user'); 70 61 if (strlen($username)) { 71 62 return $username;