Skip to content

Commit

Permalink
Grammar fixes to assessment-common metaschema (#1224)
Browse files Browse the repository at this point in the history 
Fixes #1193 (for `oscal_assessment-common_metaschema.xml` only)
  • Loading branch information
@guyzyl @david-waltermire
guyzyl authored and david-waltermire committed May 5, 2022
1 parent 2a90631 commit 18ccadd
Showing 1 changed file with 39 additions and 39 deletions.
78 changes: 39 additions & 39 deletions src/metaschema/oscal_assessment-common_metaschema.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<constraint>
<allowed-values target="part[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]">
<enum value="objective" deprecated="1.0.1">**(deprecated)** Use 'assessment-objective' instead.</enum>
<enum value="assessment" deprecated="1.0.1">**(deprecated)** Use 'assessment-method' instead</enum>
<enum value="assessment" deprecated="1.0.1">**(deprecated)** Use 'assessment-method' instead.</enum>
<enum value="assessment-objective">The part defines an assessment objective.</enum>
<enum value="assessment-method">The part defines an assessment method.</enum>
</allowed-values>
Expand Down Expand Up @@ -579,13 +579,13 @@
<field ref="remarks" in-xml="WITH_WRAPPER" min-occurs="0" max-occurs="1"/>
</model>
</define-assembly>

<define-flag name="subject-uuid" as-type="uuid" scope="local">
<formal-name>Subject Universally Unique Identifier Reference</formal-name>
<!-- Identifier Reference -->
<description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</description>
</define-flag>

<define-flag name="subject-type" as-type="token" scope="local">
<formal-name>Subject Universally Unique Identifier Reference Type</formal-name>
<description>Used to indicate the type of object pointed to by the <code>uuid-ref</code> within a subject.</description>
Expand All @@ -600,7 +600,7 @@
</allowed-values>
</constraint>
</define-flag>

<define-assembly name="subject-reference" scope="local">
<formal-name>Identifies the Subject</formal-name>
<!-- Identifier Reference -->
Expand Down Expand Up @@ -763,7 +763,7 @@
<allowed-values allow-other="yes">
<enum value="pass">The target system or system component satisfied all the conditions.</enum>
<enum value="fail">The target system or system component did not satisfy all the conditions.</enum>
<enum value="other">Some other event took place that is not a pass or a fail. </enum>
<enum value="other">Some other event took place that is not a pass or a fail.</enum>
</allowed-values>
</constraint>
<remarks>
Expand Down Expand Up @@ -877,11 +877,11 @@
</model>
</define-assembly>
<define-field name="collected" as-type="dateTime-with-timezone" min-occurs="1" max-occurs="1">
<formal-name>collected field</formal-name>
<formal-name>Collected Field</formal-name>
<description>Date/time stamp identifying when the finding information was collected.</description>
</define-field>
<define-field name="expires" as-type="dateTime-with-timezone" min-occurs="0" max-occurs="1">
<formal-name>expires field</formal-name>
<formal-name>Expires Field</formal-name>
<description>Date/time identifying when the finding information is out-of-date and no longer valid. Typically used with continuous assessment scenarios.</description>
</define-field>
<field ref="remarks" in-xml="WITH_WRAPPER" min-occurs="0" max-occurs="1"/>
Expand Down Expand Up @@ -1335,20 +1335,20 @@
<enum value="cve-id">An identifier managed by the CVE program (see <a>https://cve.mitre.org/</a>).</enum>
</allowed-values>
<allowed-values target="(.)[@system='http://www.first.org/cvss/v2.0']/@name">
<enum value="access-vector" >Base: Access Vector</enum>
<enum value="access-complexity" >Base: Access Complexity</enum>
<enum value="authentication" >Base: Authentication</enum>
<enum value="confidentiality-impact" >Base: Confidentiality Impact</enum>
<enum value="integrity-impact" >Base: Integrity Impact</enum>
<enum value="availability-impact" >Base: Availability Impact</enum>
<enum value="exploitability" >Temporal: Exploitability</enum>
<enum value="remediation-level" >Temporal: Remediation Level</enum>
<enum value="report-confidence" >Temporal: Report Confidence</enum>
<enum value="access-vector">Base: Access Vector</enum>
<enum value="access-complexity">Base: Access Complexity</enum>
<enum value="authentication">Base: Authentication</enum>
<enum value="confidentiality-impact">Base: Confidentiality Impact</enum>
<enum value="integrity-impact">Base: Integrity Impact</enum>
<enum value="availability-impact">Base: Availability Impact</enum>
<enum value="exploitability">Temporal: Exploitability</enum>
<enum value="remediation-level">Temporal: Remediation Level</enum>
<enum value="report-confidence">Temporal: Report Confidence</enum>
<enum value="collateral-damage-potential">Environmental: Collateral Damage Potential</enum>
<enum value="target-distribution" >Environmental: Target Distribution</enum>
<enum value="confidentiality-requirement" >Environmental: Confidentiality Requirement</enum>
<enum value="integrity-requirement" >Environmental: Integrity Requirement</enum>
<enum value="availability-requirement" >Environmental: Availability Requirement</enum>
<enum value="target-distribution">Environmental: Target Distribution</enum>
<enum value="confidentiality-requirement">Environmental: Confidentiality Requirement</enum>
<enum value="integrity-requirement">Environmental: Integrity Requirement</enum>
<enum value="availability-requirement">Environmental: Availability Requirement</enum>
</allowed-values>
<allowed-values target="(.)[@system='http://www.first.org/cvss/v2.0' and @name='access-vector']/@value">
<enum value="local">Local</enum>
Expand Down Expand Up @@ -1407,28 +1407,28 @@
</allowed-values>

<allowed-values target="(.)[@system=('http://www.first.org/cvss/v3.0', 'http://www.first.org/cvss/v3.1')]/@name">
<enum value="attack-vector" >Base: Attack Vector</enum>
<enum value="access-complexity" >Base: Attack Complexity</enum>
<enum value="privileges-required" >Base: Privileges Required</enum>
<enum value="user-interaction" >Base: User Interaction</enum>
<enum value="scope" >Base: Scope</enum>
<enum value="confidentiality-impact" >Base: Confidentiality Impact</enum>
<enum value="integrity-impact" >Base: Integrity Impact</enum>
<enum value="availability-impact" >Base: Availability Impact</enum>
<enum value="exploit-code-maturity" >Temporal: Exploit Code Maturity</enum>
<enum value="remediation-level" >Temporal: Remediation Level</enum>
<enum value="report-confidence" >Temporal: Report Confidence</enum>
<enum value="attack-vector">Base: Attack Vector</enum>
<enum value="access-complexity">Base: Attack Complexity</enum>
<enum value="privileges-required">Base: Privileges Required</enum>
<enum value="user-interaction">Base: User Interaction</enum>
<enum value="scope">Base: Scope</enum>
<enum value="confidentiality-impact">Base: Confidentiality Impact</enum>
<enum value="integrity-impact">Base: Integrity Impact</enum>
<enum value="availability-impact">Base: Availability Impact</enum>
<enum value="exploit-code-maturity">Temporal: Exploit Code Maturity</enum>
<enum value="remediation-level">Temporal: Remediation Level</enum>
<enum value="report-confidence">Temporal: Report Confidence</enum>
<enum value="modified-attack-vector">Environmental: Modified Attack Vector</enum>
<enum value="modified-attack-complexity">Environmental: Modified Attack Complexity</enum>
<enum value="modified-privileges-required">Environmental: Modified Privileges Required</enum>
<enum value="modified-user-interaction">Environmental: Modified User Interaction</enum>
<enum value="modified-scope" >Environmental: Modified Scope</enum>
<enum value="modified-confidentiality" >Environmental: Modified Confidentiality</enum>
<enum value="modified-integrity" >Environmental: Modified Integrity</enum>
<enum value="modified-availability" >Environmental: Modified Availability</enum>
<enum value="confidentiality-requirement" >Environmental: Confidentiality Requirement Modifier</enum>
<enum value="integrity-requirement" >Environmental: Integrity Requirement Modifier</enum>
<enum value="availability-requirement" >Environmental: Availability Requirement Modifier</enum>
<enum value="modified-scope">Environmental: Modified Scope</enum>
<enum value="modified-confidentiality">Environmental: Modified Confidentiality</enum>
<enum value="modified-integrity">Environmental: Modified Integrity</enum>
<enum value="modified-availability">Environmental: Modified Availability</enum>
<enum value="confidentiality-requirement">Environmental: Confidentiality Requirement Modifier</enum>
<enum value="integrity-requirement">Environmental: Integrity Requirement Modifier</enum>
<enum value="availability-requirement">Environmental: Availability Requirement Modifier</enum>
</allowed-values>
<allowed-values target="(.)[@system=('http://www.first.org/cvss/v3.0', 'http://www.first.org/cvss/v3.1') and @name='access-vector']/@value">
<enum value="network">Network</enum>
Expand Down Expand Up @@ -1525,7 +1525,7 @@
<description>Identifies whether this is a recommendation, such as from an assessor or tool, or an actual plan accepted by the system owner.</description>
<constraint>
<allowed-values allow-other="yes">
<enum value="recommendation">Recommended Remediation</enum>
<enum value="recommendation">Recommended remediation.</enum>
<enum value="planned">The actions intended to resolve the risk.</enum>
<enum value="completed">This remediation activities were performed to address the risk.</enum>
</allowed-values>
Expand Down

0 comments on commit 18ccadd

Please sign in to comment.