mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-23 05:50:55 +01:00
Fix an issue where passphrase-protected private keys were stored without discarding passphrases
Summary: Ref T13454. See <https://discourse.phabricator-community.org/t/newly-created-ssh-private-keys-with-passphrase-not-working-anymore/3883>. After changes to distinguish between invalid and passphrase-protected keys, SSH private key management code incorrectly uses "-y ..." ("print public key") when it means "-p ..." ("modify input file, removing passphrase"). This results in the command having no effect, and Passphrase stores the raw input credential, not the stripped version. We can't recover the keys because we don't store the passphrase, so no migration here is really possible. (We could add more code to detect this case, but it's presumably rare.) Also, correct the behavior of the "Show Public Key" action: this is available for users who can see the credential and does not require edit permission. Test Plan: - Created a new credential with a passphrase, then showed the public key. Maniphest Tasks: T13006, T13454 Differential Revision: https://secure.phabricator.com/D21245
This commit is contained in:
parent
df139f044b
commit
3dea92081b
2 changed files with 1 additions and 2 deletions
|
@ -80,7 +80,7 @@ final class PhabricatorAuthSSHPrivateKey extends Phobject {
|
|||
if (!$err) {
|
||||
if ($passphrase) {
|
||||
execx(
|
||||
'ssh-keygen -y -P %P -N %s -f %R',
|
||||
'ssh-keygen -p -P %P -N %s -f %R',
|
||||
$passphrase,
|
||||
'',
|
||||
$tmp);
|
||||
|
|
|
@ -154,7 +154,6 @@ final class PassphraseCredentialViewController extends PassphraseController {
|
|||
->setName(pht('Show Public Key'))
|
||||
->setIcon('fa-download')
|
||||
->setHref($this->getApplicationURI("public/{$id}/"))
|
||||
->setDisabled(!$can_edit)
|
||||
->setWorkflow(true));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue