tunnel-server: store envId in envStore (#152)

livecycle · Aug 1, 2023 · b90effa · b90effa
1 parent f59e26b
commit b90effa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/tunnel-server/index.ts b/tunnel-server/index.ts
@@ -59,7 +59,7 @@ const sshServer = createSshServer({
   socketDir: '/tmp', // TODO
 })
   .on('client', client => {
-    const { clientId, publicKey } = client
+    const { clientId, publicKey, envId } = client
     const tunnels = new Map<string, string>()
     client
       .on('forward', async (requestId, { path: remotePath, access }, accept, reject) => {
@@ -71,6 +71,7 @@ const sshServer = createSshServer({
         const forward = await accept()
         sshLogger.debug('creating tunnel %s for localSocket %s', key, forward.localSocketPath)
         await envStore.set(key, {
+          envId,
           target: forward.localSocketPath,
           clientId,
           publicKey: createPublicKey(publicKey.getPublicPEM()),

diff --git a/tunnel-server/src/preview-env.ts b/tunnel-server/src/preview-env.ts
@@ -1,6 +1,7 @@
 import { KeyObject } from 'crypto'
 
 export type PreviewEnv = {
+  envId: string
   clientId: string
   target: string
   publicKey: KeyObject

diff --git a/tunnel-server/src/proxy.ts b/tunnel-server/src/proxy.ts
@@ -91,6 +91,7 @@ export function proxyHandlers({
         }
       )
     }, err => logger.error('error forwarding traffic %j', { error: err })),
+
     wsHandler: asyncHandler(async (req: IncomingMessage, socket: internal.Duplex, head: Buffer) => {
       const env = await resolveTargetEnv(req)
       if (!env) {

diff --git a/tunnel-server/src/ssh-server.ts b/tunnel-server/src/ssh-server.ts
@@ -34,6 +34,7 @@ export interface ClientForward extends EventEmitter {
 }
 
 export interface SshClient extends EventEmitter {
+  envId: string
   clientId: string
   publicKey: ParsedKey
   on: (
@@ -126,8 +127,9 @@ export const sshServer = (
           preevySshClient = Object.assign(new EventEmitter(), {
             publicKey: keyOrError,
             clientId: idFromPublicSsh(keyOrError.getPublicSSH()),
+            envId: ctx.username,
           })
-          log.debug('accepting clientId %j', preevySshClient.clientId)
+          log.debug('accepting clientId %j envId %j', preevySshClient.clientId, preevySshClient.envId)
           ctx.accept()
           serverEmitter.emit('client', preevySshClient)
         })