Commit44f4f08

authored

feat: add coder.tlsAltHost option (#398)

1 parentd4ccfa7 commit44f4f08Copy full SHA for 44f4f08

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,11 @@`
`88`	`88`	`"type":"string",`
`89`	`89`	`"default":""`
`90`	`90`	`},`
	`91`	`+"coder.tlsAltHost": {`
	`92`	`+"markdownDescription":"Alternative hostname to use for TLS verification. This is useful when the hostname in the certificate does not match the hostname used to connect.",`
	`93`	`+"type":"string",`
	`94`	`+"default":""`
	`95`	`+ },`
`91`	`96`	`"coder.proxyLogDirectory": {`
`92`	`97`	`"markdownDescription":"If set, the Coder CLI will output extra SSH information into this directory, which can be helpful for debugging connectivity issues.",`
`93`	`98`	`"type":"string",`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ async function createHttpAgent(): Promise<ProxyAgent> {`
`31`	`31`	`constcertFile=expandPath(String(cfg.get("coder.tlsCertFile")??"").trim())`
`32`	`32`	`constkeyFile=expandPath(String(cfg.get("coder.tlsKeyFile")??"").trim())`
`33`	`33`	`constcaFile=expandPath(String(cfg.get("coder.tlsCaFile")??"").trim())`
	`34`	`+constaltHost=expandPath(String(cfg.get("coder.tlsAltHost")??"").trim())`
`34`	`35`
`35`	`36`	`returnnewProxyAgent({`
`36`	`37`	`// Called each time a request is made.`
`@@ -41,6 +42,7 @@ async function createHttpAgent(): Promise<ProxyAgent> {`
`41`	`42`	`cert:certFile==="" ?undefined :awaitfs.readFile(certFile),`
`42`	`43`	`key:keyFile==="" ?undefined :awaitfs.readFile(keyFile),`
`43`	`44`	`ca:caFile==="" ?undefined :awaitfs.readFile(caFile),`
	`45`	`+servername:altHost==="" ?undefined :altHost,`
`44`	`46`	`// rejectUnauthorized defaults to true, so we need to explicitly set it to`
`45`	`47`	`// false if we want to allow self-signed certificates.`
`46`	`48`	`rejectUnauthorized:!insecure,`
`@@ -66,7 +68,8 @@ async function getHttpAgent(): Promise<ProxyAgent> {`
`66`	`68`	`e.affectsConfiguration("coder.insecure")\|\|`
`67`	`69`	`e.affectsConfiguration("coder.tlsCertFile")\|\|`
`68`	`70`	`e.affectsConfiguration("coder.tlsKeyFile")\|\|`
`69`		`-e.affectsConfiguration("coder.tlsCaFile")`
	`71`	`+e.affectsConfiguration("coder.tlsCaFile")\|\|`
	`72`	`+e.affectsConfiguration("coder.tlsAltHost")`
`70`	`73`	`){`
`71`	`74`	`agent=createHttpAgent()`
`72`	`75`	`}`

Comments

(0)