Merge pull request #636 from atsign-foundation/colin-fix-ssh-keys

fix: added correct checks to ssh public key checks
atsign-foundation · Dec 15, 2023 · 240591c · 240591c
2 parents 60b7030 + 97381db
commit 240591c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/noports_core/lib/src/common/at_ssh_key_util/local_ssh_key_util.dart b/packages/noports_core/lib/src/common/at_ssh_key_util/local_ssh_key_util.dart
@@ -127,8 +127,9 @@ class LocalSshKeyUtil implements AtSshKeyUtil {
     String sessionId = '',
     String permissions = '',
   }) async {
-    // Check to see if the ssh public key looks like one!
-    if (!sshPublicKey.startsWith('ssh-')) {
+    // Check to see if the ssh public key is
+    // supported keys by the dartssh2 package
+    if (!sshPublicKey.startsWith(RegExp(r'^(ecdsa-sha2-nistp)|(rsa-sha2-)|(ssh-rsa)|(ssh-ed25519)|(ecdsa-sha2-nistp)'))) {
       throw ('$sshPublicKey does not look like a public key');
     }
 

diff --git a/packages/noports_core/lib/src/sshnpd/sshnpd_impl.dart b/packages/noports_core/lib/src/sshnpd/sshnpd_impl.dart
@@ -329,8 +329,9 @@ class SshnpdImpl implements Sshnpd {
           'ssh Public Key received from ${notification.from} notification id : ${notification.id}');
       sshPublicKey = notification.value!;
 
-      // Check to see if the ssh public key looks like one!
-      if (!sshPublicKey.startsWith('ssh-')) {
+    // Check to see if the ssh public key is
+    // supported keys by the dartssh2 package
+    if (!sshPublicKey.startsWith(RegExp(r'^(ecdsa-sha2-nistp)|(rsa-sha2-)|(ssh-rsa)|(ssh-ed25519)|(ecdsa-sha2-nistp)'))) {
         throw ('$sshPublicKey does not look like a public key');
       }