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.

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

818 fix data center #819

Merged
merged 13 commits into from
Oct 25, 2024
Merged

818 fix data center #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a605f2b
fixed data center property arguments in ssp-all-VALID
kyhu65867 Oct 24, 2024
5e826f8
changed data-center constraints to point to name = type, value = data…
kyhu65867 Oct 24, 2024
e5ac66c
made unit tests much more specific to their file name, AKA only one e…
kyhu65867 Oct 24, 2024
4127747
Update src/validations/constraints/content/ssp-data-center-US-INVALID…
kyhu65867 Oct 24, 2024
a21566f
Update src/validations/constraints/content/ssp-data-center-alternate-…
kyhu65867 Oct 24, 2024
78e54c9
Update src/validations/constraints/content/ssp-data-center-country-co…
kyhu65867 Oct 24, 2024
2545939
Update src/validations/constraints/content/ssp-data-center-primary-IN…
kyhu65867 Oct 24, 2024
8e57658
Update src/validations/constraints/content/ssp-data-center-primary-IN…
kyhu65867 Oct 24, 2024
8595809
Update src/validations/constraints/content/ssp-data-center-US-INVALID…
kyhu65867 Oct 24, 2024
90c2952
Update src/validations/constraints/fedramp-external-constraints.xml
kyhu65867 Oct 24, 2024
b2c4c20
Update src/validations/constraints/fedramp-external-constraints.xml
kyhu65867 Oct 24, 2024
61b8f6c
Update src/validations/constraints/fedramp-external-constraints.xml
kyhu65867 Oct 24, 2024
30016de
Update src/validations/constraints/content/ssp-data-center-count-INVA…
kyhu65867 Oct 24, 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
4 changes: 2 additions & 2 deletions src/validations/constraints/content/ssp-all-VALID.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
<address >
<country>US</country>
</address>
<prop name='data-center' value='dc-zone-1' class='primary'/>
<prop name="type" value="data-center" class="primary"/>
</location>
<location uuid="11111112-0000-4000-9000-000000000003">
<address >
<country>US</country>
</address>
<prop name='data-center' value='aws-us-west-1' class='alternate'/>
<prop name="type" value="data-center" class="alternate"/>
</location>
<party uuid="11111111-0000-4000-9000-000000000001" type="organization">
<name>Example Organization</name>
Expand Down
8 changes: 7 additions & 1 deletion src/validations/constraints/content/ssp-data-center-US-INVALID.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@
<address >
<country>WRONG</country>
</address>
<prop name='data-center' value='dc-zone-1' class='tertiary'/>
<prop name="type" value="data-center" class="primary" />
</location>
<location uuid="11291112-0070-4000-9001-000890000009">
<address >
<country>WRONG</country>
</address>
<prop name="type" value="data-center" class="alternate" />
</location>
</metadata>
</system-security-plan>
10 changes: 8 additions & 2 deletions src/validations/constraints/content/ssp-data-center-alternate-INVALID.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@
xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 https://github.com/usnistgov/OSCAL/releases/download/v1.1.2/oscal_ssp_schema.xsd"
uuid="12345678-1234-4321-8765-123456789012">
<metadata>
<location uuid="11155112-0340-4000-9001-000006500009">
<address >
<country>US</country>
</address>
<prop name='type' value='data-center' class='primary'/>
</location>
<location uuid="11111112-0000-4000-9001-000000000009">
<address >
<country>WRONG</country>
<country>US</country>
</address>
<prop name='data-center' value='dc-zone-1' class='tertiary'/>
<prop name="type" value="data-center" class="tertiary" />
</location>
</metadata>
</system-security-plan>
6 changes: 3 additions & 3 deletions src/validations/constraints/content/ssp-data-center-count-INVALID.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
uuid="12345678-1234-4321-8765-123456789012">
<metadata>
<location uuid="11111112-0000-4000-9001-000000000009">
<address >
<country>WRONG</country>
<address>
<country>US</country>
</address>
<prop name='data-center' value='dc-zone-1' class='tertiary'/>
<prop name="type" value="data-center" class="tertiary" />
</location>
</metadata>
</system-security-plan>
9 changes: 7 additions & 2 deletions src/validations/constraints/content/ssp-data-center-country-code-INVALID.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@
uuid="12345678-1234-4321-8765-123456789012">
<metadata>
<location uuid="11111112-0000-4000-9001-000000000009">
<address >
<address>
</address>
<prop name='data-center' value='dc-zone-1' class='tertiary'/>
<prop name='type' value='data-center' class='primary'/>
</location>
<location uuid="11117112-0080-4000-9001-001230000009">
<address>
</address>
<prop name="type" value="data-center" class="alternate" />
</location>
</metadata>
</system-security-plan>
10 changes: 8 additions & 2 deletions src/validations/constraints/content/ssp-data-center-primary-INVALID.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,15 @@
<metadata>
<location uuid="11111112-0000-4000-9001-000000000009">
<address >
<country>WRONG</country>
<country>US</country>
</address>
<prop name='data-center' value='dc-zone-1' class='tertiary'/>
<prop name="type" value="data-center" class="tertiary" />
</location>
<location uuid="11143112-0000-4320-9001-000066700009">
<address >
<country>US</country>
</address>
<prop name="type" value="data-center" class="alternate'"/>
</location>
</metadata>
</system-security-plan>
9 changes: 6 additions & 3 deletions src/validations/constraints/fedramp-external-constraints.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,16 @@
<context>
<metapath target="/system-security-plan/metadata"/>
<constraints>
<expect id="data-center-count" target="." test="count(/location/prop[@name eq 'data-center']) &gt; 1">
<expect id="data-center-count" target="." test="count(/location/prop[@name eq 'type'][@value eq 'data-center']) &gt; 1">
kyhu65867 marked this conversation as resolved.
Show resolved Hide resolved
<prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#data-centers" />
<message>There must be at least two (2) data centers listed.</message>
</expect>
<expect id="data-center-primary" target="." test="count(/location/prop[@name eq 'data-center'][@class eq 'primary']) = 1">
<expect id="data-center-primary" target="." test="count(/location/prop[@name eq 'type'][@value eq 'data-center'][@class eq 'primary']) = 1">
kyhu65867 marked this conversation as resolved.
Show resolved Hide resolved
<prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#data-centers" />
<message>There must be a single primary data center.</message>
</expect>
<expect id="data-center-alternate" target="." test="count(/location/prop[@name eq 'data-center'][@class eq 'alternate']) &gt; 0">
<expect id="data-center-alternate" target="." test="count(/location/prop[@name eq 'type'][@value eq 'data-center'][@class eq 'alternate']) &gt; 0">
kyhu65867 marked this conversation as resolved.
Show resolved Hide resolved
<prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#data-centers" />
<message>There must be one or more alternate data center(s).</message>
</expect>
<expect id="role-defined-system-owner" target="." test="role[@id eq 'system-owner']" level="ERROR">
Expand Down
Loading