Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions src/sshSupport.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,39 @@ Host coder-v?code--*
ProxyCommand: '/tmp/coder --header="X-BAR=foo" coder.dev',
})
})

it("properly escapes meaningful regex characters", () => {
const properties = computeSSHProperties(
"coder-vscode.dev.coder.com--matalfi--dogfood",
`Host *
StrictHostKeyChecking yes

# ------------START-CODER-----------
# This section is managed by coder. DO NOT EDIT.
#
# You should not hand-edit this section unless you are removing it, all
# changes will be lost when running "coder config-ssh".
#
Host coder.*
StrictHostKeyChecking=no
UserKnownHostsFile=/dev/null
ProxyCommand /usr/local/bin/coder --global-config "/Users/matifali/Library/Application Support/coderv2" ssh --stdio --ssh-host-prefix coder. %h
# ------------END-CODER------------

# --- START CODER VSCODE dev.coder.com ---
Host coder-vscode.dev.coder.com--*
StrictHostKeyChecking no
UserKnownHostsFile=/dev/null
ProxyCommand "/Users/matifali/Library/Application Support/Code/User/globalStorage/coder.coder-remote/dev.coder.com/bin/coder-darwin-arm64" vscodessh --network-info-dir "/Users/matifali/Library/Application Support/Code/User/globalStorage/coder.coder-remote/net" --session-token-file "/Users/matifali/Library/Application Support/Code/User/globalStorage/coder.coder-remote/dev.coder.com/session" --url-file "/Users/matifali/Library/Application Support/Code/User/globalStorage/coder.coder-remote/dev.coder.com/url" %h
# --- END CODER VSCODE dev.coder.com ---%

`,
)

expect(properties).toEqual({
StrictHostKeyChecking: "yes",
ProxyCommand:
'"/Users/matifali/Library/Application Support/Code/User/globalStorage/coder.coder-remote/dev.coder.com/bin/coder-darwin-arm64" vscodessh --network-info-dir "/Users/matifali/Library/Application Support/Code/User/globalStorage/coder.coder-remote/net" --session-token-file "/Users/matifali/Library/Application Support/Code/User/globalStorage/coder.coder-remote/dev.coder.com/session" --url-file "/Users/matifali/Library/Application Support/Code/User/globalStorage/coder.coder-remote/dev.coder.com/url" %h',
UserKnownHostsFile: "/dev/null",
})
})
7 changes: 6 additions & 1 deletion src/sshSupport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ export function computeSSHProperties(host: string, config: string): Record<strin
}
| undefined
const configs: Array<typeof currentConfig> = []
// biome-ignore lint/complexity/noForEach: <explanation>
config.split("\n").forEach((line) => {
// biome-ignore lint/style/noParameterAssign: <explanation>
line = line.trim()
if (line === "") {
return
Expand Down Expand Up @@ -85,8 +87,11 @@ export function computeSSHProperties(host: string, config: string): Record<strin
if (!config) {
return
}

// In OpenSSH * matches any number of characters and ? matches exactly one.
if (!new RegExp("^" + config?.Host.replace(/\*/g, ".*").replace(/\?/g, ".") + "$").test(host)) {
if (
!new RegExp("^" + config?.Host.replace(/\./g, "\\.").replace(/\*/g, ".*").replace(/\?/g, ".") + "$").test(host)
) {
return
}
Object.assign(merged, config.properties)
Expand Down