Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

inspec2xccdf: Check Text, Fix Text, and MISC→Mitigations #226

Merged
merged 13 commits into from
Aug 11, 2021
Merged

inspec2xccdf: Check Text, Fix Text, and MISC→Mitigations #226

merged 13 commits into from
Aug 11, 2021

Conversation

janeuner
Copy link
Contributor

@janeuner janeuner commented Apr 14, 2021 •
edited
Loading

Adds support for the Check Text, Fix Text, and MISC→Mitigations in DISA STIGViewer

Needs special attention to inspec parsing; by my testing, inspec output now uses a descriptions object to encode fix and check text. The sample json (profile and results) probably due for an update.

@janeuner janeuner changed the title @janeuner inspec2xccdf: Add support for the Check Text, Fix Text, and MISC→Mitigations in DISA STIGViewer @janeuner inspec2xccdf: Check Text, Fix Text, and MISC→Mitigations Apr 14, 2021
@janeuner janeuner changed the title @janeuner inspec2xccdf: Check Text, Fix Text, and MISC→Mitigations inspec2xccdf: Check Text, Fix Text, and MISC→Mitigations Apr 14, 2021
@janeuner janeuner marked this pull request as draft April 14, 2021 13:50
@janeuner janeuner force-pushed the jn-to-xccdf-check-fix-text branch 3 times, most recently from 8864548 to 912ca2d Compare April 15, 2021 18:06
@janeuner
Copy link
Contributor Author

Getting different test results parsing the descriptions object based on build environment. For my Ubuntu dev vm and the Windows test runners, the object parses as a Hash. For the Ubuntu and Mac test runners, it parses as a Array. @Bialogs or others, I'd appreciate a second set of eyes. (Note, I'm a Ruby novice. Wrote my first line of Ruby code this week.)

@Bialogs
Copy link
Contributor

Bialogs commented Apr 15, 2021

yep I can help you out

@janeuner janeuner marked this pull request as ready for review April 23, 2021 15:39
@Bialogs Bialogs force-pushed the jn-to-xccdf-check-fix-text branch 2 times, most recently from 41abf10 to 98f4574 Compare May 10, 2021 20:33
@rlakey rlakey linked an issue Jul 20, 2021 that may be closed by this pull request
inspec2xccdf doesn't support desc 'check' or 'fix' syntax #238
Closed
janeuner and others added 12 commits August 11, 2021 10:35
@janeuner
.gitignore *.swp (vim) and .raketasks~
92d18c4 
Signed-off-by: Jarod Neuner <jarod@neuner.us>
@janeuner
inspec2xccdf: Add support for the Check Text, Fix Text, and MISC→Miti…
bc1e61f 
…gations fields in the DISA STIGViewer.

Signed-off-by: Jarod Neuner <jarod@neuner.us>
@janeuner
inspec2xccdf: Looking for syntax that works on these test runners
d3f87a8 
Signed-off-by: Jarod Neuner <jarod@neuner.us>
@janeuner
Still trying to get it work...
eb22b60
@janeuner
Still still trying to get it work...
e69ef99
@janeuner
Still still still trying to get it work...
85ceecf
Move utilities into inspec. Update the conversion from inspec to xccd…
aeefa03 
…f for newer inspec runs.
Rubocop fixes
564bc02
Update rubocop_todo now that utils/ is removed
08f2a3c
Update tests to work without Utils
c84deb3
Fix issue where scoring would return the wrong object
0954e4c
Add test for v4.28 inspec result output json
cca21e8
@Bialogs Bialogs merged commit dc0e419 into mitre:master Aug 11, 2021
@Bialogs Bialogs deleted the jn-to-xccdf-check-fix-text branch August 11, 2021 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

inspec2xccdf doesn't support desc 'check' or 'fix' syntax
2 participants
@janeuner @Bialogs