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.

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

introduce oscal cli validation and remove legacy example projects #601

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
813fb14
Updates to the SP 800-53 rev5.1.1 OSCAL catalog to fix backwards comp…
david-waltermire Dec 18, 2023
197aa99
syncing with the latest version in the NIST OSCAL content repo.
david-waltermire Feb 6, 2024
b5f530e
Updating generated baseline content based on source changes.
david-waltermire Feb 6, 2024
5ea710a
Apply suggestions from code review
david-waltermire Mar 7, 2024
8c9f8af
Merge pull request #540 from david-waltermire/sp800-53rev5-local-version
david-waltermire Mar 7, 2024
af7764f
Publishing auto-converted artifacts
oscalbuilder Mar 7, 2024
fe944d4
Add files via upload
jjahearn22 Mar 11, 2024
8bccf91
Merge pull request #567 from jjahearn22/master
david-waltermire Mar 11, 2024
8663e4b
Add files via upload
jjahearn22 Apr 16, 2024
3fe26c1
Add files via upload
jjahearn22 May 6, 2024
ac0a47f
Merge pull request #586 from jjahearn22/master
Rene2mt May 7, 2024
3c1389d
add cli-validation
wandmagic May 29, 2024
aced631
remove examples
wandmagic Jun 14, 2024
613b80a
validate baselines with oscal-CLI
wandmagic Jun 14, 2024
f705250
update dev dependencies
wandmagic Jun 14, 2024
218bdd1
run oscal CLI validation
wandmagic Jun 17, 2024
ef8492d
remove test-examples
wandmagic Jun 17, 2024
6aa1300
Merge pull request #1 from wandmagic/feature/oscal-cli-validation
wandmagic Jun 18, 2024
ed0ab0c
fix error when using local oscal
wandmagic Jun 20, 2024
38aef84
introduce validation of distribution artifacts
wandmagic Jun 20, 2024
9cbd2a7
improve oscal validation workflow
wandmagic Jun 20, 2024
137436b
Update Makefile
wandmagic Jun 20, 2024
a2a140d
Update runOscalcliValidation.yml
wandmagic Jun 20, 2024
cd8ee01
Update runOscalcliValidation.yml
wandmagic Jun 20, 2024
55bc655
Update runOscalcliValidation.yml
wandmagic Jun 20, 2024
c3cdde7
Update Makefile
wandmagic Jun 20, 2024
ce692b7
Update .github/workflows/runOscalcliValidation.yml
wandmagic Jun 21, 2024
c2dddb0
use temurin
wandmagic Jun 21, 2024
ea69a1f
simplify tests
wandmagic Jun 21, 2024
5d533b7
Merge pull request #3 from GSA/feature/external-constraints
wandmagic Jun 25, 2024
879eb23
Updates to the SP 800-53 rev5.1.1 OSCAL catalog to fix backwards comp…
david-waltermire Dec 18, 2023
61a8844
syncing with the latest version in the NIST OSCAL content repo.
david-waltermire Feb 6, 2024
b7f93ee
Updating generated baseline content based on source changes.
david-waltermire Feb 6, 2024
49446ac
Apply suggestions from code review
david-waltermire Mar 7, 2024
1376ea4
Publishing auto-converted artifacts
oscalbuilder Mar 7, 2024
96551a9
Add files via upload
jjahearn22 Mar 11, 2024
d7da232
Add files via upload
jjahearn22 Apr 16, 2024
75e465c
Add files via upload
jjahearn22 May 6, 2024
4679e51
add cli-validation
wandmagic May 29, 2024
a52a0e4
remove examples
wandmagic Jun 14, 2024
7dff17a
validate baselines with oscal-CLI
wandmagic Jun 14, 2024
996225b
update dev dependencies
wandmagic Jun 14, 2024
cb98085
run oscal CLI validation
wandmagic Jun 17, 2024
fbe1936
remove test-examples
wandmagic Jun 17, 2024
1f2d12c
fix error when using local oscal
wandmagic Jun 20, 2024
817c195
introduce validation of distribution artifacts
wandmagic Jun 20, 2024
393724c
improve oscal validation workflow
wandmagic Jun 20, 2024
103b360
Update Makefile
wandmagic Jun 20, 2024
fe78c86
Update runOscalcliValidation.yml
wandmagic Jun 20, 2024
c9bb8d2
Update runOscalcliValidation.yml
wandmagic Jun 20, 2024
9fba6d0
Update runOscalcliValidation.yml
wandmagic Jun 20, 2024
d2e5397
Update Makefile
wandmagic Jun 20, 2024
a3b876e
Update .github/workflows/runOscalcliValidation.yml
wandmagic Jun 21, 2024
9a450d5
use temurin
wandmagic Jun 21, 2024
f3fe6b6
simplify tests
wandmagic Jun 21, 2024
c68a65d
initial commit of OSCAL and FedRAMP-specific OSCAL external constrain…
david-waltermire Jun 19, 2024
6d3ace2
Added formal-names and descriptions to constraints.
david-waltermire Jun 21, 2024
d012c84
enable output validation
wandmagic Jun 27, 2024
0940115
Merge branch 'feature/oscal-cli-validation' of https://github.com/wan…
wandmagic Jun 27, 2024
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
38 changes: 38 additions & 0 deletions .github/workflows/runOscalcliValidation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Run OSCAL CLI Validation

