WIP

Author: addaleax

packages/devtools-proxy-support/src/ssh.ts

@@ -1,3 +1,4 @@
+import type { AgentConnectOpts } from 'agent-base';
 import { Agent as AgentBase } from 'agent-base';
 import type { DevtoolsProxyOptions } from './proxy-options';
 import type { AgentWithInitialize } from './agent';
@@ -104,16 +105,23 @@ export class SSHAgent extends AgentBase implements AgentWithInitialize {
     this.logger.emit('ssh:established-connection');
   }
 
-  override async connect(req: ClientRequest): Promise<Duplex> {
-    return await this._connect(req);
+  override async connect(
+    req: ClientRequest,
+    connectOpts: AgentConnectOpts
+  ): Promise<Duplex> {
+    return await this._connect(req, connectOpts);
   }
 
-  private async _connect(req: ClientRequest, retriesLeft = 1): Promise<Duplex> {
+  private async _connect(
+    req: ClientRequest,
+    connectOpts: AgentConnectOpts,
+    retriesLeft = 1
+  ): Promise<Duplex> {
     let host = '';
     try {
       // Using the `host` header matches what proxy-agent does
-      host = req.getHeader('host') as string;
-      const url = new URL(req.path, `tcp://${host}`);
+      host = connectOpts.host || (req.getHeader('host') as string);
+      const url = new URL(req.path, `tcp://${host}:${connectOpts.port}`);
 
       await this.initialize();
 
@@ -130,7 +138,7 @@ export class SSHAgent extends AgentBase implements AgentWithInitialize {
         this.connected = false;
         if (retriesLeft > 0) {
           await this.initialize();
-          return await this._connect(req, retriesLeft - 1);
+          return await this._connect(req, connectOpts, retriesLeft - 1);
         }
       }
       throw err;

packages/devtools-proxy-support/test/fixtures/sshd.key

@@ -1,15 +1,27 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDus6d2ccviyVDeC0D+7he6yznH7tninsVOBvUdXDDiiSSMZKra
-9+sPKrsrTpzez1PbIaR6N5EAi5Tmq1hIAtxroopm8BXqAEoIfdYTPUrnT6WiKDak
-FZ8608N2g4QEcvSFuD0Jzm3yrqbmKno0aAJFB1kjfgDyyUkWKjL7el4hEQIDAQAB
-AoGBALMFG+ASAmZIs5SD/i/zYuqdxezzboeuqa0WPLjTTnpnfnioexcT/j92vb8C
-C1ZzSaG7vn5GtEIjbP3+nYwMUUAZOV/xhZJxbM5vZF5/yjw+rbWK7HKuM+fmks72
-mrAonBaFVudVxNRQvsPkZVwE+uAURgYEtiWJW3sPVWcdhjARAkEA/9XlGwqQRV41
-HkhgrlXCBCIz09bv3e2/ZSOFohMd7zCLjPOs3iijd/xfIpsuxJd9musCm2plX1/K
-EzTNd8p87QJBAO7a8HnCMBAKmmL9+fRzXJKVMiCMx6WX8H6YaXWEzZnnw4PD7K10
-vgPPfQpFXZ4W5D23FOA2UepDRqs2VbQ21DUCQFhrGkVgP0BaMM2IgjF+XhGDqJnc
-PQZcdruDrVm4da4G/xP125bkQKrlRBP3whAbs0NpWXtRKDvwJSzCIQj3qHkCQQCb
-x9FlKABexfuRKqH2C7NJquLJlee0GZdxiYfmbJoHkb/TVVoseuJe69ladIktTTLJ
-CXolDWh5iC00Bzj4U3YtAkBXuawsJOIbxaMBlKkm0Q1g+K+htoC+B62ZQkXvCzDl
-QOpN8MM1Xb+/qxEVEVtnGprUqEVF4CQEy6IBAHzUn5s+
------END RSA PRIVATE KEY-----
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
+NhAAAAAwEAAQAAAQEA1se5+kem8bHLbCO8Hi2Dyb5vCb8MYQPibfksAaZBTMOA+31skw8r
+0Vf4US/HuwdTzJVN+fFHP9+okS6wmWX2qIs8oX9wRhKBJVY11XFeb2YKQRAQUTZDujBFHg
+Emhrse9ooSJYXlF4/XqTtG5myChb+tdpP5dh7JLOw/GUOhuaTjTrWKZ4/duLgVRrB1UHR4
+SY/Brpx3HIQqcYoznUJbkReW21h65BO1P1Pu4brV9dp4EEQPfLbm2hx0yICGw2vvPLe7k3
+10QNa81brQsl+67eLX0PDt9C63ozVkfFR1DdxEvjlzj5ETrgzYDzEPiciY51iaIrZFOkol
+LHc3yaThAQAAA9gViGq9FYhqvQAAAAdzc2gtcnNhAAABAQDWx7n6R6bxsctsI7weLYPJvm
+8JvwxhA+Jt+SwBpkFMw4D7fWyTDyvRV/hRL8e7B1PMlU358Uc/36iRLrCZZfaoizyhf3BG
+EoElVjXVcV5vZgpBEBBRNkO6MEUeASaGux72ihIlheUXj9epO0bmbIKFv612k/l2Hsks7D
+8ZQ6G5pONOtYpnj924uBVGsHVQdHhJj8GunHcchCpxijOdQluRF5bbWHrkE7U/U+7hutX1
+2ngQRA98tubaHHTIgIbDa+88t7uTfXRA1rzVutCyX7rt4tfQ8O30LrejNWR8VHUN3ES+OX
+OPkROuDNgPMQ+JyJjnWJoitkU6SiUsdzfJpOEBAAAAAwEAAQAAAQAnU6raCQSofMWip2hq
+nirjZdsvDaxWlz9+o4FLTAXo6GNVqUGYK876JgFx3C3WMSFG9I+ylFtXdryG2OW9MM5ZTi
+Vr7MnCCuFa1M5GptuDyktWXnqeZDFChlQhilRjlx+0RNPNyxaHme8DLbdtubCsjMxWSgID
+ft+XOirTlW6nbxOLEx3k1TG4xKA6ds92U2VaSycRpUn76TbO62R09UZi+V1Ysvld6ubbFp
+cJX1+EaV3+lOSwV0EHcFale+Dlsh8cNmNzsAjrsAXC0swFTDdRd3eZBkNyIVuHe8hVCdvt
+Of1+UGQ3t7zlyoXVdGVqLNq7fqS2u1oKjrAfORoDHpGBAAAAgGk2Ptv/0Umn181+cKSOiP
+nWJexpl8rOB5k9IGMvfz+6uc/ZQXotqp2mdG+s9IrIYfaEVJfTbrAWceLhh2TjDPd7xvew
+QQxkQsQkXGCXMtWN5d+s7moYS/lalinQT1LxqlejMEZ8vEK3eRrKBwoux1y8p8PkxJiu6J
+FLwLeqZtBlAAAAgQD97wDcqvKk5izf+87L7aACJzhuNFXxI9g3FzNCU4atEWn/zLItV754
+T7pLXW5sNFwakwkF8px4GAXaY/FtueluoJuizdTyXGyPi0ZEF3o8QowP2CP+p6Dw5OWa6a
+pkusZ67YpO7UxNjkvOcjQXLmW8umSNwrXvBsY4jfc3qDNcMwAAAIEA2Icoimjr7h0pDbed
+3avQdSjQz8qRBvhDGm7FzcgpAfMN1tewKFLl3I1Zw5pZMbJJENxmqH04GXPkzyzeJqgqVf
+qKsig6q6BMczQWBknTIo8Iw4YofMX3TFuCpmXnJE/jCtUqptmmo1xaY7nIg6bFvfXMcwBt
+NJ/fg9/W1+8VmfsAAAAcYW5uYS5oZW5uaW5nc2VuQE0tRFdIVzRSNlc1QwECAwQFBgc=
+-----END OPENSSH PRIVATE KEY-----

packages/devtools-proxy-support/test/fixtures/sshd.key.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWx7n6R6bxsctsI7weLYPJvm8JvwxhA+Jt+SwBpkFMw4D7fWyTDyvRV/hRL8e7B1PMlU358Uc/36iRLrCZZfaoizyhf3BGEoElVjXVcV5vZgpBEBBRNkO6MEUeASaGux72ihIlheUXj9epO0bmbIKFv612k/l2Hsks7D8ZQ6G5pONOtYpnj924uBVGsHVQdHhJj8GunHcchCpxijOdQluRF5bbWHrkE7U/U+7hutX12ngQRA98tubaHHTIgIbDa+88t7uTfXRA1rzVutCyX7rt4tfQ8O30LrejNWR8VHUN3ES+OXOPkROuDNgPMQ+JyJjnWJoitkU6SiUsdzfJpOEB anna.henningsen@M-DWHW4R6W5C