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

Format redacted arg lines 

Pushing straight to main again.
This commit is contained in:
Asher 2023-05-05 14:44:40 -08:00
parent 3f7db15fde
commit 5708e6ce32
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/node/cli.ts
View File

@ -433,10 +433,7 @@ export const parse = (
throw new Error("--cert-key is missing") throw new Error("--cert-key is missing")
} }
logger.debug(() => [ logger.debug(() => [`parsed ${opts?.configFile ? "config" : "command line"}`, field("args", redactArgs(args))])
`parsed ${opts?.configFile ? "config" : "command line"}`,
field("args", redactArgs(args)),
])
return args return args
} }
@ -446,11 +443,11 @@ export const parse = (
*/ */
export const redactArgs = (args: UserProvidedArgs): UserProvidedArgs => { export const redactArgs = (args: UserProvidedArgs): UserProvidedArgs => {
return { return {
...args, ...args,
password: args.password ? "<redacted>" : undefined, password: args.password ? "<redacted>" : undefined,
"hashed-password": args["hashed-password"] ? "<redacted>" : undefined, "hashed-password": args["hashed-password"] ? "<redacted>" : undefined,
"github-auth": args["github-auth"] ? "<redacted>" : undefined, "github-auth": args["github-auth"] ? "<redacted>" : undefined,
} }
} }
/** /**

11
src/node/wrapper.ts
View File

@ -182,10 +182,13 @@ export class ChildProcess extends Process {
}, },
this.logger, this.logger,
) )
this.logger.debug("got message", field("message", { this.logger.debug(
type: message.type, "got message",
args: redactArgs(message.args), field("message", {
})) type: message.type,
args: redactArgs(message.args),
}),
)
return message.args return message.args
} }