on:
pull_request:
branches:
- main
- develop
- release/* # for gitflow
- feature/* # also for gitflow
workflow_dispatch: # Keeps the manual trigger option

jobs:
run-oscal-cli-validation:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
with:
submodules: 'recursive'

- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- name: Validate XML SRC files
run: make validate-by-cli

- name: Validate XML DIST files
run: make validate-by-cli FORMAT=xml

# - name: Validate JSON files
# run: make validate-by-cli FORMAT=json

# - name: Validate YAML files
# run: make validate-by-cli FORMAT=yaml
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ src/validations/lib/**.jar
src/validations/report
src/validations/src/ssp.xsl
src/validations/target
oscal-cli
utils
/node_modules

# XSpec reports (from OxygenXML XSpec use)
src/validations/test/rules/poam-result.html
Expand All @@ -31,3 +33,4 @@ src/validations/test/rules/rev5/ssp-result.html
src/validations/test/rules/rev4/ssp-result.html
src/validations/test/rules/rev5/poam-result.html
src/validations/test/rules/rev5/sar-result.html

3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ help:

# Most of the real work of the build is in sub-project Makefiles.
include src/content/module.mk
include src/examples/module.mk
include src/validations/module.mk
include src/web/module.mk

Expand All @@ -24,7 +23,7 @@ clean-dist: ## Clean non-RCS-tracked dist files
@echo "Cleaning dist..."
git clean -xfd dist

test: test-validations test-web test-examples ## Test all
test: validate-by-cli# Validate src xml Content

build: build-validations build-web dist ## Build all artifacts and copy into dist directory
# Copy validations
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"catalog": {
"uuid": "6bf8df58-1df7-4e50-8801-4563aee859b8",
"uuid": "bb77868b-4a08-4677-8f3a-67d9b3c46d38",
"metadata": {
"title": "FedRAMP Rev 4 High Baseline",
"published": "2021-02-05T00:00:00.000-04:00",
"last-modified": "2024-01-19T14:47:40.579972-05:00",
"last-modified": "2024-03-07T07:53:34.410816-05:00",
"version": "fedramp1.1.1-oscal1.0.4",
"oscal-version": "1.0.4",
"links": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"catalog": {
"uuid": "6bf8df58-1df7-4e50-8801-4563aee859b8",
"uuid": "bb77868b-4a08-4677-8f3a-67d9b3c46d38",
"metadata": {
"title": "FedRAMP Rev 4 High Baseline",
"published": "2021-02-05T00:00:00.000-04:00",
"last-modified": "2024-01-19T14:47:40.579972-05:00",
"last-modified": "2024-03-07T07:53:34.410816-05:00",
"version": "fedramp1.1.1-oscal1.0.4",
"oscal-version": "1.0.4",
"links": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"catalog": {
"uuid": "33ae3fc4-f730-4434-9254-84d8fdb7f1f7",
"uuid": "0ef04c26-728d-4a69-849b-44a5dc27f253",
"metadata": {
"title": "FedRAMP Rev 4 Tailored Low Impact Software as a Service (LI-SaaS) Baseline",
"published": "2021-02-05T00:00:00.000-04:00",
"last-modified": "2024-01-19T14:48:18.023882-05:00",
"last-modified": "2024-03-07T07:54:13.261804-05:00",
"version": "fedramp1.1.1-oscal1.0.4",
"oscal-version": "1.0.4",
"links": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"catalog": {
"uuid": "33ae3fc4-f730-4434-9254-84d8fdb7f1f7",
"uuid": "0ef04c26-728d-4a69-849b-44a5dc27f253",
"metadata": {
"title": "FedRAMP Rev 4 Tailored Low Impact Software as a Service (LI-SaaS) Baseline",
"published": "2021-02-05T00:00:00.000-04:00",
"last-modified": "2024-01-19T14:48:18.023882-05:00",
"last-modified": "2024-03-07T07:54:13.261804-05:00",
"version": "fedramp1.1.1-oscal1.0.4",
"oscal-version": "1.0.4",
"links": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"catalog": {
"uuid": "5e4a28b7-f43d-455b-b78e-1bd2888d29d5",
"uuid": "e52255ac-769d-4351-a740-b10460cdbbc1",
"metadata": {
"title": "FedRAMP Rev 4 Low Baseline",
"published": "2021-02-05T00:00:00.000-04:00",
"last-modified": "2024-01-19T14:48:31.936884-05:00",
"last-modified": "2024-03-07T07:54:27.562625-05:00",
"version": "fedramp1.1.1-oscal1.0.4",
"oscal-version": "1.0.4",
"links": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"catalog": {
"uuid": "5e4a28b7-f43d-455b-b78e-1bd2888d29d5",
"uuid": "e52255ac-769d-4351-a740-b10460cdbbc1",
"metadata": {
"title": "FedRAMP Rev 4 Low Baseline",
"published": "2021-02-05T00:00:00.000-04:00",
"last-modified": "2024-01-19T14:48:31.936884-05:00",
"last-modified": "2024-03-07T07:54:27.562625-05:00",
"version": "fedramp1.1.1-oscal1.0.4",
"oscal-version": "1.0.4",
"links": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"catalog": {
"uuid": "cc21c27a-43bf-4707-9e26-2ee5e4062d4f",
"uuid": "60d993b9-3ae7-4b3d-9b5f-c30f81bf1659",
"metadata": {
"title": "FedRAMP Rev 4 Moderate Baseline",
"published": "2021-02-05T00:00:00.000-04:00",
"last-modified": "2024-01-19T14:48:54.209931-05:00",
"last-modified": "2024-03-07T07:54:49.877548-05:00",
"version": "fedramp1.1.1-oscal1.0.4",
"oscal-version": "1.0.4",
"links": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"catalog": {
"uuid": "cc21c27a-43bf-4707-9e26-2ee5e4062d4f",
"uuid": "60d993b9-3ae7-4b3d-9b5f-c30f81bf1659",
"metadata": {
"title": "FedRAMP Rev 4 Moderate Baseline",
"published": "2021-02-05T00:00:00.000-04:00",
"last-modified": "2024-01-19T14:48:54.209931-05:00",
"last-modified": "2024-03-07T07:54:49.877548-05:00",
"version": "fedramp1.1.1-oscal1.0.4",
"oscal-version": "1.0.4",
"links": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
uuid="6bf8df58-1df7-4e50-8801-4563aee859b8">
uuid="bb77868b-4a08-4677-8f3a-67d9b3c46d38">
<metadata>
<title>FedRAMP Rev 4 High Baseline</title>
<published>2021-02-05T00:00:00.000-04:00</published>
<last-modified>2024-01-19T14:47:40.579972-05:00</last-modified>
<last-modified>2024-03-07T07:53:34.410816-05:00</last-modified>
<version>fedramp1.1.1-oscal1.0.4</version>
<oscal-version>1.0.4</oscal-version>
<link rel="resolution-source" href="FedRAMP_rev4_HIGH-baseline_profile.xml"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
uuid="33ae3fc4-f730-4434-9254-84d8fdb7f1f7">
uuid="0ef04c26-728d-4a69-849b-44a5dc27f253">
<metadata>
<title>FedRAMP Rev 4 Tailored Low Impact Software as a Service (LI-SaaS) Baseline</title>
<published>2021-02-05T00:00:00.000-04:00</published>
<last-modified>2024-01-19T14:48:18.023882-05:00</last-modified>
<last-modified>2024-03-07T07:54:13.261804-05:00</last-modified>
<version>fedramp1.1.1-oscal1.0.4</version>
<oscal-version>1.0.4</oscal-version>
<link rel="resolution-source"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
uuid="5e4a28b7-f43d-455b-b78e-1bd2888d29d5">
uuid="e52255ac-769d-4351-a740-b10460cdbbc1">
<metadata>
<title>FedRAMP Rev 4 Low Baseline</title>
<published>2021-02-05T00:00:00.000-04:00</published>
<last-modified>2024-01-19T14:48:31.936884-05:00</last-modified>
<last-modified>2024-03-07T07:54:27.562625-05:00</last-modified>
<version>fedramp1.1.1-oscal1.0.4</version>
<oscal-version>1.0.4</oscal-version>
<link rel="resolution-source" href="FedRAMP_rev4_LOW-baseline_profile.xml"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
uuid="cc21c27a-43bf-4707-9e26-2ee5e4062d4f">
uuid="60d993b9-3ae7-4b3d-9b5f-c30f81bf1659">
<metadata>
<title>FedRAMP Rev 4 Moderate Baseline</title>
<published>2021-02-05T00:00:00.000-04:00</published>
<last-modified>2024-01-19T14:48:54.209931-05:00</last-modified>
<last-modified>2024-03-07T07:54:49.877548-05:00</last-modified>
<version>fedramp1.1.1-oscal1.0.4</version>
<oscal-version>1.0.4</oscal-version>
<link rel="resolution-source"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
catalog:
uuid: 6bf8df58-1df7-4e50-8801-4563aee859b8
uuid: bb77868b-4a08-4677-8f3a-67d9b3c46d38
metadata:
title: FedRAMP Rev 4 High Baseline
published: 2021-02-05T00:00:00.000-04:00
last-modified: 2024-01-19T14:47:40.579972-05:00
last-modified: 2024-03-07T07:53:34.410816-05:00
version: fedramp1.1.1-oscal1.0.4
oscal-version: 1.0.4
links:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
catalog:
uuid: 33ae3fc4-f730-4434-9254-84d8fdb7f1f7
uuid: 0ef04c26-728d-4a69-849b-44a5dc27f253
metadata:
title: FedRAMP Rev 4 Tailored Low Impact Software as a Service (LI-SaaS) Baseline
published: 2021-02-05T00:00:00.000-04:00
last-modified: 2024-01-19T14:48:18.023882-05:00
last-modified: 2024-03-07T07:54:13.261804-05:00
version: fedramp1.1.1-oscal1.0.4
oscal-version: 1.0.4
links:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
catalog:
uuid: 5e4a28b7-f43d-455b-b78e-1bd2888d29d5
uuid: e52255ac-769d-4351-a740-b10460cdbbc1
metadata:
title: FedRAMP Rev 4 Low Baseline
published: 2021-02-05T00:00:00.000-04:00
last-modified: 2024-01-19T14:48:31.936884-05:00
last-modified: 2024-03-07T07:54:27.562625-05:00
version: fedramp1.1.1-oscal1.0.4
oscal-version: 1.0.4
links:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
catalog:
uuid: cc21c27a-43bf-4707-9e26-2ee5e4062d4f
uuid: 60d993b9-3ae7-4b3d-9b5f-c30f81bf1659
metadata:
title: FedRAMP Rev 4 Moderate Baseline
published: 2021-02-05T00:00:00.000-04:00
last-modified: 2024-01-19T14:48:54.209931-05:00
last-modified: 2024-03-07T07:54:49.877548-05:00
version: fedramp1.1.1-oscal1.0.4
oscal-version: 1.0.4
links:
Expand Down
Loading