bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix proxying non-ASCII (#6154) 

This only affects the path proxy since `req.originalUrl` is in escaped format.
This commit is contained in:
smalllady 2023-04-26 03:41:33 +08:00 committed by GitHub
parent 2e17735795
commit 951d8ac45e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/node/routes/pathProxy.ts
View File

@ -11,7 +11,7 @@ const getProxyTarget = (req: Request, passthroughPath?: boolean): string => {
return `http://0.0.0.0:${req.params.port}/${req.originalUrl}` return `http://0.0.0.0:${req.params.port}/${req.originalUrl}`
} }
const query = qs.stringify(req.query) const query = qs.stringify(req.query)
return `http://0.0.0.0:${req.params.port}/${req.params[0] || ""}${query ? `?${query}` : ""}` return encodeURI(`http://0.0.0.0:${req.params.port}${req.params[0] || ""}${query ? `?${query}` : ""}`)
} }
export async function proxy( export async function proxy(

11
test/unit/node/proxy.test.ts
View File

@ -187,6 +187,17 @@ describe("proxy", () => {
}) })
}).rejects.toThrow() }).rejects.toThrow()
}) })
it("should proxy non-ASCII", async () => {
e.get("*", (req, res) => {
res.json("ほげ")
})
codeServer = await integration.setup(["--auth=none"], "")
const resp = await codeServer.fetch(proxyPath.replace("wsup", "ほげ"))
expect(resp.status).toBe(200)
const json = await resp.json()
expect(json).toBe("ほげ")
})
}) })
// NOTE@jsjoeio // NOTE@jsjoeio