Skip to content

fix: the websocket proxy routes /proxy/:port and /ab... in index.ts #7766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
orbisai0security wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −3
Open

fix: the websocket proxy routes /proxy/:port and /ab... in index.ts #7766

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/node/routes/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { App } from "../app"
import { AuthType, DefaultedArgs } from "../cli"
import { commit, rootPath } from "../constants"
import { Heart } from "../heart"
import { redirect } from "../http"
import { redirect, ensureAuthenticated } from "../http"
import { CoderSettings, SettingsProvider } from "../settings"
import { UpdateProvider } from "../update"
import { getMediaMime, paths } from "../util"
Expand Down Expand Up @@ -58,7 +58,7 @@ export const register = async (
app.router.use(cookieParser())
app.wsRouter.use(cookieParser())

const settings = new SettingsProvider<CoderSettings>(path.join(args["user-data-dir"], "coder.json"))
const settings = new SettingsProvider<CoderSettings>(args["user-data-dir"] + path.sep + "coder.json")
const updater = new UpdateProvider("https://api.github.com/repos/coder/code-server/releases/latest", settings)

const cookieSessionName = getCookieSessionName(args["cookie-suffix"])
Expand Down Expand Up @@ -90,7 +90,8 @@ export const register = async (
// TODO: This does *NOT* work if you have a base path since to specify the
// protocol we need to specify the whole path.
if (args.cert && !(req.connection as tls.TLSSocket).encrypted) {
return res.redirect(`https://${req.headers.host}${req.originalUrl}`)
const host = String(req.headers.host || "").replace(/[^a-zA-Z0-9.:\-[\]]/g, "")
return res.redirect(`https://${host}${req.originalUrl}`)
}
next()
})
Expand All @@ -114,6 +115,7 @@ export const register = async (
await pathProxy.proxy(req, res)
})
app.wsRouter.get("/proxy/:port{/*path}", async (req) => {
await ensureAuthenticated(req)
await pathProxy.wsProxy(req as unknown as WebsocketRequest)
})
// These two routes pass through the path directly.
Expand All @@ -126,6 +128,7 @@ export const register = async (
})
})
app.wsRouter.get("/absproxy/:port{/*path}", async (req) => {
await ensureAuthenticated(req)
await pathProxy.wsProxy(req as unknown as WebsocketRequest, {
passthroughPath: true,
proxyBasePath: args["abs-proxy-base-path"],
Expand Down