Skip to content

Commit e4f710c

Browse files
david-waltermire-nistaj-stein-nist
david-waltermire-nist
authored and
aj-stein-nist
committed
Publishing generated metaschema resources [ci skip]
1 parent 5910df3 commit e4f710c

12 files changed

+3140
-478
lines changed

‎json/convert/oscal_complete_xml-to-json-converter.xsl‎

Lines changed: 429 additions & 7 deletions
Large diffs are not rendered by default.

‎json/convert/oscal_poam_xml-to-json-converter.xsl‎

Lines changed: 617 additions & 17 deletions
Large diffs are not rendered by default.

‎json/schema/oscal_assessment-plan_schema.json‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,6 +1523,83 @@
15231523
"target-id",
15241524
"status" ],
15251525
"additionalProperties" : false },
1526+
"oscal-ap-oscal-assessment-common:finding" :
1527+
{ "title" : "Finding",
1528+
"description" : "Describes an individual finding.",
1529+
"$id" : "#assembly_oscal-assessment-common_finding",
1530+
"type" : "object",
1531+
"properties" :
1532+
{ "uuid" :
1533+
{ "title" : "Finding Universally Unique Identifier",
1534+
"description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
1535+
"$ref" : "#/definitions/UUIDDatatype" },
1536+
"title" :
1537+
{ "title" : "Finding Title",
1538+
"description" : "The title for this finding.",
1539+
"type" : "string" },
1540+
"description" :
1541+
{ "title" : "Finding Description",
1542+
"description" : "A human-readable description of this finding.",
1543+
"type" : "string" },
1544+
"props" :
1545+
{ "type" : "array",
1546+
"minItems" : 1,
1547+
"items" :
1548+
{ "$ref" : "#assembly_oscal-metadata_property" } },
1549+
"links" :
1550+
{ "type" : "array",
1551+
"minItems" : 1,
1552+
"items" :
1553+
{ "$ref" : "#assembly_oscal-metadata_link" } },
1554+
"origins" :
1555+
{ "type" : "array",
1556+
"minItems" : 1,
1557+
"items" :
1558+
{ "$ref" : "#assembly_oscal-assessment-common_origin" } },
1559+
"target" :
1560+
{ "$ref" : "#assembly_oscal-assessment-common_finding-target" },
1561+
"implementation-statement-uuid" :
1562+
{ "title" : "Implementation Statement UUID",
1563+
"description" : "A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.",
1564+
"$ref" : "#/definitions/UUIDDatatype" },
1565+
"related-observations" :
1566+
{ "type" : "array",
1567+
"minItems" : 1,
1568+
"items" :
1569+
{ "title" : "Related Observation",
1570+
"description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
1571+
"type" : "object",
1572+
"properties" :
1573+
{ "observation-uuid" :
1574+
{ "title" : "Observation Universally Unique Identifier Reference",
1575+
"description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
1576+
"$ref" : "#/definitions/UUIDDatatype" } },
1577+
"required" :
1578+
[ "observation-uuid" ],
1579+
"additionalProperties" : false } },
1580+
"related-risks" :
1581+
{ "type" : "array",
1582+
"minItems" : 1,
1583+
"items" :
1584+
{ "title" : "Associated Risk",
1585+
"description" : "Relates the finding to a set of referenced risks that were used to determine the finding.",
1586+
"type" : "object",
1587+
"properties" :
1588+
{ "risk-uuid" :
1589+
{ "title" : "Risk Universally Unique Identifier Reference",
1590+
"description" : "A machine-oriented identifier reference to a risk defined in the list of risks.",
1591+
"$ref" : "#/definitions/UUIDDatatype" } },
1592+
"required" :
1593+
[ "risk-uuid" ],
1594+
"additionalProperties" : false } },
1595+
"remarks" :
1596+
{ "$ref" : "#field_oscal-metadata_remarks" } },
1597+
"required" :
1598+
[ "uuid",
1599+
"title",
1600+
"description",
1601+
"target" ],
1602+
"additionalProperties" : false },
15261603
"oscal-ap-oscal-assessment-common:observation" :
15271604
{ "title" : "Observation",
15281605
"description" : "Describes an individual observation.",

‎json/schema/oscal_assessment-results_schema.json‎

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
{ "type" : "array",
213213
"minItems" : 1,
214214
"items" :
215-
{ "$ref" : "#assembly_oscal-ar_finding" } },
215+
{ "$ref" : "#assembly_oscal-assessment-common_finding" } },
216216
"remarks" :
217217
{ "$ref" : "#field_oscal-metadata_remarks" } },
218218
"required" :
@@ -222,83 +222,6 @@
222222
"start",
223223
"reviewed-controls" ],
224224
"additionalProperties" : false },
225-
"oscal-ar-oscal-ar:finding" :
226-
{ "title" : "Finding",
227-
"description" : "Describes an individual finding.",
228-
"$id" : "#assembly_oscal-ar_finding",
229-
"type" : "object",
230-
"properties" :
231-
{ "uuid" :
232-
{ "title" : "Finding Universally Unique Identifier",
233-
"description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
234-
"$ref" : "#/definitions/UUIDDatatype" },
235-
"title" :
236-
{ "title" : "Finding Title",
237-
"description" : "The title for this finding.",
238-
"type" : "string" },
239-
"description" :
240-
{ "title" : "Finding Description",
241-
"description" : "A human-readable description of this finding.",
242-
"type" : "string" },
243-
"props" :
244-
{ "type" : "array",
245-
"minItems" : 1,
246-
"items" :
247-
{ "$ref" : "#assembly_oscal-metadata_property" } },
248-
"links" :
249-
{ "type" : "array",
250-
"minItems" : 1,
251-
"items" :
252-
{ "$ref" : "#assembly_oscal-metadata_link" } },
253-
"origins" :
254-
{ "type" : "array",
255-
"minItems" : 1,
256-
"items" :
257-
{ "$ref" : "#assembly_oscal-assessment-common_origin" } },
258-
"target" :
259-
{ "$ref" : "#assembly_oscal-assessment-common_finding-target" },
260-
"implementation-statement-uuid" :
261-
{ "title" : "Implementation Statement UUID",
262-
"description" : "A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.",
263-
"$ref" : "#/definitions/UUIDDatatype" },
264-
"related-observations" :
265-
{ "type" : "array",
266-
"minItems" : 1,
267-
"items" :
268-
{ "title" : "Related Observation",
269-
"description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
270-
"type" : "object",
271-
"properties" :
272-
{ "observation-uuid" :
273-
{ "title" : "Observation Universally Unique Identifier Reference",
274-
"description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
275-
"$ref" : "#/definitions/UUIDDatatype" } },
276-
"required" :
277-
[ "observation-uuid" ],
278-
"additionalProperties" : false } },
279-
"related-risks" :
280-
{ "type" : "array",
281-
"minItems" : 1,
282-
"items" :
283-
{ "title" : "Associated Risk",
284-
"description" : "Relates the finding to a set of referenced risks that were used to determine the finding.",
285-
"type" : "object",
286-
"properties" :
287-
{ "risk-uuid" :
288-
{ "title" : "Risk Universally Unique Identifier Reference",
289-
"description" : "A machine-oriented identifier reference to a risk defined in the list of risks.",
290-
"$ref" : "#/definitions/UUIDDatatype" } },
291-
"required" :
292-
[ "risk-uuid" ],
293-
"additionalProperties" : false } },
294-
"remarks" :
295-
{ "$ref" : "#field_oscal-metadata_remarks" } },
296-
"required" :
297-
[ "uuid",
298-
"title",
299-
"description",
300-
"target" ],
301-
"additionalProperties" : false },
302225
"oscal-ar-oscal-ar:import-ap" :
303226
{ "title" : "Import Assessment Plan",
304227
"description" : "Used by assessment-results to import information about the original plan for assessing the system.",
@@ -1753,6 +1676,83 @@
17531676
"target-id",
17541677
"status" ],
17551678
"additionalProperties" : false },
1679+
"oscal-ar-oscal-assessment-common:finding" :
1680+
{ "title" : "Finding",
1681+
"description" : "Describes an individual finding.",
1682+
"$id" : "#assembly_oscal-assessment-common_finding",
1683+
"type" : "object",
1684+
"properties" :
1685+
{ "uuid" :
1686+
{ "title" : "Finding Universally Unique Identifier",
1687+
"description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
1688+
"$ref" : "#/definitions/UUIDDatatype" },
1689+
"title" :
1690+
{ "title" : "Finding Title",
1691+
"description" : "The title for this finding.",
1692+
"type" : "string" },
1693+
"description" :
1694+
{ "title" : "Finding Description",
1695+
"description" : "A human-readable description of this finding.",
1696+
"type" : "string" },
1697+
"props" :
1698+
{ "type" : "array",
1699+
"minItems" : 1,
1700+
"items" :
1701+
{ "$ref" : "#assembly_oscal-metadata_property" } },
1702+
"links" :
1703+
{ "type" : "array",
1704+
"minItems" : 1,
1705+
"items" :
1706+
{ "$ref" : "#assembly_oscal-metadata_link" } },
1707+
"origins" :
1708+
{ "type" : "array",
1709+
"minItems" : 1,
1710+
"items" :
1711+
{ "$ref" : "#assembly_oscal-assessment-common_origin" } },
1712+
"target" :
1713+
{ "$ref" : "#assembly_oscal-assessment-common_finding-target" },
1714+
"implementation-statement-uuid" :
1715+
{ "title" : "Implementation Statement UUID",
1716+
"description" : "A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.",
1717+
"$ref" : "#/definitions/UUIDDatatype" },
1718+
"related-observations" :
1719+
{ "type" : "array",
1720+
"minItems" : 1,
1721+
"items" :
1722+
{ "title" : "Related Observation",
1723+
"description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
1724+
"type" : "object",
1725+
"properties" :
1726+
{ "observation-uuid" :
1727+
{ "title" : "Observation Universally Unique Identifier Reference",
1728+
"description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
1729+
"$ref" : "#/definitions/UUIDDatatype" } },
1730+
"required" :
1731+
[ "observation-uuid" ],
1732+
"additionalProperties" : false } },
1733+
"related-risks" :
1734+
{ "type" : "array",
1735+
"minItems" : 1,
1736+
"items" :
1737+
{ "title" : "Associated Risk",
1738+
"description" : "Relates the finding to a set of referenced risks that were used to determine the finding.",
1739+
"type" : "object",
1740+
"properties" :
1741+
{ "risk-uuid" :
1742+
{ "title" : "Risk Universally Unique Identifier Reference",
1743+
"description" : "A machine-oriented identifier reference to a risk defined in the list of risks.",
1744+
"$ref" : "#/definitions/UUIDDatatype" } },
1745+
"required" :
1746+
[ "risk-uuid" ],
1747+
"additionalProperties" : false } },
1748+
"remarks" :
1749+
{ "$ref" : "#field_oscal-metadata_remarks" } },
1750+
"required" :
1751+
[ "uuid",
1752+
"title",
1753+
"description",
1754+
"target" ],
1755+
"additionalProperties" : false },
17561756
"oscal-ar-oscal-assessment-common:observation" :
17571757
{ "title" : "Observation",
17581758
"description" : "Describes an individual observation.",

0 commit comments

Comments
 (0)