-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Feature-Issue-632-2.0.0' into unstable-2.0.0
- Loading branch information
Showing
7 changed files
with
98 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| { | ||
| "@context": { | ||
| "core": "https://ontology.unifiedcyberontology.org/uco/core/", | ||
| "identity": "https://ontology.unifiedcyberontology.org/uco/identity/", | ||
| "kb": "http://example.org/kb/", | ||
| "observable": "https://ontology.unifiedcyberontology.org/uco/observable/", | ||
| "rdfs": "http://www.w3.org/2000/01/rdf-schema#", | ||
| "xsd": "http://www.w3.org/2001/XMLSchema#" | ||
| }, | ||
| "@graph": [ | ||
| { | ||
| "@id": "kb:Organization-cc6ee776-d770-409d-a84b-06aa6009b670", | ||
| "@type": "identity:Organization", | ||
| "core:name": "Example OS Company" | ||
| }, | ||
| { | ||
| "@id": "kb:OperatingSystem-0a6c3dcd-9a53-4d1b-a635-afbcedab9760", | ||
| "@type": "observable:OperatingSystem", | ||
| "core:description": "The Example Operating System instance deployed on workstation C-304-33", | ||
| "core:hasFacet": [ | ||
| { | ||
| "@id": "kb:SoftwareFacet-6b474a08-99f7-4dbd-8cd1-ef81ddff6bc3", | ||
| "@type": "observable:SoftwareFacet", | ||
| "observable:cpeid": "cpe:2.3:o:exampleosco:exampleos:40:*:*:*:*:*:*:*", | ||
| "observable:language": "en-us" | ||
| }, | ||
| { | ||
| "@id": "kb:OperatingSystemFacet-483cc1a7-f1f1-472f-87e0-3e076fad46ec", | ||
| "@type": "observable:OperatingSystemFacet", | ||
| "rdfs:comment": "This node will trigger an error for housing the manufacturer and version properties, now required to be on SoftwareFacet.", | ||
| "observable:bitness": "64", | ||
| "observable:installDate": { | ||
| "@type": "xsd:dateTime", | ||
| "@value": "2024-09-13T09:00:00-04:00" | ||
| }, | ||
| "observable:manufacturer": { | ||
| "@id": "kb:Organization-cc6ee776-d770-409d-a84b-06aa6009b670" | ||
| }, | ||
| "observable:version": "40" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| @prefix observable: <https://ontology.unifiedcyberontology.org/uco/observable/> . | ||
| @prefix owl: <http://www.w3.org/2002/07/owl#> . | ||
| @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . | ||
| @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . | ||
| @prefix sh: <http://www.w3.org/ns/shacl#> . | ||
| @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . | ||
|
|
||
| [] | ||
| a sh:ValidationReport ; | ||
| sh:conforms "false"^^xsd:boolean ; | ||
| sh:result | ||
| [ | ||
| a sh:ValidationResult ; | ||
| sh:focusNode <http://example.org/kb/OperatingSystemFacet-483cc1a7-f1f1-472f-87e0-3e076fad46ec> ; | ||
| sh:resultMessage "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; | ||
| sh:resultPath observable:manufacturer ; | ||
| sh:resultSeverity sh:Violation ; | ||
| sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; | ||
| sh:sourceShape [ | ||
| sh:maxCount "0"^^xsd:integer ; | ||
| sh:message "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; | ||
| sh:path observable:manufacturer ; | ||
| ] ; | ||
| ] , | ||
| [ | ||
| a sh:ValidationResult ; | ||
| sh:focusNode <http://example.org/kb/OperatingSystemFacet-483cc1a7-f1f1-472f-87e0-3e076fad46ec> ; | ||
| sh:resultMessage "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; | ||
| sh:resultPath observable:version ; | ||
| sh:resultSeverity sh:Violation ; | ||
| sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; | ||
| sh:sourceShape [ | ||
| sh:maxCount "0"^^xsd:integer ; | ||
| sh:message "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; | ||
| sh:path observable:version ; | ||
| ] ; | ||
| ] | ||
| ; | ||
| . | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters