add glob pattern support for known_hosts#15508
Merged
weihanglo merged 1 commit intorust-lang:masterfrom May 10, 2025
Merged
Conversation
Collaborator
Contributor
Author
|
Oops, fixing the failing tests... (edit: fixed) |
fb2c996 to
09ae8fe
Compare
epage
reviewed
May 9, 2025
epage
reviewed
May 9, 2025
src/cargo/sources/git/known_hosts.rs
Outdated
| regex::escape(&pattern.replace("*", ",,,,").replace("?", ";;;;")) | ||
| .replace(",,,,", ".*") | ||
| .replace(";;;;", "."); | ||
| if let Ok(regex) = Regex::new(®ex_pattern) { |
Contributor
There was a problem hiding this comment.
Should we do anything on errors?
Contributor
Author
There was a problem hiding this comment.
Hmm, my thought is that if the pattern string could not be interpreted as glob pattern it's better to just pass glob matching.
Member
There was a problem hiding this comment.
We could probably emit a tracing::warn! on failing cases.
09ae8fe to
786a78a
Compare
weihanglo
reviewed
May 10, 2025
Member
weihanglo
left a comment
There was a problem hiding this comment.
Thanks. Just one nit and we are good to go!
| } | ||
| for pattern in self.patterns.split(',') { | ||
| let pattern = pattern.to_lowercase(); | ||
| // FIXME: support * and ? wildcards |
Member
There was a problem hiding this comment.
Was under the impression that this feature is tracked in #11577, but apparently not.
It seems like OpenSSH supports only * and ? wildcards. One caveat of using glob here is we provide more than we should. Anyway, it is good to catch up with the common format.
786a78a to
087285d
Compare
087285d to
e68d951
Compare
weihanglo
approved these changes
May 10, 2025
Member
weihanglo
left a comment
There was a problem hiding this comment.
Great! Thanks for the contribution :)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 16, 2025
Update cargo 5 commits in 056f5f4f3c100cb36b5e9aed2d20b9ea70aae295..47c911e9e6f6461f90ce19142031fe16876a3b95 2025-05-09 14:54:18 +0000 to 2025-05-14 17:53:17 +0000 - Stabilize doctest-xcompile (rust-lang/cargo#15462) - feat: skip `publish=false` pkg when publishing entire workspace (rust-lang/cargo#15525) - chore: bump to 0.90.0; update changelog (rust-lang/cargo#15520) - chore(triagebot): add `[no-mentions]` and `[note]` (rust-lang/cargo#15517) - add glob pattern support for known_hosts (rust-lang/cargo#15508) r? ghost
github-actions bot
pushed a commit
to rust-lang/rustc-dev-guide
that referenced
this pull request
May 19, 2025
Update cargo 5 commits in 056f5f4f3c100cb36b5e9aed2d20b9ea70aae295..47c911e9e6f6461f90ce19142031fe16876a3b95 2025-05-09 14:54:18 +0000 to 2025-05-14 17:53:17 +0000 - Stabilize doctest-xcompile (rust-lang/cargo#15462) - feat: skip `publish=false` pkg when publishing entire workspace (rust-lang/cargo#15525) - chore: bump to 0.90.0; update changelog (rust-lang/cargo#15520) - chore(triagebot): add `[no-mentions]` and `[note]` (rust-lang/cargo#15517) - add glob pattern support for known_hosts (rust-lang/cargo#15508) r? ghost
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR try to resolve?
This PR implements glob pattern match for known_hosts file. Hosts written with
*and?now matches correctly.Tests
Tests are added accordingly.
Miscs
This is my first time submitting PR, sorry if there's anything that's off although I've read the contributor guide.