Skip to content
This repository has been archived by the owner on Dec 12, 2023. It is now read-only.

Compose single Schematron and XSpec documents #108

Merged
merged 26 commits into from
Jul 1, 2021

Conversation

GaryGapinski
Copy link
Collaborator

  • resources/validations/src/ssp.sch has Schematron
  • resources/validations/test/ssp.xspec has XSpec

- resources/validations/src/ssp.sch has Schematron
- resources/validations/test/ssp.xspec has XSpec
@GaryGapinski GaryGapinski self-assigned this Jun 22, 2021
@github-actions

This comment has been minimized.

- use global $fedramp-values variable
- change some assertion messages to affirmative
- attempt to minimize HTML Tidy's erroneous whitespace handling
- remove OBE TODOs
@github-actions

This comment has been minimized.

- use @pending rather than x:pending for system inventory unit tests
- make pending "when the media-type attribute lacks an allowed value " XSpec test
@github-actions

This comment has been minimized.

- change occurrences of SHOULD to should
- change "FIPS 140 validated products" to "FIPS 140 validated modules"
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@GaryGapinski GaryGapinski marked this pull request as ready for review June 24, 2021 13:11
- Change assertion statements to have a positive statement of the constraint
- Comment out dysfuntional doc-available() "resource-rlink-required" rule.
- Change sch:report role from "positive" to "information".
- Comment out informational sch:report items.
@github-actions

This comment has been minimized.

Copy link

@ohsh6o ohsh6o left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GaryGapinski, do we know what is going on with these test failures?

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

This will simplify the options in the UI.
@github-actions

This comment has been minimized.

- improve base64 regex
- add checklist references
@github-actions

This comment has been minimized.

- correct XSpec base64 context to be valid base64 encoded content
@github-actions

This comment has been minimized.

resources/validations/src/ssp.sch Outdated Show resolved Hide resolved
@github-actions

This comment has been minimized.

Copy link

@ohsh6o ohsh6o left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One last comment, the rules look generally solid, and I will more thoroughly review the tests (having looked at many of them briefly; I know some got supressed reasons), but can you confirmed you worked in the wording recommendations given by @rrkane10x? It seems maybe or maybe not. I spent a good time looking for obvious signs, but not sure these made it in.

https://docs.google.com/document/d/1vZLOEBSD9HL4LkEp1H_8yHfm1ON-kLLjG9LgPc_Xl0U/edit

We also have a follow up story to look into this in a more focused way in #97 anyway, but it is something we are going to need to be mindful of moving forward.

- Use indefinite article ahead of element/attribute names
- End assertion messages witha period.
- Correct typos.
- Remove "Section B" prefixes.
- Expand initialisms and acornyms
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@GaryGapinski GaryGapinski linked an issue Jun 28, 2021 that may be closed by this pull request
19 tasks
@github-actions

This comment has been minimized.

- fix one regex
- ensure sibling validation-reference and validation-details cite the same CMVP certificate
@github-actions

This comment has been minimized.

Copy link

@ohsh6o ohsh6o left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have one minor issue fixed, but other than that, this is good for now. Nice work.

Comment on lines 946 to 954
<sch:rule context="oscal:base | oscal:selected">
<sch:let name="fips-levels"
value="('fips-199-low', 'fips-199-moderate', 'fips-199-high')" />
<sch:assert diagnostics="cia-impact-has-approved-fips-categorization-diagnostic"
id="cia-impact-has-approved-fips-categorization"
role="error"
test=". = $fips-levels">A FedRAMP OSCAL SSP information-type confidentiality-, integrity-, or availability-impact base or
select element must have an approved value.</sch:assert>
</sch:rule>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we not be loading these from the FedRAMP values file?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I may have done this when looking at another L/M/H that was just low|moderate|high with and without initial capitalization. The most recent commit uses the external document.

@github-actions

This comment has been minimized.

@GaryGapinski GaryGapinski merged commit b55dade into master Jul 1, 2021
@GaryGapinski GaryGapinski deleted the single-sch-and-xspec branch July 1, 2021 03:01
@github-actions
Copy link

github-actions bot commented Jul 1, 2021

XSpec Test Results

    1 files  ±0      9 suites  ±0   0s ⏱️ ±0s
298 tests ±0  206 ✔️ ±0  92 💤 ±0  0 ❌ ±0 
300 runs  ±0  206 ✔️ ±0  94 💤 ±0  0 ❌ ±0 

Results for commit b55dade. ± Comparison against base commit b55dade.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants