Skip to content

Update OSCAL part names and subclass reqs into items #452

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

Open
puerco wants to merge 2 commits into
base: main
Choose a base branch
from
+46 −31
Open

Update OSCAL part names and subclass reqs into items #452

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
2161ab9
Bump oscal-club action to v2.0.2
puerco Dec 17, 2025
cd10236
Update oscal names and reclass ctls to items
puerco Dec 17, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/oscal-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
./go-oscal validate --input-file oscal-sample.json

- name: Validate Catalog with oscal-club/NIST CLI
uses: oscal-club/oscal-cli-action@1a210b84bc1fd6adf15c9cf0d46a51d15a3d8301 # v2.0.1
uses: oscal-club/oscal-cli-action@b5b0c80a1a158797bea4475d13d12c494b56019b # v2.0.2
with:
args: catalog validate oscal-sample.json

Expand Down
75 changes: 45 additions & 30 deletions cmd/pkg/baseline/generator_oscal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,50 +51,65 @@ func (g *Generator) ExportOSCAL(b *types.Baseline, w io.Writer) error {
Class: "OSPS",
Controls: nil,
ID: b.ControlFamilyIDs[family.Title],
Title: family.Description,
Parts: &[]oscal.Part{
{
Name: "overview",
Prose: family.Description,
},
},
Title: family.Title,
}

controls := []oscal.Control{}
for _, control := range family.Controls {
parts := []oscal.Part{}
// Create the new OSCAL control.
newOscalCtl := oscal.Control{
Class: b.ControlFamilyIDs[family.Title],
ID: control.Id,
Title: strings.TrimSpace(control.Id), // For some reason, control.Title is the full description
Links: &[]oscal.Link{
{
Href: fmt.Sprintf(controlHREF, VersionOSPS, strings.ToLower(control.Id)),
Rel: "canonical",
},
},
// The main prose of the control lives in the statement part
Parts: &[]oscal.Part{
{
ID: control.Id + "_smt",
Name: "statement",
Ns: OpenSSFNS,
Prose: control.Title,
},
{
ID: control.Id + "_obj",
Name: "objective",
Ns: OpenSSFNS,
Prose: control.Objective,
},
},
}

items := []oscal.Part{}
for _, ar := range control.AssessmentRequirements {
parts = append(parts, oscal.Part{
Class: control.Id,
items = append(items, oscal.Part{
ID: ar.Id,
Name: ar.Id,
Ns: "",
Name: "item",
Ns: OpenSSFNS,
Prose: ar.Text,
Title: ar.Id,
Parts: &[]oscal.Part{
{
ID: ar.Id + ".R",
Name: "recommendation",
Ns: OpenSSFNS,
ID: ar.Id + "_obj",
Name: "assessment-objective",
Prose: ar.Recommendation,
Links: &[]oscal.Link{
{
Href: fmt.Sprintf(controlHREF, VersionOSPS, ar.Id),
Rel: "canonical",
},
},
},
},
Prose: ar.Text,
Title: "",
})
}

newCtl := oscal.Control{
Class: b.ControlFamilyIDs[family.Title],
ID: control.Id,
Links: &[]oscal.Link{
{
Href: fmt.Sprintf(controlHREF, VersionOSPS, strings.ToLower(control.Id)),
Rel: "canonical",
},
},
Parts: &parts,
Title: strings.TrimSpace(control.Title),
}
controls = append(controls, newCtl)
(*newOscalCtl.Parts)[0].Parts = &items
controls = append(controls, newOscalCtl)
}

group.Controls = &controls
Expand Down
Loading