OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

fix: wrap socket in proxy before passing to vscode (#4840)

Browse Source 
* chore: add ipc hook to e2e script

* refactor: allow codeServerArgs in e2e tests

* feat: add --cert e2e extension test

* fix: wrap websocket in proxy

* fixup: remvoe ignoreHTTPSErrors

* fixup: make codeServerArgs readonly

* fixup! add back ignoreHTTPSErrors
This commit is contained in:
Joe Previte
2022-02-15 14:51:42 -07:00
committed by GitHub
parent b26cce589f
commit e3e9f052c4
11 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/node/routes/vscode.ts
View File

@ -5,6 +5,7 @@ import { logError } from "../../common/util"
import { toVsCodeArgs } from "../cli"
import { isDevMode } from "../constants"
import { authenticated, ensureAuthenticated, redirect, self } from "../http"
import { SocketProxyProvider } from "../socket"
import { loadAMDModule } from "../util"
import { Router as WsRouter } from "../wsRouter"
import { errorHandler } from "./errors"
@ -13,6 +14,7 @@ export class CodeServerRouteWrapper {
/** Assigned in `ensureCodeServerLoaded` */
private _codeServerMain!: CodeServerLib.IServerAPI
private _wsRouterWrapper = WsRouter()
private _socketProxyProvider = new SocketProxyProvider()
public router = express.Router()
public get wsRouter() {
@ -77,9 +79,10 @@ export class CodeServerRouteWrapper {
}
private $proxyWebsocket = async (req: WebsocketRequest) => {
this._codeServerMain.handleUpgrade(req, req.socket)
const wrappedSocket = await this._socketProxyProvider.createProxy(req.ws)
this._codeServerMain.handleUpgrade(req, wrappedSocket)
req.socket.resume()
req.ws.resume()
}
//#endregion
@ -130,5 +133,6 @@ export class CodeServerRouteWrapper {
dispose() {
this._codeServerMain?.dispose()
this._socketProxyProvider.stop()
}
}