This repository has been archived by the owner on Jan 3, 2023. It is now read-only.
oscapd-evaluate: support xccdf-id option #117
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
matusmarhefka
force-pushed
the
scanner-args-xccdf-id
branch
from
ed3ccf3
to
c5291a8
Compare
jan-cerny
reviewed
Oct 24, 2017
bin/oscapd-evaluate
Outdated
| args.profile = es.select_profile_by_suffix(args.profile) | ||
| args.profile = es.select_profile_by_suffix( | ||
| args.xccdf_id, args.profile | ||
| ) |
| input_tree, | ||
| xccdf_id, | ||
| "http://scap.nist.gov/schema/scap/source/1.2", | ||
| "http://checklists.nist.gov/xccdf/1.2", |
There was a problem hiding this comment.
Why is this namespace second here and first in the previous call?
There was a problem hiding this comment.
It should be the same! I will correct it.
…nent id Changed functions (added xccdf_id argument): * openscap_daemon/oscap_helpers.py: get_profile_choices_for_input * openscap_daemon/evaluation_spec.py: EvaluationSpec.select_profile_by_suffix
* atomic scan / oscapd-evaluate now supports xccdf-id scanner argument for configuration_compliance scan type. This way it is possible to select any profile in datastream file using: '--scanner_args xccdf-id=XCCDF_ID,profile=PROFILE_ID' If xccdf-id is not specified, profile is selected from the first XCCDF component found in a datastream file.
matusmarhefka
force-pushed
the
scanner-args-xccdf-id
branch
from
c5291a8
to
a6e4353
Compare
|
@jan-cerny Wrong indentation and swapped namespace arguments are fixed in the latest commit. |
|
OK, thanks. |
mpreisler
reviewed
Nov 2, 2017
| @@ -455,7 +474,7 @@ def _get_result_id(results_path): | |||
| return test_result.attrib["id"] | |||
|
|
|||
|
|
|||
| def generate_fix_for_result(config, results_path, fix_type): | |||
| def generate_fix_for_result(config, results_path, fix_type, xccdf_id): | |||
There was a problem hiding this comment.
@mpreisler Good catch, I created PR #120
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.
atomic scan / oscapd-evaluate now supports
xccdf-idscanner argumentfor
configuration_compliancescan type. This way it is possible to selectany profile in datastream file using:
If
xccdf-idis not specified, profile is selected from the first XCCDFcomponent found in a datastream file.
Fixes #116