Add support for reading hosts/subnets from a file #130
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
New parameter: --routes-file <filename> or -f <filename> Syntax is one host per line. Single-line or postfix comments are handled and ignored. For example: 1.2.3.4 host1.example.com # This is one more comment host2.example.com
|
Hi all, is there any update on this case? Regards |
|
Hi guys. |
marmitar
approved these changes
Sep 25, 2024
| @@ -444,6 +465,7 @@ def parse_args_and_env(args=None, environ=os.environ): | |||
| p = argparse.ArgumentParser() | |||
| p.add_argument('routes', nargs='*', type=net_or_host_param, help='List of VPN-internal hostnames, included subnets (e.g. 192.168.0.0/24), excluded subnets (e.g. %%8.0.0.0/8), or aliases (e.g. host1=192.168.1.2) to add to routing and /etc/hosts.') | |||
| g = p.add_argument_group('Subprocess options') | |||
| p.add_argument('-f', '--routes-file', default=None, type=file_path_param, help='Path to List of VPN-internal hostnames, subnets (e.g. 192.168.0.0/24), or aliases (e.g. host1=192.168.1.2) to add to routing and /etc/hosts.') | |||
There was a problem hiding this comment.
FileType might be better for handling file as arguments, like this one:
Suggested change
| p.add_argument('-f', '--routes-file', default=None, type=file_path_param, help='Path to List of VPN-internal hostnames, subnets (e.g. 192.168.0.0/24), or aliases (e.g. host1=192.168.1.2) to add to routing and /etc/hosts.') | |
| p.add_argument('-f', '--routes-file', default=None, type=argparse.FileType('r'), help='Path to List of VPN-internal hostnames, subnets (e.g. 192.168.0.0/24), or aliases (e.g. host1=192.168.1.2) to add to routing and /etc/hosts.') |
Comment on lines
+120
to
+121
| lines = [x.strip() for x in f.readlines()] | ||
| for line in lines: |
There was a problem hiding this comment.
No need to read the entire file in memory beforehand, you can just iterate over the lines like this:
Suggested change
| lines = [x.strip() for x in f.readlines()] | |
| for line in lines: | |
| for line in f: | |
| line = line.strip() |
| lines = [x.strip() for x in f.readlines()] | ||
| for line in lines: | ||
| # ignore empty lines | ||
| if not len(line.strip()): |
There was a problem hiding this comment.
Redundant strip:
Suggested change
| if not len(line.strip()): | |
| if not line: |
| if not len(line.strip()): | ||
| continue | ||
| # ignore comment lines | ||
| if line.strip().startswith('#'): |
There was a problem hiding this comment.
Redundant strip:
Suggested change
| if line.strip().startswith('#'): | |
| if line.startswith('#'): |
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.
This pull requests adds new argument to allow reading the hosts/subnets from a file.
This is sort of a duplicate of another pull request #42, but with a different approach. I leave it up to the author to decide if he wants to go forward with either of these.
Usage
New parameter:
--routes-file <filename>or-f <filename>For example:
The routes file should have one host per line, with optional comments:
To be considered
-ffor this feature?Differences to the implementation in #42
fromfile_prefix_chars, but instead a simple custom parser that knows how to handle comments