Skip to content

Commit

Permalink
Merge pull request GSA#530 from GSA/rev5-sar-revise-other-than-satisf…
Browse files Browse the repository at this point in the history 
…ied-validations-issue-481

Rev 5 SAR - revise other-than-satisfied validations (issue 481)
  • Loading branch information
@dimitri-zhurkin-vitg
dimitri-zhurkin-vitg authored Nov 16, 2023
2 parents 3d3be5f + 1004b5d commit adeb09a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ src/validations/test/rules/xspec
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
4 changes: 2 additions & 2 deletions src/validations/rules/rev5/sar.sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@

<sch:let
name="pl-2-other-than-satisfied-findings"
value="oscal:finding/oscal:target[@type = 'objective-id'][oscal:status ne 'satisfied'][matches(@target-id, '^pl-2\.')]/@target-id" />
value="oscal:finding/oscal:target[@type = 'objective-id'][oscal:status eq 'not-satisfied'][matches(@target-id, '^pl-2\.')]/@target-id" />

<sch:let
name="pl-2-profile-objectives"
Expand Down Expand Up @@ -511,7 +511,7 @@

<sch:let
name="satisfaction-status"
value="'satisfied', 'other-than-satisfied'" />
value="'satisfied', 'not-satisfied'" />
<sch:assert
diagnostics="has-satisfaction-status-diagnostic"
doc:guide-reference="Guide to OSCAL-based FedRAMP Security Assessment Results (SAR) §4.3"
Expand Down
12 changes: 6 additions & 6 deletions src/validations/test/rules/rev5/sar.xspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@
target-id="pl-2.a.1_obj"
type="objective-id">
<status
state="other-than-satisfied" />
state="not-satisfied" />
</target>
</finding>
</result>
Expand All @@ -1108,7 +1108,7 @@
target-id="pl-2.a.1_obj"
type="objective-id">
<status
state="other-than-satisfied" />
state="not-satisfied" />
</target>
</finding>
<finding
Expand All @@ -1117,7 +1117,7 @@
target-id="pl-2.a.2_obj"
type="objective-id">
<status
state="other-than-satisfied" />
state="not-satisfied" />
</target>
</finding>
</result>
Expand Down Expand Up @@ -1811,7 +1811,7 @@
target-id="ac-1.a.1_obj.1"
type="objective-id">
<status
state="other-than-satisfied" />
state="not-satisfied" />
</target>
</finding>
</result>
Expand Down Expand Up @@ -1856,7 +1856,7 @@
target-id="ac-1.a.1_obj.1"
type="objective-id">
<status
state="other-than-satisfied" />
state="satisfied" />
</target>
</finding>
</result>
Expand All @@ -1879,7 +1879,7 @@
target-id="ac-1.a.1_obj.1"
type="objective-id">
<status
state="not-satisfied" />
state="other-than-satisfied" />
</target>
</finding>
</result>
Expand Down

0 comments on commit adeb09a

Please sign in to comment.