@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
Support ecdsa-sha2-nistp256 SSH keys
Summary:
See discussion in <https://github.com/facebook/phabricator/issues/430>.
(If we end up with more than like 5 of these we should probably make this a warning or something instead, the only goal is to prevent user error.)
Test Plan:
{F79196}
{F79197}
Reviewers: btrahan, chad
Reviewed By: chad
CC: aran, enko
Differential Revision: https://secure.phabricator.com/D7522
+10
-2
+10
-2
src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
+10
-2
src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
···
81
81
82
82
if (!$errors) {
83
83
list($type, $body, $comment) = $parts;
84
-
if (!preg_match('/^ssh-dsa|ssh-rsa$/', $type)) {
84
+
85
+
$recognized_keys = array(
86
+
'ssh-dsa',
87
+
'ssh-rsa',
88
+
'ecdsa-sha2-nistp256',
89
+
);
90
+
91
+
if (!in_array($type, $recognized_keys)) {
85
92
$e_key = pht('Invalid');
86
-
$errors[] = pht('Public key should be "ssh-dsa" or "ssh-rsa".');
93
+
$type_list = implode(', ', $recognized_keys);
94
+
$errors[] = pht('Public key should be one of: %s', $type_list);
87
95
} else {
88
96
$key->setKeyType($type);
89
97
$key->setKeyBody($body);