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

fix: listening on IPv6 address not possible (#5133)

Browse Source 
Wrap IPv6 addresses in square brackets when making URL in ensureAddress,
fixing regression (#1582)
This commit is contained in:
mooff 2022-04-26 20:33:51 +01:00 committed by GitHub
parent 683412cb01
commit a0b36147ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/node/app.ts
View File

@ -94,7 +94,8 @@ export const ensureAddress = (server: http.Server, protocol: string): URL | stri
} }
if (typeof addr !== "string") { if (typeof addr !== "string") {
return new URL(`${protocol}://${addr.address}:${addr.port}`) const host = addr.family === "IPv6" ? `[${addr.address}]` : addr.address
return new URL(`${protocol}://${host}:${addr.port}`)
} }
// If this is a string then it is a pipe or Unix socket. // If this is a string then it is a pipe or Unix socket.

16
test/unit/node/app.test.ts
View File

@ -152,10 +152,20 @@ describe("ensureAddress", () => {
it("should throw and error if no address", () => { it("should throw and error if no address", () => {
expect(() => ensureAddress(mockServer, "http")).toThrow("Server has no address") expect(() => ensureAddress(mockServer, "http")).toThrow("Server has no address")
}) })
it("should return the address if it exists", async () => { it("should return the address if it's a string", async () => {
mockServer.address = () => "http://localhost:8080/" mockServer.address = () => "/path/to/unix.sock"
const address = ensureAddress(mockServer, "http") const address = ensureAddress(mockServer, "http")
expect(address.toString()).toBe(`http://localhost:8080/`) expect(address.toString()).toBe(`/path/to/unix.sock`)
})
it("should construct URL with an IPv4 address", async () => {
mockServer.address = () => ({ address: "1.2.3.4", port: 5678, family: "IPv4" })
const address = ensureAddress(mockServer, "http")
expect(address.toString()).toBe(`http://1.2.3.4:5678/`)
})
it("should construct URL with an IPv6 address", async () => {
mockServer.address = () => ({ address: "a:b:c:d::1234", port: 5678, family: "IPv6" })
const address = ensureAddress(mockServer, "http")
expect(address.toString()).toBe(`http://[a:b:c:d::1234]:5678/`)
}) })
}) })