fix regex expression in SSH config parser #28
Merged
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
mrkschan
reviewed
Dec 7, 2017
config.go
Outdated
| @@ -37,7 +37,7 @@ func ParseSSHConfigFile(path string) (map[string]SSHClientOptions, error) { | |||
|
|
|||
| // Read lines in reverse order and parse option for each Host section: | |||
| lines := strings.Split(string(content), "\n") | |||
| hostExpr := regexp.MustCompile("\\s*Host\\s*=?\\s*(.+)") | |||
| hostExpr := regexp.MustCompile("\\s*Host\\s*(=?)\\s*(.+)") | |||
There was a problem hiding this comment.
I wonder if it's possible to just update this regexp as "^\\s*Host\\b\\s*=?\\s*(.+)" and we're done.
There was a problem hiding this comment.
You're right, that worked great. I pushed the changes. Thanks!
mrkschan
reviewed
Dec 9, 2017
config.go
Outdated
| @@ -37,7 +37,7 @@ func ParseSSHConfigFile(path string) (map[string]SSHClientOptions, error) { | |||
|
|
|||
| // Read lines in reverse order and parse option for each Host section: | |||
| lines := strings.Split(string(content), "\n") | |||
| hostExpr := regexp.MustCompile("\\s*Host\\s*=?\\s*(.+)") | |||
| hostExpr := regexp.MustCompile("\\s*Host\\b\\s*=?\\s*(.+)") | |||
There was a problem hiding this comment.
It think it's better to add the leading ^ to the regexp and so it's exact match of Host.
There was a problem hiding this comment.
something like this?
^Host\\b\\s*=?\\s*(.+)
There was a problem hiding this comment.
The one mentioned on #28 (comment)
|
Thanks @jeloou . |
mattn
pushed a commit
to mattn/slex
that referenced
this pull request
Dec 21, 2017
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.
I've the following config in my
~/.ssh/config:but this isn't parsed correctly by
ParseSSHConfigFilebecause the first host hasStrictHostKeyCheckingconfig.this fix handles that scenario correctly.