Skip to content

fix(ssh): include hosts from wildcard filenames with line separators #35479

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

Open
Lucenx9 wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −1
Open

fix(ssh): include hosts from wildcard filenames with line separators #35479

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
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/ssh/src/config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@ describe("ssh config", () => {
path.join(sshDir, "config"),
"Include config.d/*\nInclude config.d/.literal.conf\nInclude config.d/.enabled-*.conf\nInclude explicit-directory\nHost real\n HostName real.example.com\n",
);
for (const [index, separator] of ["\u2028", "\u2029"].entries()) {
yield* fs.writeFileString(
path.join(sshDir, "config.d", `team${separator}one.conf`),
`Host unicode-${index}\n HostName unicode-${index}.example.com\n`,
);
}
yield* fs.writeFileString(
path.join(sshDir, "config.d", "team.conf"),
"Host team\n HostName team.example.com\n",
Expand Down Expand Up @@ -115,6 +121,8 @@ describe("ssh config", () => {
["literal", "literal.example.com", "ssh-config"],
["real", "real.example.com", "ssh-config"],
["team", "team.example.com", "ssh-config"],
["unicode-0", "unicode-0.example.com", "ssh-config"],
["unicode-1", "unicode-1.example.com", "ssh-config"],
],
);
}).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
Expand Down
2 changes: 1 addition & 1 deletion packages/ssh/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ function escapeRegex(value: string): string {

function globToRegExp(pattern: string): RegExp {
return new RegExp(
`^${escapeRegex(pattern).replace(/\\\*/gu, ".*").replace(/\\\?/gu, ".")}$`,
`^${escapeRegex(pattern).replace(/\\\*/gu, "[^]*").replace(/\\\?/gu, ".")}$`,
"u",
);
}
Expand Down
Loading