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

feat: allow use of OpenSCAP result files in task xccdf_result_to_oscal_ar #1411

Merged
merged 2 commits into from
Dec 11, 2023
Merged

feat: allow use of OpenSCAP result files in task xccdf_result_to_oscal_ar #1411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7e4af8
feat: Allow use of OpenSCAP result files in task xccdf_result_to_osca…
Mab879 Dec 7, 2023
c7d7a95
Add tests for OpenSCAP results files for task xccdf_result_to_oscal_a…
Mab879 Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions tests/data/tasks/xccdf/input-oscap-arf-results/results_arf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<arf:asset-report-collection xmlns:arf="http://scap.nist.gov/schema/asset-reporting-format/1.1"
xmlns:core="http://scap.nist.gov/schema/reporting-core/1.1"
xmlns:ai="http://scap.nist.gov/schema/asset-identification/1.1">
<arf:reports>
<arf:report id="xccdf1">
<arf:content>
<TestResult xmlns="http://checklists.nist.gov/xccdf/1.2" id="xccdf_org.open-scap_testresult_xccdf_org.ssgproject.content_profile_cis" start-time="2021-06-08T02:35:55+00:00" end-time="2021-06-08T02:54:51+00:00" version="0.1.57" test-system="cpe:/a:redhat:openscap:1.3.3">
<benchmark href="/content/ssg-rhel7-ds.xml" id="xccdf_org.ssgproject.content_benchmark_RHEL-7"/>
<title>OSCAP Scan Result</title>
<profile idref="xccdf_org.ssgproject.content_profile_cis"/>
<target>kube-c18ler8d06m877hrn7jg-roks8-default-00000319.iks.mycorp</target>
<target-facts>
<fact name="urn:xccdf:fact:identifier" type="string">chroot:///host</fact>
<fact name="urn:xccdf:fact:scanner:name" type="string">OpenSCAP</fact>
<fact name="urn:xccdf:fact:scanner:version" type="string">1.3.3</fact>
</target-facts>
<target-id-ref system="http://scap.nist.gov/schema/asset-identification/1.1" name="asset0" href=""/>
<platform idref="cpe:/a:pam"/>
<platform idref="cpe:/o:redhat:enterprise_linux:7::workstation"/>
<platform idref="cpe:/o:redhat:enterprise_linux:7::client"/>
<platform idref="cpe:/o:redhat:enterprise_linux:7::server"/>
<platform idref="cpe:/a:grub2"/>
<platform idref="cpe:/o:redhat:enterprise_linux:7::computenode"/>
<platform idref="cpe:/o:redhat:enterprise_linux:7"/>
<platform idref="cpe:/a:login_defs"/>
<platform idref="cpe:/a:non-uefi"/>
<platform idref="cpe:/a:machine"/>
<platform idref="cpe:/a:yum"/>

<rule-result idref="xccdf_org.ssgproject.content_rule_prefer_64bit_os" role="full" time="2021-06-08T02:35:55+00:00" severity="medium" weight="1.000000">
<result>notselected</result>
<ident system="https://nvd.nist.gov/cce/index.cfm">CCE-83691-6</ident>
</rule-result>
<rule-result idref="xccdf_org.ssgproject.content_rule_disable_prelink" role="full" time="2021-06-08T02:35:55+00:00" severity="medium" weight="1.000000">
<result>pass</result>
<ident system="https://nvd.nist.gov/cce/index.cfm">CCE-27078-5</ident>
<check system="http://oval.mitre.org/XMLSchema/oval-definitions-5">
<check-content-ref name="oval:ssg-disable_prelink:def:1" href="#oval0"/>
</check>
</rule-result>

<score system="urn:xccdf:scoring:default" maximum="100.000000">74.713684</score>
</TestResult>

</arf:content>
</arf:report>
</arf:reports>
</arf:asset-report-collection>
39 changes: 39 additions & 0 deletions tests/data/tasks/xccdf/input-oscap-results/results.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<Benchmark xmlns="http://checklists.nist.gov/xccdf/1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="xccdf_org.ssgproject.content_benchmark_FEDORA" resolved="1" xml:lang="en-US" style="SCAP_1.2">
<TestResult xmlns="http://checklists.nist.gov/xccdf/1.2" id="xccdf_org.open-scap_testresult_xccdf_org.ssgproject.content_profile_cis" start-time="2021-06-08T02:35:55+00:00" end-time="2021-06-08T02:54:51+00:00" version="0.1.57" test-system="cpe:/a:redhat:openscap:1.3.3">
<benchmark href="/content/ssg-rhel7-ds.xml" id="xccdf_org.ssgproject.content_benchmark_RHEL-7"/>
<title>OSCAP Scan Result</title>
<profile idref="xccdf_org.ssgproject.content_profile_cis"/>
<target>kube-c18ler8d06m877hrn7jg-roks8-default-00000319.iks.mycorp</target>
<target-facts>
<fact name="urn:xccdf:fact:identifier" type="string">chroot:///host</fact>
<fact name="urn:xccdf:fact:scanner:name" type="string">OpenSCAP</fact>
<fact name="urn:xccdf:fact:scanner:version" type="string">1.3.3</fact>
</target-facts>
<target-id-ref system="http://scap.nist.gov/schema/asset-identification/1.1" name="asset0" href=""/>
<platform idref="cpe:/a:pam"/>
<platform idref="cpe:/o:redhat:enterprise_linux:7::workstation"/>
<platform idref="cpe:/o:redhat:enterprise_linux:7::client"/>
<platform idref="cpe:/o:redhat:enterprise_linux:7::server"/>
<platform idref="cpe:/a:grub2"/>
<platform idref="cpe:/o:redhat:enterprise_linux:7::computenode"/>
<platform idref="cpe:/o:redhat:enterprise_linux:7"/>
<platform idref="cpe:/a:login_defs"/>
<platform idref="cpe:/a:non-uefi"/>
<platform idref="cpe:/a:machine"/>
<platform idref="cpe:/a:yum"/>

