Skip to content

Commit a490126

Browse files
committed
Update dev-tunnels-ssh lib
1 parent d6d29cb commit a490126

File tree

4 files changed

+17
-210
lines changed

4 files changed

+17
-210
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,9 @@
454454
"@gitpod/public-api": "main-gha",
455455
"@gitpod/supervisor-api-grpc": "main-gha",
456456
"@improbable-eng/grpc-web-node-http-transport": "^0.14.0",
457-
"@microsoft/dev-tunnels-ssh": "^3.11.16",
458-
"@microsoft/dev-tunnels-ssh-keys": "^3.11.16",
459-
"@microsoft/dev-tunnels-ssh-tcp": "^3.11.16",
457+
"@microsoft/dev-tunnels-ssh": "^3.11.21",
458+
"@microsoft/dev-tunnels-ssh-keys": "^3.11.21",
459+
"@microsoft/dev-tunnels-ssh-tcp": "^3.11.21",
460460
"@segment/analytics-node": "^1.0.0-beta.24",
461461
"configcat-node": "^8.0.0",
462462
"js-yaml": "^4.1.0",
@@ -476,4 +476,4 @@
476476
"ws": "^8.13.0",
477477
"yazl": "^2.5.1"
478478
}
479-
}
479+
}

src/local-ssh/pipeSession.ts

Lines changed: 0 additions & 192 deletions
This file was deleted.

src/local-ssh/proxy.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ import * as stream from 'stream';
8282
import { ILogService } from '../services/logService';
8383
import { ITelemetryService, UserFlowTelemetryProperties } from '../common/telemetry';
8484
import { LocalSSHMetricsReporter } from '../services/localSSHMetrics';
85-
import { PipeExtensions } from './pipeSession';
8685

8786
// This public key is safe to be public since we only use it to verify local-ssh connections.
8887
const HOST_KEY = 'LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JR0hBZ0VBTUJNR0J5cUdTTTQ5QWdFR0NDcUdTTTQ5QXdFSEJHMHdhd0lCQVFRZ1QwcXg1eEJUVmc4TUVJbUUKZmN4RXRZN1dmQVVsM0JYQURBK2JYREsyaDZlaFJBTkNBQVJlQXo0RDVVZXpqZ0l1SXVOWXpVL3BCWDdlOXoxeApvZUN6UklqcGdCUHozS0dWRzZLYXV5TU5YUm95a21YSS9BNFpWaW9nd2Vjb0FUUjRUQ2FtWm1ScAotLS0tLUVORCBQUklWQVRFIEtFWS0tLS0tCg==';
@@ -191,7 +190,7 @@ class WebSocketSSHProxy {
191190
e.authenticationPromise = this.authenticateClient(e.username ?? '')
192191
.then(async pipeSession => {
193192
this.sendUserStatusFlow('connected');
194-
pipePromise = PipeExtensions.pipeSession(session, pipeSession);
193+
pipePromise = session.pipe(pipeSession);
195194
return {};
196195
}).catch(async err => {
197196
this.logService.error('failed to authenticate proxy with username: ' + e.username ?? '', err);

yarn.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -254,24 +254,24 @@
254254
semver "^7.3.5"
255255
tar "^6.1.11"
256256

257-
"@microsoft/dev-tunnels-ssh-keys@^3.11.16":
258-
version "3.11.16"
259-
resolved "https://registry.yarnpkg.com/@microsoft/dev-tunnels-ssh-keys/-/dev-tunnels-ssh-keys-3.11.16.tgz#ba8197d6264ef2d33790c3c59cef794e2717a050"
260-
integrity sha512-GaPKaewjnpCyLv3947FOjJluakVkAKVNh6+vDDGAG+ZWFPhYAgcEiOHTZOfJlmoUhYXFpCrQ5z8fiTDw5mW3Mw==
257+
"@microsoft/dev-tunnels-ssh-keys@^3.11.21":
258+
version "3.11.21"
259+
resolved "https://registry.yarnpkg.com/@microsoft/dev-tunnels-ssh-keys/-/dev-tunnels-ssh-keys-3.11.21.tgz#d3d8ff3900f3b0b5480a36a5905ef640bf9c68f4"
260+
integrity sha512-elXtB34noX3tVmcIEniKSR5q3/5i31rjIahtbMY1L4oG1G0Z4B9qk0ed3eXCkkOb1Qk6YTgmpD6cLVSox+lALA==
261261
dependencies:
262262
"@microsoft/dev-tunnels-ssh" "~3.11"
263263

264-
"@microsoft/dev-tunnels-ssh-tcp@^3.11.16":
265-
version "3.11.16"
266-
resolved "https://registry.yarnpkg.com/@microsoft/dev-tunnels-ssh-tcp/-/dev-tunnels-ssh-tcp-3.11.16.tgz#ea4f96686362913d2466d846502c50b321e04881"
267-
integrity sha512-12D5sVDkI6kjoSUfBswsPYPuPJLbMoTAC+K8g+j4Yf9DeabbhR/wkdYyboIGPt2Tpb0SkAwVnuZLpPffAq4N/g==
264+
"@microsoft/dev-tunnels-ssh-tcp@^3.11.21":
265+
version "3.11.21"
266+
resolved "https://registry.yarnpkg.com/@microsoft/dev-tunnels-ssh-tcp/-/dev-tunnels-ssh-tcp-3.11.21.tgz#dc1846ad7bd02ffde8e4b702a270bbe171788872"
267+
integrity sha512-GcuN+4Q+OpjcSrn2ibMvSiBTCadRlTo/2bwLs+8Ei8YzhKpHgBW06ZA9OJUzsG2QewUSrkufp2ojI45KIybUtQ==
268268
dependencies:
269269
"@microsoft/dev-tunnels-ssh" "~3.11"
270270

271-
"@microsoft/dev-tunnels-ssh@^3.11.16", "@microsoft/dev-tunnels-ssh@~3.11":
272-
version "3.11.16"
273-
resolved "https://registry.yarnpkg.com/@microsoft/dev-tunnels-ssh/-/dev-tunnels-ssh-3.11.16.tgz#53e15306181801ffee87f1bb6440beb346d5255e"
274-
integrity sha512-OUvAhudpOS9Ms1C2Y3WkUpCRBsNvZJl6IQE04Ud9ZGg/VaF04QJQFWeXt3pYryJJtv3zy1V2aH9JnzMMvBjXfA==
271+
"@microsoft/dev-tunnels-ssh@^3.11.21", "@microsoft/dev-tunnels-ssh@~3.11":
272+
version "3.11.21"
273+
resolved "https://registry.yarnpkg.com/@microsoft/dev-tunnels-ssh/-/dev-tunnels-ssh-3.11.21.tgz#257a4fdc1eccc7f3922fc96a5607e8a0ba960855"
274+
integrity sha512-33rSAtQSF7Ap6cHbvLqwuH4eTCmzxCDSfP4iJQNz5Ipy3I2GW7mnOzfhJFU4r4e6h7AMYfyef1NZpYJh7uavcg==
275275
dependencies:
276276
buffer "^5.2.1"
277277
debug "^4.1.1"

0 commit comments

Comments
 (0)