FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

feat: cli arg for file permission of socket by TechCiel · Pull Request #4923 · coder/code-server · GitHub

  1. coder
  2. code-server

Repository navigation

feat: cli arg for file permission of socket #4923

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

Merged
jsjoeio merged 1 commit into from
Mar 3, 2022
Conversation 7 Commits 1 Checks 0 Files changed
Merged

feat: cli arg for file permission of socket #4923

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

Filter by extension

Filter by extension .ts  (4) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
15 changes: 12 additions & 3 deletions src/node/app.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { disposer } from "./http"
import { isNodeJSErrnoException } from "./util"
import { handleUpgrade } from "./wsRouter"

type ListenOptions = Pick<DefaultedArgs, "socket" | "port" | "host">
type ListenOptions = Pick<DefaultedArgs, "socket-mode" | "socket" | "port" | "host">

export interface App extends Disposable {
/** Handles regular HTTP requests. */
Expand All @@ -22,7 +22,7 @@ export interface App extends Disposable {
server: http.Server
}

const listen = (server: http.Server, { host, port, socket }: ListenOptions) => {
const listen = (server: http.Server, { host, port, socket, "socket-mode": mode }: ListenOptions) => {
return new Promise<void>(async (resolve, reject) => {
server.on("error", reject)

Expand All @@ -31,7 +31,16 @@ const listen = (server: http.Server, { host, port, socket }: ListenOptions) => {
server.off("error", reject)
server.on("error", (err) => util.logError(logger, "http server error", err))

resolve()
if (socket && mode) {
fs.chmod(socket, mode)
.then(resolve)
.catch((err) => {
util.logError(logger, "socket chmod", err)
reject(err)
})
} else {
resolve()
}
}

if (socket) {
Expand Down
3 changes: 3 additions & 0 deletions src/node/cli.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export interface UserProvidedArgs {
open?: boolean
"bind-addr"?: string
socket?: string
"socket-mode"?: string
version?: boolean
"proxy-domain"?: string[]
"reuse-window"?: boolean
Expand Down Expand Up @@ -175,6 +176,7 @@ const options: Options<Required<UserProvidedArgs>> = {
port: { type: "number", description: "" },

socket: { type: "string", path: true, description: "Path to a socket (bind-addr will be ignored)." },
"socket-mode": { type: "string", description: "File mode of the socket." },
version: { type: "boolean", short: "v", description: "Display version information." },
_: { type: "string[]" },

Expand Down Expand Up @@ -513,6 +515,7 @@ export async function setDefaults(cliArgs: UserProvidedArgs, configArgs?: Config
args.host = "localhost"
args.port = 0
args.socket = undefined
args["socket-mode"] = undefined
args.cert = undefined
args.auth = AuthType.None
}
Expand Down
12 changes: 12 additions & 0 deletions test/unit/node/app.test.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,18 @@ describe("createApp", () => {
app.dispose()
})

it("should change the file mode of a socket", async () => {
const defaultArgs = await setDefaults({
socket: tmpFilePath,
"socket-mode": "777",
})

const app = await createApp(defaultArgs)

expect((await promises.stat(tmpFilePath)).mode & 0o777).toBe(0o777)
app.dispose()
})

it("should create an https server if args.cert exists", async () => {
const testCertificate = await generateCertificate("localhost")
const cert = new OptionalString(testCertificate.cert)
Expand Down
8 changes: 7 additions & 1 deletion test/unit/node/cli.test.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ describe("parser", () => {

"--socket=mumble",

"--socket-mode=777",

"3",

["--user-data-dir", "path/to/user/dir"],
Expand Down Expand Up @@ -110,6 +112,7 @@ describe("parser", () => {
open: true,
port: 8081,
socket: path.resolve("mumble"),
"socket-mode": "777",
verbose: true,
version: true,
"bind-addr": "192.169.0.1:8080",
Expand Down Expand Up @@ -269,7 +272,9 @@ describe("parser", () => {
})

it("should override with --link", async () => {
const args = parse("--cert test --cert-key test --socket test --host 0.0.0.0 --port 8888 --link test".split(" "))
const args = parse(
"--cert test --cert-key test --socket test --socket-mode 777 --host 0.0.0.0 --port 8888 --link test".split(" "),
)
const defaultArgs = await setDefaults(args)
expect(defaultArgs).toEqual({
...defaults,
Expand All @@ -282,6 +287,7 @@ describe("parser", () => {
cert: undefined,
"cert-key": path.resolve("test"),
socket: undefined,
"socket-mode": undefined,
})
})

Expand Down
Back | FazBrowse Home | New Git URL