add glob pattern support for known_hosts #15508
Merged
Conversation
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
rustbot
added
A-git
|
Oops, fixing the failing tests... (edit: fixed) |
motorailgun
force-pushed
the
known-hosts-glob
branch
from
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) { |
There was a problem hiding this comment.
Should we do anything on errors?
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.
There was a problem hiding this comment.
We could probably emit a tracing::warn! on failing cases.
motorailgun
force-pushed
the
known-hosts-glob
branch
from
09ae8fe to
786a78a
Compare
weihanglo
reviewed
May 10, 2025
| @@ -588,7 +589,14 @@ impl KnownHost { | |||
| } | |||
| for pattern in self.patterns.split(',') { | |||
| let pattern = pattern.to_lowercase(); | |||
| // FIXME: support * and ? wildcards | |||
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.
motorailgun
force-pushed
the
known-hosts-glob
branch
from
786a78a to
087285d
Compare
motorailgun
force-pushed
the
known-hosts-glob
branch
from
087285d to
e68d951
Compare
weihanglo
approved these changes
May 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.