[SSHD-1164] - fixed parsing of sshd_config "Host" lines to collapse spaces #196
Conversation
This file contains 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
tomaswolf
reviewed
May 15, 2021
sshd-common/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java
Outdated
Show resolved
Hide resolved
Completely unrelated: I noticed this, too, and I think this is a bug in the test setups. They should never read the real ~/.ssh/config, that may make tests fail depending on what a user's config contains. Tests should always use a mocked/faked home and ~/.ssh directory, and a mocked/faked config with known static content (maybe empty). |
This makes it more lenient where there is > 1 space between Host line values
|
I updated this to only work based on the parsed |
tomaswolf
reviewed
May 29, 2021
| * @param cs the CharSequence to check, may be null | ||
| * @return {@code true} if the CharSequence is null, empty or whitespace only | ||
| * @since 2.0 | ||
| * @since 3.0 Changed signature from isBlank(String) to isBlank(CharSequence) |
There was a problem hiding this comment.
So this was copied from somewhere. Looks like StringUtils from org.apache.commons.lang, so license-wise OK.
I'll remove the misleading "since" tags and fix the comment.
|
I've merged this as commit 267887a. |
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.
The
ssh_configman page defines the format forHosta bit vaguely as:When running the unit test suite that read my
~/.ssh/configfile, there was aHostline which had two spaces between some values which failed parsing in MINA, but doesn't cause any problem for OpenSSH.This PR simply makes the parsing of
Hostdirective values more lenient by removing blank strings from the split values