<rule-result idref="xccdf_org.ssgproject.content_rule_prefer_64bit_os" role="full" time="2021-06-08T02:35:55+00:00" severity="medium" weight="1.000000">
<result>notselected</result>
<ident system="https://nvd.nist.gov/cce/index.cfm">CCE-83691-6</ident>
</rule-result>
<rule-result idref="xccdf_org.ssgproject.content_rule_disable_prelink" role="full" time="2021-06-08T02:35:55+00:00" severity="medium" weight="1.000000">
<result>pass</result>
<ident system="https://nvd.nist.gov/cce/index.cfm">CCE-27078-5</ident>
<check system="http://oval.mitre.org/XMLSchema/oval-definitions-5">
<check-content-ref name="oval:ssg-disable_prelink:def:1" href="#oval0"/>
</check>
</rule-result>
<score system="urn:xccdf:scoring:default" maximum="100.000000">74.713684</score>
</TestResult>
</Benchmark>
165 changes: 165 additions & 0 deletions tests/data/tasks/xccdf/output-oscap-arf-results/results_arf.oscal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
{
"results": [
{
"uuid": "56666738-0f9a-4e38-9aac-c0fad00a5821",
"title": "XCCDF",
"description": "XCCDF Scan Results",
"start": "2021-06-08T02:35:55+00:00",
"end": "2021-06-08T02:35:55+00:00",
"local-definitions": {
"components": [
{
"uuid": "56666738-0f9a-4e38-9aac-c0fad00a5821",
"type": "Service",
"title": "rhel7",
"description": "rhel7",
"status": {
"state": "operational"
}
}
],
"inventory-items": [
{
"uuid": "56666738-0f9a-4e38-9aac-c0fad00a5821",
"description": "inventory",
"props": [
{
"name": "target",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP",
"value": "kube-c18ler8d06m877hrn7jg-roks8-default-00000319.iks.mycorp"
},
{
"name": "target_type",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP",
"value": "rhel7"
}
],
"implemented-components": [
{
"component-uuid": "56666738-0f9a-4e38-9aac-c0fad00a5821"
}
]
}
],
"assessment-assets": {
"components": [
{
"uuid": "56666738-0f9a-4e38-9aac-c0fad00a5821",
"type": "Validator",
"title": "OpenSCAP",
"description": "OpenSCAP",
"props": [
{
"name": "scanner_name",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP",
"value": "OpenSCAP"
},
{
"name": "scanner_version",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP",
"value": "1.3.3"
},
{
"name": "version",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP"
},
{
"name": "severity",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP",
"value": "medium"
},
{
"name": "weight",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP",
"value": "1.000000"
},
{
"name": "benchmark_id",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP",
"value": "xccdf_org.ssgproject.content_benchmark_RHEL-7"
},
{
"name": "benchmark_href",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP",
"value": "/content/ssg-rhel7-ds.xml"
},
{
"name": "id",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP",
"value": "xccdf_org.open-scap_testresult_xccdf_org.ssgproject.content_profile_cis"
}
],
"status": {
"state": "operational"
}
}
],
"assessment-platforms": [
{
"uuid": "56666738-0f9a-4e38-9aac-c0fad00a5821"
}
]
}
},
"reviewed-controls": {
"control-selections": [
{}
]
},
"observations": [
{
"uuid": "56666738-0f9a-4e38-9aac-c0fad00a5821",
"description": "xccdf_org.ssgproject.content_rule_prefer_64bit_os",
"props": [
{
"name": "idref",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP",
"value": "xccdf_org.ssgproject.content_rule_prefer_64bit_os"
},
{
"name": "result",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP",
"value": "notselected"
}
],
"methods": [
"TEST-AUTOMATED"
],
"subjects": [
{
"subject-uuid": "56666738-0f9a-4e38-9aac-c0fad00a5821",
"type": "inventory-item"
}
],
"collected": "2023-11-30T23:00:03+00:00"
},
{
"uuid": "56666738-0f9a-4e38-9aac-c0fad00a5821",
"description": "xccdf_org.ssgproject.content_rule_disable_prelink",
"props": [
{
"name": "idref",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP",
"value": "xccdf_org.ssgproject.content_rule_disable_prelink"
},
{
"name": "result",
"ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/OpenSCAP",
"value": "pass"
}
],
"methods": [
"TEST-AUTOMATED"
],
"subjects": [
{
"subject-uuid": "56666738-0f9a-4e38-9aac-c0fad00a5821",
"type": "inventory-item"
}
],
"collected": "2023-11-30T23:00:03+00:00"
}
]
}
]
}
Loading
Loading