Improve support for obscure ssh_config(5) rules #68
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
It's reasonable to end the config with a section directive (e.g., Match final' to trigger a re-parse), in which case there is no prior line within the config to attach the whitespace to. Extend the logic to annotate the most recent section directive if it's sub-config is empty. Signed-off-by: Benjamin Gray <bgray@linux.ibm.com>
ssh_config(5) defines three Match criteria that don't take any arguments: 'all', 'canonical', and 'final'. Update the criteria parsing logic to recognise these. The value is irrelevant, but the criteria are stored in a map, so an empty array is chosen here. Consumers really shouldn't be trying to use any particular value though. Signed-off-by: Benjamin Gray <bgray@linux.ibm.com>
Add some testing to assert that Match criteria without arguments ('all',
'canonical', and 'final') are parsed correctly.
Signed-off-by: Benjamin Gray <bgray@linux.ibm.com>
When User is passed in the params, it acts as if the config started with an unconditional User line. Signed-off-by: Benjamin Gray <bgray@linux.ibm.com>
When a user is passed explicitly to .compute, it should not switch because of any User lines. Signed-off-by: Benjamin Gray <bgray@linux.ibm.com>
Computing a config potentially performs multiple passes, with some quirks around what exactly the host is in 'Host' and 'Match host' sections. Extend .compute to handle more cases of 'all' and 'final'. Signed-off-by: Benjamin Gray <bgray@linux.ibm.com>
Test some cases of parsing configs with second passes due to Match final or similar. Signed-off-by: Benjamin Gray <bgray@linux.ibm.com>
Codecov ReportPatch coverage:
❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more. Additional details and impacted files@@ Coverage Diff @@
## master #68 +/- ##
===========================================
- Coverage 100.00% 96.96% -3.04%
===========================================
Files 2 3 +1
Lines 231 297 +66
Branches 0 81 +81
===========================================
+ Hits 231 288 +57
- Misses 0 4 +4
- Partials 0 5 +5
☔ View full report in Codecov by Sentry. |
cyjake
reviewed
Aug 8, 2023
|
v4.3.0 released |
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.
There are some obscure interactions in the SSH config parsing rules. This PR extends support for some of these, which addresses the bug that prompted jeanp413/open-remote-ssh#103.
The
canonicalcriteria is not properly supported in this series because I don't use it, so don't really have a sense for what it should be doing. It shouldn't be too hard to extend support for it too though, now that the second pass is possible.