This repository has been archived by the owner on Oct 5, 2019. It is now read-only.
adds binaries in path to collection #158
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
jjsendor
reviewed
Oct 2, 2017
osxcollector/osxcollector.py
Outdated
| @@ -913,6 +915,7 @@ def collect(self, section_list=None): | |||
| ('safari', self._collect_safari), | |||
| ('accounts', self._collect_accounts), | |||
| ('mail', self._collect_mail), | |||
| ('executables', self._collect_binary_names_in_path) | |||
There was a problem hiding this comment.
Is there a missing , at the end of this line?
There was a problem hiding this comment.
++ I missed this copy pasting between different checkouts
leeren
reviewed
Oct 2, 2017
osxcollector/osxcollector.py
Outdated
| return os.path.isfile(fpath) and os.path.exists(fpath) and os.access(fpath, os.X_OK) | ||
|
|
||
| if PATH_ENVIRONMENT_NAME in os.environ: | ||
| for bin_dir in os.environ[PATH_ENVIRONMENT_NAME].split(":"): |
There was a problem hiding this comment.
Super small nit and probably unnecessary since OS X uses colon as path separator by default, but maybe using os.pathsep for more readability?
There was a problem hiding this comment.
makes sense @leeren, I'll update it.
leeren
reviewed
Oct 2, 2017
osxcollector/osxcollector.py
Outdated
| exe_files = [] | ||
|
|
||
| def is_exe(fpath): | ||
| return os.path.isfile(fpath) and os.path.exists(fpath) and os.access(fpath, os.X_OK) |
There was a problem hiding this comment.
os.path.isfile always implies os.path.exists, so the latter seems redundant. You could also have a directory mislabelled as an executable which would probably further encourage just using os.path.isfile and os.access alone.
leeren
approved these changes
Oct 2, 2017
leeren
reviewed
Oct 2, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 change adds binaries in the PATH environment variable to the collection