Improve consistency of PATH, environments, and which() #551
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
This patch attempts to fix (or aid in debugging) issue sshuttle#350. sshuttle didn't explicitly search /sbin and /usr/sbin and they may be missing in the user's PATH. If PATH is missing, these folders wouldn't be searched either. There was also a program_exists function which is redundant to which(). This consolidates everything into the helpers.py file. This patch introduces get_path() to return PATH + some extra hardcoded paths. A new get_env() function can be called to create a consistent environment when calling external programs. The new which() wrapper function also ensures we use the same set of paths. If -vv is supplied, messages clearly indicate the programs we are looking for, if they are found, and where we looked if we failed to find them. I haven't tested the changes to ipfw or pf.
brianmay
approved these changes
Oct 25, 2020
Member
|
Will merge when conflicts have been resolved :-) |
Contributor
Author
|
I fixed the conflict a while back. I also just tacked on an extra small change to more reliably print a message about --auto-nets not working when both 'ip' and 'netstat' are missing on the server. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 patch attempts to fix (or aid in debugging) issue #350.
sshuttle didn't explicitly search /sbin and /usr/sbin and they may be
missing in the user's PATH. If PATH is missing, these folders wouldn't
be searched either. There was also a program_exists function which is
redundant to which(). This consolidates everything into the helpers.py
file.
This patch introduces get_path() to return PATH + some extra hardcoded
paths. A new get_env() function can be called to create a consistent
environment when calling external programs. The new which() wrapper
function also ensures we use the same set of paths.
If -vv is supplied, messages clearly indicate the programs we are
looking for, if they are found, and where we looked if we failed to
find them.
I haven't tested the changes to ipfw or pf.