Backup_Repos/code-server
1
0
Fork 0
mirror of https://github.com/cdr/code-server.git synced 2025-12-07 17:02:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge 5d22aec94d into 472bf8a5fa

Browse source
This commit is contained in:
Timon Fiedler 2025-12-06 18:26:17 +01:00 committed by GitHub
commit fde2dd0fb4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/http.ts
View file

@ -24,6 +24,6 @@ export class HttpError extends Error {
} }
} }
export enum CookieKeys { export const CookieKeys = {
Session = "code-server-session", Session: `code-server-session${process.env?.CODE_SERVER_COOKIE_SUFFIX ? "-" + process.env?.CODE_SERVER_COOKIE_SUFFIX : ""}`,
} }

11
src/node/cli.ts
View file

@ -53,6 +53,7 @@ export interface UserProvidedCodeArgs {
"disable-getting-started-override"?: boolean "disable-getting-started-override"?: boolean
"disable-proxy"?: boolean "disable-proxy"?: boolean
"session-socket"?: string "session-socket"?: string
"cookie-suffix"?: string
"link-protection-trusted-domains"?: string[] "link-protection-trusted-domains"?: string[]
// locale is used by both VS Code and code-server. // locale is used by both VS Code and code-server.
locale?: string locale?: string
@ -172,6 +173,12 @@ export const options: Options<Required<UserProvidedArgs>> = {
"session-socket": { "session-socket": {
type: "string", type: "string",
}, },
"cookie-suffix": {
type: "string",
description:
"Adds a suffix to the cookie. This can prevent a collision of cookies for subdomains, making them explixit. \n" +
"Without this flag, no suffix is used. This can also be set with CODE_SERVER_COOKIE_SUFFIX set to any string.",
},
"disable-file-downloads": { "disable-file-downloads": {
type: "boolean", type: "boolean",
description: description:
@ -616,6 +623,10 @@ export async function setDefaults(cliArgs: UserProvidedArgs, configArgs?: Config
usingEnvPassword = false usingEnvPassword = false
} }
if (process.env.CODE_SERVER_COOKIE_SUFFIX) {
args["cookie-suffix"] = process.env.CODE_SERVER_COOKIE_SUFFIX
}
if (process.env.GITHUB_TOKEN) { if (process.env.GITHUB_TOKEN) {
args["github-auth"] = process.env.GITHUB_TOKEN args["github-auth"] = process.env.GITHUB_TOKEN
} }