Skip to content
This repository was archived by the owner on Mar 20, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea/
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "OSCAL"]
path = OSCAL
url = https://github.com/usnistgov/OSCAL.git
[submodule "OSCAL-CLI"]
path = OSCAL-CLI
url = https://github.com/usnistgov/oscal-cli.git
1 change: 1 addition & 0 deletions .sdkmanrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java=19-open
2 changes: 1 addition & 1 deletion OSCAL
Submodule OSCAL updated 158 files
1 change: 1 addition & 0 deletions OSCAL-CLI
Submodule OSCAL-CLI added at b204ed
46 changes: 46 additions & 0 deletions Taskfile.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
version: "3"

vars:
PROJECT_ROOT:
sh: echo $PWD

env:
PROJECT_ROOT: "{{.PROJECT_ROOT}}"
OSCAL_CLI_BIN: "{{.PROJECT_ROOT}}/OSCAL-CLI/cli-core/target/cli-core-0.3.1-oscal-cli/bin"
CATALOGS_DIR: "{{.PROJECT_ROOT}}/src/catalogs"
MAPPINGS_DIR: "{{.PROJECT_ROOT}}/src/mappings"
OSCAL_XML_SCHEMA_DIR: "{{.PROJECT_ROOT}}/OSCAL/xml/schema"

tasks:
sub-init:
cmds:
- git submodule update --init --recursive
build-oscal-cli:
dir: OSCAL-CLI
cmds:
- mvn clean install
oscal-cli:
cmds:
- $OSCAL_CLI_BIN/oscal-cli {{.CLI_ARGS}}
convert-catalogs:
cmds:
- task oscal-cli -- catalog convert --overwrite --to json "$CATALOGS_DIR/xml/cis-controls-v8_OSCAL-1.0.xml" "$CATALOGS_DIR/json/cis-controls-v8_OSCAL-1.0.json"
- task oscal-cli -- catalog convert --overwrite --to yaml "$CATALOGS_DIR/xml/cis-controls-v8_OSCAL-1.0.xml" "$CATALOGS_DIR/yaml/cis-controls-v8_OSCAL-1.0.yaml"
convert-mappings:
cmds:
- task oscal-cli -- mapping-collection convert --overwrite --to json "$MAPPINGS_DIR/xml/CCM_CISControlsv8_Mapping.xml" "$MAPPINGS_DIR/json/CCM_CISControlsv8_Mapping.json"
- task oscal-cli -- mapping-collection convert --overwrite --to yaml "$MAPPINGS_DIR/xml/CCM_CISControlsv8_Mapping.xml" "$MAPPINGS_DIR/yaml/CCM_CISControlsv8_Mapping.yaml"
- task oscal-cli -- mapping-collection convert --overwrite --to json "$MAPPINGS_DIR/SP_800_53MOD_CISControlsv8_Mapping.xml" "$MAPPINGS_DIR/SP_800_53MOD_CISControlsv8_Mapping.json"
- task oscal-cli -- mapping-collection convert --overwrite --to yaml "$MAPPINGS_DIR/SP_800_53MOD_CISControlsv8_Mapping.xml" "$MAPPINGS_DIR/SP_800_53MOD_CISControlsv8_Mapping.yaml"
validate-catalogs:
cmds:
- xmllint --noout --schema "$OSCAL_XML_SCHEMA_DIR/oscal_catalog_schema.xsd" "$CATALOGS_DIR/xml/cis-controls-v8_OSCAL-1.0.xml"
# - task oscal-cli -- catalog validate --as xml "$CATALOGS_DIR/xml/cis-controls-v8_OSCAL-1.0.xml"
- task oscal-cli -- catalog validate --as json "$CATALOGS_DIR/json/cis-controls-v8_OSCAL-1.0.json"
- task oscal-cli -- catalog validate --as yaml "$CATALOGS_DIR/yaml/cis-controls-v8_OSCAL-1.0.yaml"
validate-mappings:
cmds:
- xmllint --noout --schema "$OSCAL_XML_SCHEMA_DIR/oscal_mapping_schema.xsd" "$MAPPINGS_DIR/xml/CCM_CISControlsv8_Mapping.xml"
- xmllint --noout --schema "$OSCAL_XML_SCHEMA_DIR/oscal_mapping_schema.xsd" "$MAPPINGS_DIR/SP_800_53MOD_CISControlsv8_Mapping.xml"
# - task oscal-cli -- mapping-collection validate --as xml "$MAPPINGS_DIR/xml/CCM_CISControlsv8_Mapping.xml"
# - task oscal-cli -- mapping-collection validate --as xml "$MAPPINGS_DIR/SP_800_53MOD_CISControlsv8_Mapping.xml"
6,061 changes: 6,061 additions & 0 deletions src/catalogs/json/cis-controls-v8_OSCAL-1.0.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/catalogs/xml/cis-controls-v8_OSCAL-1.0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<last-modified>2020-09-20T12:10:00.001-04:00</last-modified>
<version>8.0</version>
<oscal-version>1.0.4</oscal-version>
<prop name="keywords" value="contol, assessment"/>
<prop name="keywords" value="control, assessment"/>
<link rel="alternate" media-type="text/html"
href="https://controls-assessment-specification.readthedocs.io/en/stable/index.html"/>
</metadata>
Expand Down
Loading