auditd_rules resource: fix get_keys error on lines that have no keys #2103
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
…lidate bug fix Signed-off-by: Jennifer Burns <jburns@mitre.org>
jburns12
changed the title
adamleff
suggested changes
Aug 28, 2017
lib/resources/auditd_rules.rb
Outdated
| @@ -177,7 +177,7 @@ def get_action_list(line) | |||
|
|
|||
| # NB only in file lines | |||
| def get_key(line) | |||
| line.match(/-k ([^ ]+)/)[1] | |||
| line.match(/-k ([^ ]+)/)[1] if line =~ /-k/ | |||
There was a problem hiding this comment.
I think we should be more specific about this condition. What is the filename in the line is /etc/private-keys but has no -k SOMEKEY indication? This will still match the /-k/ condition.
Perhaps we should change that to: if line.include?('-k ') so we directly match on the trailing space? And add a line to your mock file that has a filename that includes -k in the file name?
There was a problem hiding this comment.
Sure thing...thanks!
Signed-off-by: Jennifer Burns <jburns@mitre.org>
adamleff
changed the title
arlimus
approved these changes
Aug 29, 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.
Currently, if a file rule found by audtictl -l does not contain a key, the get_key function in auditd_rules.rb generates a NilClass error. This PR alters the single line in get_key to be sure that a key exists before line.match can throw the error. The unit tests and mock auditctl command file have also been updated to verify this fix prevents the NilClass error.
Signed-off-by: Jennifer Burns jburns@mitre.org