feat: generate key pair using ssh2 for right public key format

server/src/containers/docker.ts

@@ -1,4 +1,3 @@
-import fs from 'fs'
 import { Duplex } from 'stream'
 import { Client } from 'ssh2'
 import Docker from 'dockerode'
@@ -67,6 +66,7 @@ export async function attachContainer(
     config.docker.network
   ].IPAddress
   const conn = new Client()
+  console.log(config.docker.keypair.privateKey)
 
   return new Promise((resolve, reject) => {
     conn
@@ -100,7 +100,7 @@ export async function attachContainer(
         host: containerIp,
         port: 22,
         username: 'commander',
-        privateKey: fs.readFileSync('/home/wancat/.ssh/id_ed25519'),
+        privateKey: config.docker.keypair.privateKey,
         debug: console.log,
       })
   })

server/src/utils/crypto.ts

@@ -1,5 +1,9 @@
 import fs from 'fs'
-import { generateKeyPairSync } from 'crypto'
+import ssh2 from 'ssh2'
+
+const {
+  utils: { generateKeyPairSync },
+} = ssh2
 
 type KeyPair = {
   privateKey: string
@@ -24,16 +28,7 @@ export function loadOrCreateKeyPair(privateKeyPath: string): KeyPair {
 }
 
 export function generateKeyPair(): KeyPair {
-  const { privateKey, publicKey } = generateKeyPairSync('rsa', {
-    modulusLength: 2048,
-    publicKeyEncoding: {
-      type: 'spki',
-      format: 'pem',
-    },
-    privateKeyEncoding: {
-      type: 'pkcs8',
-      format: 'pem',
-    },
-  })
+  const { private: privateKey, public: publicKey } =
+    generateKeyPairSync('ed25519')
   return { privateKey, publicKey }
 }