Merge pull request #439 from atsign-foundation/fix/sendSshPublicKey

fix: send ssh public key
atsign-foundation · Sep 8, 2023 · 4259bb2 · 4259bb2
2 parents 7a82f67 + 0cdabd2
commit 4259bb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/packages/sshnoports/lib/sshnp/sshnp_impl.dart b/packages/sshnoports/lib/sshnp/sshnp_impl.dart
@@ -638,6 +638,7 @@ class SSHNPImpl implements SSHNP {
         ..key = 'sshpublickey'
         ..sharedBy = clientAtSign
         ..sharedWith = sshnpdAtSign
+        ..namespace = namespace
         ..metadata = (Metadata()
           ..ttr = -1
           ..ttl = 10000);

diff --git a/packages/sshnoports/lib/sshnpd/sshnpd_impl.dart b/packages/sshnoports/lib/sshnpd/sshnpd_impl.dart
@@ -295,10 +295,6 @@ class SSHNPDImpl implements SSHNPD {
 
     late final String sshPublicKey;
     try {
-      var sshHomeDirectory = '$homeDirectory/.ssh/';
-      if (Platform.isWindows) {
-        sshHomeDirectory = '$homeDirectory\\.ssh\\';
-      }
       logger.info(
           'ssh Public Key received from ${notification.from} notification id : ${notification.id}');
       sshPublicKey = notification.value!;
@@ -309,7 +305,9 @@ class SSHNPDImpl implements SSHNPD {
       }
 
       // Check to see if the ssh Publickey is already in the file if not append to the ~/.ssh/authorized_keys file
-      var authKeys = File('${sshHomeDirectory}authorized_keys');
+      var authKeysFilePath = [homeDirectory, '.ssh', 'authorized_keys']
+          .join(Platform.pathSeparator);
+      var authKeys = File(authKeysFilePath);
 
       var authKeysContent = await authKeys.readAsString();