Skip to content

Commit 351d9b4

Browse files
committed
Use unique socket path per user.
1 parent 8b27c26 commit 351d9b4

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/node/vscodeSocket.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import { logger } from "@coder/logger"
22
import express from "express"
33
import * as http from "http"
4-
import * as os from "os"
54
import * as path from "path"
65
import { HttpCode } from "../common/http"
76
import { listen } from "./app"
8-
import { canConnect } from "./util"
7+
import { canConnect, paths } from "./util"
98

109
// Socket path of the daemonized code-server instance.
11-
export const DEFAULT_SOCKET_PATH = path.join(os.tmpdir(), "code-server-ipc.sock")
10+
export const DEFAULT_SOCKET_PATH = path.join(paths.data, `code-server-ipc.sock`)
1211

1312
export interface EditorSessionEntry {
1413
workspace: {

test/unit/node/vscodeSocket.test.ts

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
import { logger } from "@coder/logger"
22
import * as app from "../../../src/node/app"
3-
import { EditorSessionManager, makeEditorSessionManagerServer } from "../../../src/node/vscodeSocket"
3+
import { paths } from "../../../src/node/util"
4+
import {
5+
DEFAULT_SOCKET_PATH,
6+
EditorSessionManager,
7+
makeEditorSessionManagerServer,
8+
} from "../../../src/node/vscodeSocket"
49
import { clean, tmpdir, listenOn, mockLogger } from "../../utils/helpers"
510

11+
describe("DEFAULT_SOCKET_PATH", () => {
12+
it("should be a unique path per user", () => {
13+
expect(DEFAULT_SOCKET_PATH.startsWith(paths.data)).toBe(true)
14+
})
15+
})
16+
617
describe("makeEditorSessionManagerServer", () => {
718
let tmpDirPath: string
819

0 commit comments

Comments
 (0)