From 06e6586e6279d1911b7b66bbed33217a748861d5 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 20:24:21 -0400 Subject: [PATCH 1/4] Bump unstable pointers A follow-on patch will regenerate Make-managed files. References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index 453aa5df..8c55711c 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit 453aa5dfa1e7a10d666f93ec4797a8f64157c815 +Subproject commit 8c55711c38bd0652e844a24cf54b92a846ce9f76 diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index 80587ce1..552c756a 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit 80587ce1d9b711005e14e43262915e6c5578f98a +Subproject commit 552c756a5f8a034d243693217b9236f39ea8b146 From 57e2fbcdb8a69fe63e6342a4a21c67f6eaec80b1 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 20:27:29 -0400 Subject: [PATCH 2/4] Regenerate Make-managed files References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- .../Oresteia_validation-unstable-2.0.0.ttl | 28 ++++++++- .../Oresteia/Oresteia_validation-unstable.ttl | 30 ++++++++- .../cell_site_validation-unstable-2.0.0.ttl | 61 +++++++++++++----- .../cell_site_validation-unstable.ttl | 63 ++++++++++++++----- .../device_validation-unstable-2.0.0.ttl | 31 ++++++++- .../device/device_validation-unstable.ttl | 33 +++++++++- .../file/file_validation-unstable-2.0.0.ttl | 57 ++++++++++++++++- .../file/file_validation-unstable.ttl | 61 +++++++++++++++++- .../message_validation-unstable-2.0.0.ttl | 31 ++++++++- .../message/message_validation-unstable.ttl | 33 +++++++++- ...and_sim_card_validation-unstable-2.0.0.ttl | 31 ++++++++- ...evice_and_sim_card_validation-unstable.ttl | 33 +++++++++- .../partitions_validation-unstable-2.0.0.ttl | 31 ++++++++- .../partitions_validation-unstable.ttl | 33 +++++++++- ...ear_phishing_validation-unstable-2.0.0.ttl | 29 ++++++++- .../spear_phishing_validation-unstable.ttl | 31 ++++++++- 16 files changed, 570 insertions(+), 46 deletions(-) diff --git a/examples/illustrations/Oresteia/Oresteia_validation-unstable-2.0.0.ttl b/examples/illustrations/Oresteia/Oresteia_validation-unstable-2.0.0.ttl index 62d020f8..360d4039 100644 --- a/examples/illustrations/Oresteia/Oresteia_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/Oresteia/Oresteia_validation-unstable-2.0.0.ttl @@ -8,7 +8,7 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; sh:result [ a sh:ValidationResult ; @@ -39,6 +39,32 @@ sh:severity sh:Info ; ] ; sh:value "Phone" ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + 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 ; + 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 ; + ] ; ] ; . diff --git a/examples/illustrations/Oresteia/Oresteia_validation-unstable.ttl b/examples/illustrations/Oresteia/Oresteia_validation-unstable.ttl index 62d020f8..8c54e5e0 100644 --- a/examples/illustrations/Oresteia/Oresteia_validation-unstable.ttl +++ b/examples/illustrations/Oresteia/Oresteia_validation-unstable.ttl @@ -8,7 +8,7 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; sh:result [ a sh:ValidationResult ; @@ -39,6 +39,34 @@ sh:severity sh:Info ; ] ; sh:value "Phone" ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:manufacturer ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:manufacturer ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:version ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:version ; + sh:severity sh:Warning ; + ] ; ] ; . diff --git a/examples/illustrations/cell_site/cell_site_validation-unstable-2.0.0.ttl b/examples/illustrations/cell_site/cell_site_validation-unstable-2.0.0.ttl index fbc74a5d..e22bdc0c 100644 --- a/examples/illustrations/cell_site/cell_site_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/cell_site/cell_site_validation-unstable-2.0.0.ttl @@ -1,4 +1,5 @@ @prefix core: . +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -7,17 +8,44 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; - sh:result [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "UcoThings are suggested to end with a UUID." ; - sh:resultSeverity sh:Info ; - sh:sourceConstraint [ - a sh:SPARQLConstraint ; - rdfs:seeAlso ; - sh:message "UcoThings are suggested to end with a UUID."@en ; - sh:select ''' + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + 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 ; + 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 ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "UcoThings are suggested to end with a UUID." ; + sh:resultSeverity sh:Info ; + sh:sourceConstraint [ + a sh:SPARQLConstraint ; + rdfs:seeAlso ; + sh:message "UcoThings are suggested to end with a UUID."@en ; + sh:select ''' PREFIX rdfs: PREFIX core: SELECT $this @@ -32,10 +60,11 @@ ) } ''' ; - ] ; - sh:sourceConstraintComponent sh:SPARQLConstraintComponent ; - sh:sourceShape core:UcoThing-identifier-regex-shape ; - sh:value ; - ] ; + ] ; + sh:sourceConstraintComponent sh:SPARQLConstraintComponent ; + sh:sourceShape core:UcoThing-identifier-regex-shape ; + sh:value ; + ] + ; . diff --git a/examples/illustrations/cell_site/cell_site_validation-unstable.ttl b/examples/illustrations/cell_site/cell_site_validation-unstable.ttl index fbc74a5d..2a479b60 100644 --- a/examples/illustrations/cell_site/cell_site_validation-unstable.ttl +++ b/examples/illustrations/cell_site/cell_site_validation-unstable.ttl @@ -1,4 +1,5 @@ @prefix core: . +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -7,17 +8,46 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; - sh:result [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "UcoThings are suggested to end with a UUID." ; - sh:resultSeverity sh:Info ; - sh:sourceConstraint [ - a sh:SPARQLConstraint ; - rdfs:seeAlso ; - sh:message "UcoThings are suggested to end with a UUID."@en ; - sh:select ''' + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:manufacturer ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:manufacturer ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:version ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:version ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "UcoThings are suggested to end with a UUID." ; + sh:resultSeverity sh:Info ; + sh:sourceConstraint [ + a sh:SPARQLConstraint ; + rdfs:seeAlso ; + sh:message "UcoThings are suggested to end with a UUID."@en ; + sh:select ''' PREFIX rdfs: PREFIX core: SELECT $this @@ -32,10 +62,11 @@ ) } ''' ; - ] ; - sh:sourceConstraintComponent sh:SPARQLConstraintComponent ; - sh:sourceShape core:UcoThing-identifier-regex-shape ; - sh:value ; - ] ; + ] ; + sh:sourceConstraintComponent sh:SPARQLConstraintComponent ; + sh:sourceShape core:UcoThing-identifier-regex-shape ; + sh:value ; + ] + ; . diff --git a/examples/illustrations/device/device_validation-unstable-2.0.0.ttl b/examples/illustrations/device/device_validation-unstable-2.0.0.ttl index 33496ff0..57724e4f 100644 --- a/examples/illustrations/device/device_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/device/device_validation-unstable-2.0.0.ttl @@ -1,3 +1,4 @@ +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -6,6 +7,34 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + 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 ; + 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 ; + ] ; + ] + ; . diff --git a/examples/illustrations/device/device_validation-unstable.ttl b/examples/illustrations/device/device_validation-unstable.ttl index 33496ff0..a82899e3 100644 --- a/examples/illustrations/device/device_validation-unstable.ttl +++ b/examples/illustrations/device/device_validation-unstable.ttl @@ -1,3 +1,4 @@ +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -6,6 +7,36 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:manufacturer ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:manufacturer ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:version ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:version ; + sh:severity sh:Warning ; + ] ; + ] + ; . diff --git a/examples/illustrations/file/file_validation-unstable-2.0.0.ttl b/examples/illustrations/file/file_validation-unstable-2.0.0.ttl index 33496ff0..8be433ba 100644 --- a/examples/illustrations/file/file_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/file/file_validation-unstable-2.0.0.ttl @@ -1,3 +1,4 @@ +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -6,6 +7,60 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + 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 ; + 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 ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + 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 ; + 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 ; + ] ; + ] + ; . diff --git a/examples/illustrations/file/file_validation-unstable.ttl b/examples/illustrations/file/file_validation-unstable.ttl index 33496ff0..1d458a7b 100644 --- a/examples/illustrations/file/file_validation-unstable.ttl +++ b/examples/illustrations/file/file_validation-unstable.ttl @@ -1,3 +1,4 @@ +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -6,6 +7,64 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:manufacturer ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:manufacturer ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:version ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:version ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:manufacturer ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:manufacturer ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:version ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:version ; + sh:severity sh:Warning ; + ] ; + ] + ; . diff --git a/examples/illustrations/message/message_validation-unstable-2.0.0.ttl b/examples/illustrations/message/message_validation-unstable-2.0.0.ttl index 33496ff0..5755098a 100644 --- a/examples/illustrations/message/message_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/message/message_validation-unstable-2.0.0.ttl @@ -1,3 +1,4 @@ +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -6,6 +7,34 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + 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 ; + 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 ; + ] ; + ] + ; . diff --git a/examples/illustrations/message/message_validation-unstable.ttl b/examples/illustrations/message/message_validation-unstable.ttl index 33496ff0..969af259 100644 --- a/examples/illustrations/message/message_validation-unstable.ttl +++ b/examples/illustrations/message/message_validation-unstable.ttl @@ -1,3 +1,4 @@ +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -6,6 +7,36 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:manufacturer ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:manufacturer ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:version ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:version ; + sh:severity sh:Warning ; + ] ; + ] + ; . diff --git a/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable-2.0.0.ttl b/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable-2.0.0.ttl index 33496ff0..7bfd6bb2 100644 --- a/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable-2.0.0.ttl @@ -1,3 +1,4 @@ +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -6,6 +7,34 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + 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 ; + 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 ; + ] ; + ] + ; . diff --git a/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable.ttl b/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable.ttl index 33496ff0..2a2e103d 100644 --- a/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable.ttl +++ b/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable.ttl @@ -1,3 +1,4 @@ +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -6,6 +7,36 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:manufacturer ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:manufacturer ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:version ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:version ; + sh:severity sh:Warning ; + ] ; + ] + ; . diff --git a/examples/illustrations/partitions/partitions_validation-unstable-2.0.0.ttl b/examples/illustrations/partitions/partitions_validation-unstable-2.0.0.ttl index 33496ff0..4d22b045 100644 --- a/examples/illustrations/partitions/partitions_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/partitions/partitions_validation-unstable-2.0.0.ttl @@ -1,3 +1,4 @@ +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -6,6 +7,34 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + 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 ; + 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 ; + ] ; + ] + ; . diff --git a/examples/illustrations/partitions/partitions_validation-unstable.ttl b/examples/illustrations/partitions/partitions_validation-unstable.ttl index 33496ff0..568b2fd0 100644 --- a/examples/illustrations/partitions/partitions_validation-unstable.ttl +++ b/examples/illustrations/partitions/partitions_validation-unstable.ttl @@ -1,3 +1,4 @@ +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -6,6 +7,36 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; + sh:result + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:manufacturer ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:manufacturer ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:version ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:version ; + sh:severity sh:Warning ; + ] ; + ] + ; . diff --git a/examples/illustrations/spear_phishing/spear_phishing_validation-unstable-2.0.0.ttl b/examples/illustrations/spear_phishing/spear_phishing_validation-unstable-2.0.0.ttl index 13031562..4886b816 100644 --- a/examples/illustrations/spear_phishing/spear_phishing_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/spear_phishing/spear_phishing_validation-unstable-2.0.0.ttl @@ -1,4 +1,5 @@ @prefix ep: . +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -8,7 +9,7 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; sh:result [ a sh:ValidationResult ; @@ -624,6 +625,32 @@ sh:resultSeverity sh:Info ; sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; sh:sourceShape ep:designatedBy-shape ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ep:operating-system-facet-9081ae82-8691-4830-9846-c3a4b26e7398 ; + 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 ep:operating-system-facet-9081ae82-8691-4830-9846-c3a4b26e7398 ; + 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 ; + ] ; ] ; . diff --git a/examples/illustrations/spear_phishing/spear_phishing_validation-unstable.ttl b/examples/illustrations/spear_phishing/spear_phishing_validation-unstable.ttl index 13031562..5c256b7f 100644 --- a/examples/illustrations/spear_phishing/spear_phishing_validation-unstable.ttl +++ b/examples/illustrations/spear_phishing/spear_phishing_validation-unstable.ttl @@ -1,4 +1,5 @@ @prefix ep: . +@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -8,7 +9,7 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; sh:result [ a sh:ValidationResult ; @@ -624,6 +625,34 @@ sh:resultSeverity sh:Info ; sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; sh:sourceShape ep:designatedBy-shape ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ep:operating-system-facet-9081ae82-8691-4830-9846-c3a4b26e7398 ; + sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:manufacturer ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:manufacturer ; + sh:severity sh:Warning ; + ] ; + ] , + [ + a sh:ValidationResult ; + sh:focusNode ep:operating-system-facet-9081ae82-8691-4830-9846-c3a4b26e7398 ; + sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:resultPath observable:version ; + sh:resultSeverity sh:Warning ; + sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; + sh:sourceShape [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:version ; + sh:severity sh:Warning ; + ] ; ] ; . From da056fc96b29c33a85e730f21e3ff83564a70748 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 21:05:12 -0400 Subject: [PATCH 3/4] Migrate software properties of operating systems into new objects; add relationships A follow-on patch will regenerate Make-managed files. References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- .../Oresteia/src/Oresteia_base.json | 43 ++++++++--- .../cell_site/src/cell_site_base.json | 37 +++++++--- examples/illustrations/device/device.json | 51 +++++++++---- examples/illustrations/file/file.json | 74 ++++++++++++++----- examples/illustrations/message/message.json | 6 +- .../mobile_device_and_sim_card.json | 51 +++++++++---- .../src/partitions-supplemental.json | 22 ++++-- .../spear_phishing/spear_phishing.json | 22 ++++-- 8 files changed, 225 insertions(+), 81 deletions(-) diff --git a/examples/illustrations/Oresteia/src/Oresteia_base.json b/examples/illustrations/Oresteia/src/Oresteia_base.json index 916e78f7..5d8221ab 100644 --- a/examples/illustrations/Oresteia/src/Oresteia_base.json +++ b/examples/illustrations/Oresteia/src/Oresteia_base.json @@ -219,6 +219,12 @@ { "@id": "kb:clytemnestra-device-3a61cb3a-422d-4953-af70-25a860456e50" }, + { + "@id": "kb:relationship-3707f6c4-b90a-4c70-9482-bb208d332e85" + }, + { + "@id": "kb:operating-system-9eea07c7-c348-4fa3-aef6-67f2fe651204" + }, { "@id": "kb:clytemnestra-mobileaccount-363dd368-94bd-4dbb-af1d-f53d0085791e" }, @@ -794,15 +800,6 @@ "drafting:uniqueID": "B3858A69A29375E6C706226B3633A3A11EB2A774", "drafting:ownerName": "Clytemnestras iPhone" }, - { - "@id": "kb:operating-system-facet-ad90e7e5-c692-4c59-87c6-d36c463ff1b0", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "iOS", - "uco-observable:manufacturer": { - "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4" - }, - "uco-observable:version": "10.3" - }, { "@id": "kb:wifi-address-facet-00ec20e0-4af9-45c0-9246-7a87e8c47f3d", "@type": "uco-observable:WifiAddressFacet", @@ -815,6 +812,34 @@ } ] }, + { + "@id": "kb:operating-system-9eea07c7-c348-4fa3-aef6-67f2fe651204", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "iOS", + "uco-core:hasFacet": { + "@id": "kb:software-facet-906f160c-bbc0-48a5-bb0c-7338ebabf1e9", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4" + }, + "uco-observable:version": "10.3" + } + }, + { + "@id": "kb:relationship-3707f6c4-b90a-4c70-9482-bb208d332e85", + "@type": "uco-observable:ObservableRelationship", + "uco-core:isDirectional": true, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:source": { + "@id": "kb:clytemnestra-device-3a61cb3a-422d-4953-af70-25a860456e50" + }, + "uco-core:target": { + "@id": "kb:operating-system-9eea07c7-c348-4fa3-aef6-67f2fe651204" + } + }, { "@id": "kb:clytemnestra-mobileaccount-363dd368-94bd-4dbb-af1d-f53d0085791e", "@type": "uco-observable:MobileAccount", diff --git a/examples/illustrations/cell_site/src/cell_site_base.json b/examples/illustrations/cell_site/src/cell_site_base.json index e600d11e..56a70521 100644 --- a/examples/illustrations/cell_site/src/cell_site_base.json +++ b/examples/illustrations/cell_site/src/cell_site_base.json @@ -36,15 +36,6 @@ "@type": "uco-observable:MobileDeviceFacet", "uco-observable:IMEI": "356420075722843" }, - { - "@id": "kb:operating-system-facet-407e9113-cb7c-45af-b456-6de8df391d6f", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "Android", - "uco-observable:manufacturer": { - "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec" - }, - "uco-observable:version": "6.0.1" - }, { "@id": "kb:bluetooth-address-facet-1206416f-2397-49e9-9606-3ce78b1ea0fd", "@type": "uco-observable:BluetoothAddressFacet", @@ -58,6 +49,34 @@ } ] }, + { + "@id": "kb:operating-system-66ff1c3d-8cf0-439c-b8b0-5697df555b55", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "Android", + "uco-core:hasFacet": { + "@id": "kb:software-facet-9796be5d-172d-4c84-aaa1-92daa24d49d7", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec" + }, + "uco-observable:version": "6.0.1" + } + }, + { + "@id": "kb:relationship-ae5bc717-1bef-433c-8753-4bc19adae8db", + "@type": "uco-observable:ObservableRelationship", + "uco-core:isDirectional": true, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:source": { + "@id": "kb:6e2c8413-f681-4bc6-a66e-b70a7ecd9d3a" + }, + "uco-core:target": { + "@id": "kb:operating-system-66ff1c3d-8cf0-439c-b8b0-5697df555b55" + } + }, { "@id": "kb:2ca4e1c6-9d27-4ba3-fe34-6da3c591b5e2", "@type": "uco-observable:ObservableRelationship", diff --git a/examples/illustrations/device/device.json b/examples/illustrations/device/device.json index 551570f5..4fa976c4 100644 --- a/examples/illustrations/device/device.json +++ b/examples/illustrations/device/device.json @@ -37,19 +37,6 @@ "uco-observable:model": "Inspiron 5000", "uco-observable:serialNumber": "D1234567" }, - { - "@id": "kb:operating-system-facet-429e8d0f-4974-421b-a01e-2b54437e4287", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "Windows 7 Ultimate Edition", - "uco-observable:manufacturer": { - "@id": "kb:organization-cc0e0667-eadf-4b2e-9618-3f62b1bdae26" - }, - "uco-observable:version": "6.1.7601 Service Pack 1 Build 7601", - "uco-observable:installDate": { - "@type": "xsd:dateTime", - "@value": "2019-07-10T16:33:42Z" - } - }, { "@id": "kb:computer-specification-facet-d02adab1-cbaa-4ec5-b98c-4fe128e7281f", "@type": "uco-observable:ComputerSpecificationFacet", @@ -78,6 +65,44 @@ "acme:inventoryNumber": "10503" } ] + }, + { + "@id": "kb:operating-system-6c71847e-0569-48c4-9587-772e18c45d9f", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "Windows 7 Ultimate Edition", + "uco-core:hasFacet": [ + { + "@id": "kb:operating-system-facet-2ebffd0a-4d07-4313-8be2-cca326cbd547", + "@type": "uco-observable:OperatingSystemFacet", + "uco-observable:installDate": { + "@type": "xsd:dateTime", + "@value": "2019-07-10T16:33:42Z" + } + }, + { + "@id": "kb:software-facet-bb00a67a-4f64-4275-a818-01192b0934bf", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-cc0e0667-eadf-4b2e-9618-3f62b1bdae26" + }, + "uco-observable:version": "6.1.7601 Service Pack 1 Build 7601" + } + ] + }, + { + "@id": "kb:relationship-b96f493a-806b-4914-b522-5f8c4456da3b", + "@type": "uco-observable:ObservableRelationship", + "uco-core:isDirectional": true, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:source": { + "@id": "kb:forensic_lab_computer-a730c324-49e6-4b12-869e-6addd946545d" + }, + "uco-core:target": { + "@id": "kb:operating-system-6c71847e-0569-48c4-9587-772e18c45d9f" + } } ] } diff --git a/examples/illustrations/file/file.json b/examples/illustrations/file/file.json index c3d33338..b9cc446a 100644 --- a/examples/illustrations/file/file.json +++ b/examples/illustrations/file/file.json @@ -517,15 +517,6 @@ "uco-observable:model": "Inspiron 5000", "uco-observable:serialNumber": "D1234567" }, - { - "@id": "kb:operating-system-facet-83153006-3432-4538-a0d7-871a6e879d76", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "Windows 7 Ultimate Edition", - "uco-observable:manufacturer": { - "@id": "kb:organization-cc0e0667-eadf-4b2e-9618-3f62b1bdae26" - }, - "uco-observable:version": "6.1.7601 Service Pack 1 Build 7601" - }, { "@id": "kb:computer-specification-facet-fd3be213-cb78-4130-8888-323a259f3509", "@type": "uco-observable:ComputerSpecificationFacet", @@ -544,6 +535,34 @@ } ] }, + { + "@id": "kb:operating-system-8a0026cb-2f40-460d-baac-e5b8dc2da0e0", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "Windows 7 Ultimate Edition", + "uco-core:hasFacet": { + "@id": "kb:software-facet-de8739b6-74ba-486e-b452-49a990ffbb22", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-cc0e0667-eadf-4b2e-9618-3f62b1bdae26" + }, + "uco-observable:version": "6.1.7601 Service Pack 1 Build 7601" + } + }, + { + "@id": "kb:relationship-a66eba82-1224-422e-a427-73895cab5b5a", + "@type": "uco-observable:ObservableRelationship", + "uco-core:isDirectional": true, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:source": { + "@id": "kb:forensic_lab_computer-89c30df0-5e7f-4076-8f74-3271e730a013" + }, + "uco-core:target": { + "@id": "kb:operating-system-8a0026cb-2f40-460d-baac-e5b8dc2da0e0" + } + }, { "@id": "kb:organization-2b3b98e2-aea2-4270-876a-7f9917623cb7", "@type": "uco-identity:Organization", @@ -572,15 +591,6 @@ "uco-observable:model": "I9500 Galaxy S4", "uco-observable:serialNumber": "123456SAM" }, - { - "@id": "kb:operating-system-facet-f1c16acb-44f7-4728-8f5e-72bcc0f3f3f8", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "Android", - "uco-observable:manufacturer": { - "@id": "kb:organization-2b3b98e2-aea2-4270-876a-7f9917623cb7" - }, - "uco-observable:version": "4.2.2" - }, { "@id": "kb:computer-specification-facet-0f10db33-9374-467c-bb2d-04172ab05a34", "@type": "uco-observable:ComputerSpecificationFacet", @@ -590,6 +600,34 @@ "uco-observable:totalRam": 2147483648 } ] + }, + { + "@id": "kb:operating-system-1d468d48-3ac2-4242-a9cb-61bd47319d43", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "Android", + "uco-core:hasFacet": { + "@id": "kb:software-facet-9c9aa4ea-9e84-45e8-8437-ac97327d651b", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-2b3b98e2-aea2-4270-876a-7f9917623cb7" + }, + "uco-observable:version": "4.2.2" + } + }, + { + "@id": "kb:relationship-7a75a470-b017-424b-a81b-d1411172c0c6", + "@type": "uco-observable:ObservableRelationship", + "uco-core:isDirectional": true, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:source": { + "@id": "kb:android_device-814c2229-d163-47af-87be-6437b205dde4" + }, + "uco-core:target": { + "@id": "kb:operating-system-1d468d48-3ac2-4242-a9cb-61bd47319d43" + } } ] } diff --git a/examples/illustrations/message/message.json b/examples/illustrations/message/message.json index 760211f7..f9f7248c 100644 --- a/examples/illustrations/message/message.json +++ b/examples/illustrations/message/message.json @@ -23,11 +23,11 @@ "uco-observable:OperatingSystem", "uco-observable:Software" ], + "uco-core:name": "Android", "uco-core:hasFacet": [ { - "@id": "kb:operating-system-facet-04d6b0b1-b491-4438-b889-d16a28dffaa4", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "Android", + "@id": "kb:software-facet-e331aa04-4403-4560-a759-c07a993791ec", + "@type": "uco-observable:SoftwareFacet", "uco-observable:manufacturer": { "@id": "kb:organization-2b3b98e2-aea2-4270-876a-7f9917623cb7" }, diff --git a/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card.json b/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card.json index bdf9acae..d8bd3cc0 100644 --- a/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card.json +++ b/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card.json @@ -24,19 +24,6 @@ "uco-observable:model": "MG472ZD/A", "uco-observable:serialNumber": "F17RN4DXXXXX" }, - { - "@id": "kb:operating-system-facet-48f9672f-c16c-4137-b9cd-1e99bd368335", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "iOS", - "uco-observable:manufacturer": { - "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4" - }, - "uco-observable:version": "11.2.6", - "uco-observable:installDate": { - "@type": "xsd:dateTime", - "@value": "2018-04-09T16:33:42Z" - } - }, { "@id": "kb:mobile-device-facet-78f46f74-0ae8-49b2-b126-7cf5221a52ad", "@type": "uco-observable:MobileDeviceFacet", @@ -60,6 +47,44 @@ } ] }, + { + "@id": "kb:operating-system-be32618a-dade-4284-9435-f18be7e035c6", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:name": "iOS", + "uco-core:hasFacet": [ + { + "@id": "kb:operating-system-facet-27d37081-422b-466d-b19b-8a338917f230", + "@type": "uco-observable:OperatingSystemFacet", + "uco-observable:installDate": { + "@type": "xsd:dateTime", + "@value": "2018-04-09T16:33:42Z" + } + }, + { + "@id": "kb:software-facet-0be3dc19-f97e-4d10-ba8e-d551bfd2ea28", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4" + }, + "uco-observable:version": "11.2.6" + } + ] + }, + { + "@id": "kb:relationship-5d4c09d2-2109-4828-948f-aa449d07ead9", + "@type": "uco-observable:ObservableRelationship", + "uco-core:source": { + "@id": "kb:mobile-device-d5143a67-8b61-491b-a5e9-863b606e296a" + }, + "uco-core:target": { + "@id": "kb:operating-system-be32618a-dade-4284-9435-f18be7e035c6" + }, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:isDirectional": true + }, { "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4", "@type": "uco-identity:Organization", diff --git a/examples/illustrations/partitions/src/partitions-supplemental.json b/examples/illustrations/partitions/src/partitions-supplemental.json index 13d216c1..ac2faddf 100644 --- a/examples/illustrations/partitions/src/partitions-supplemental.json +++ b/examples/illustrations/partitions/src/partitions-supplemental.json @@ -15,15 +15,21 @@ "uco-observable:Software" ], "uco-core:name": "Windows 11 Pro", - "uco-core:hasFacet": { - "@id": "kb:OperatingSystemFacet-aeb7c83f-3fc6-4775-806a-a83b7a875623", - "@type": "uco-observable:OperatingSystemFacet", - "uco-observable:manufacturer": { - "@id": "kb:Organization-a94338c2-030a-493f-9d26-55cade656276" + "uco-core:hasFacet": [ + { + "@id": "kb:OperatingSystemFacet-aeb7c83f-3fc6-4775-806a-a83b7a875623", + "@type": "uco-observable:OperatingSystemFacet", + "drafting:buildID": "22621.2283" }, - "uco-observable:version": "22H2", - "drafting:buildID": "22621.2283" - } + { + "@id": "kb:SoftwareFacet-247fe7a7-8434-4fca-8f9b-ac7e136f6ca5", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:Organization-a94338c2-030a-493f-9d26-55cade656276" + }, + "uco-observable:version": "22H2" + } + ] }, { "@id": "kb:Tool-e7ce892b-8a19-4f62-b43d-4736ccb6b696", diff --git a/examples/illustrations/spear_phishing/spear_phishing.json b/examples/illustrations/spear_phishing/spear_phishing.json index 0c01a503..8dc61197 100644 --- a/examples/illustrations/spear_phishing/spear_phishing.json +++ b/examples/illustrations/spear_phishing/spear_phishing.json @@ -787,15 +787,21 @@ ], "rdfs:comment": "TODO, UCO - bitness should use the BitnessVocabulary.", "uco-core:name": "Windows 10 Enterprise Evaluation", - "uco-core:hasFacet": { - "@id": "kb:operating-system-facet-9081ae82-8691-4830-9846-c3a4b26e7398", - "@type": "uco-observable:OperatingSystemFacet", - "uco-observable:manufacturer": { - "@id": "http://example.org/kb/organization-cc0e0667-eadf-4b2e-9618-3f62b1bdae26" + "uco-core:hasFacet": [ + { + "@id": "kb:operating-system-facet-9081ae82-8691-4830-9846-c3a4b26e7398", + "@type": "uco-observable:OperatingSystemFacet", + "uco-observable:bitness": "64" }, - "uco-observable:bitness": "64", - "uco-observable:version": "10.0" - } + { + "@id": "kb:software-facet-686c4cb6-6f9a-45c5-b1b6-8d6d520f5d2e", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "http://example.org/kb/organization-cc0e0667-eadf-4b2e-9618-3f62b1bdae26" + }, + "uco-observable:version": "10.0" + } + ] }, { "@id": "http://example.org/kb/organization-cc0e0667-eadf-4b2e-9618-3f62b1bdae26", From fb8600c3ce780a3f6086db4b3a2c698446aefb24 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 21:26:30 -0400 Subject: [PATCH 4/4] Regenerate Make-managed files References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- examples/illustrations/Oresteia/Oresteia.json | 43 ++- .../Oresteia_validation-unstable-2.0.0.ttl | 28 +- .../Oresteia/Oresteia_validation-unstable.ttl | 30 +- .../figures/Oresteia-relationships.svg | 319 ++++++++++-------- .../illustrations/cell_site/cell_site.json | 37 +- .../cell_site_validation-unstable-2.0.0.ttl | 61 +--- .../cell_site_validation-unstable.ttl | 63 +--- .../figures/cell_site-relationships.svg | 121 ++++--- .../device_validation-unstable-2.0.0.ttl | 31 +- .../device/device_validation-unstable.ttl | 33 +- .../file/figures/file-relationships.svg | 258 ++++++++------ .../file/file_validation-unstable-2.0.0.ttl | 57 +--- .../file/file_validation-unstable.ttl | 61 +--- .../message_validation-unstable-2.0.0.ttl | 31 +- .../message/message_validation-unstable.ttl | 33 +- ...bile_device_and_sim_card-relationships.svg | 79 +++-- ...and_sim_card_validation-unstable-2.0.0.ttl | 31 +- ...evice_and_sim_card_validation-unstable.ttl | 33 +- .../illustrations/partitions/partitions.json | 22 +- .../partitions_validation-unstable-2.0.0.ttl | 31 +- .../partitions_validation-unstable.ttl | 33 +- .../spear_phishing/spear_phishing.ttl | 13 +- ...ear_phishing_validation-unstable-2.0.0.ttl | 29 +- .../spear_phishing_validation-unstable.ttl | 31 +- 24 files changed, 588 insertions(+), 920 deletions(-) diff --git a/examples/illustrations/Oresteia/Oresteia.json b/examples/illustrations/Oresteia/Oresteia.json index 6a5447dd..bc54a7c2 100644 --- a/examples/illustrations/Oresteia/Oresteia.json +++ b/examples/illustrations/Oresteia/Oresteia.json @@ -227,6 +227,12 @@ { "@id": "kb:clytemnestra-device-3a61cb3a-422d-4953-af70-25a860456e50" }, + { + "@id": "kb:relationship-3707f6c4-b90a-4c70-9482-bb208d332e85" + }, + { + "@id": "kb:operating-system-9eea07c7-c348-4fa3-aef6-67f2fe651204" + }, { "@id": "kb:clytemnestra-mobileaccount-363dd368-94bd-4dbb-af1d-f53d0085791e" }, @@ -794,15 +800,6 @@ "drafting:ownerName": "Clytemnestras iPhone", "drafting:uniqueID": "B3858A69A29375E6C706226B3633A3A11EB2A774" }, - { - "@id": "kb:operating-system-facet-ad90e7e5-c692-4c59-87c6-d36c463ff1b0", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "iOS", - "uco-observable:manufacturer": { - "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4" - }, - "uco-observable:version": "10.3" - }, { "@id": "kb:wifi-address-facet-00ec20e0-4af9-45c0-9246-7a87e8c47f3d", "@type": "uco-observable:WifiAddressFacet", @@ -815,6 +812,34 @@ } ] }, + { + "@id": "kb:operating-system-9eea07c7-c348-4fa3-aef6-67f2fe651204", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:hasFacet": { + "@id": "kb:software-facet-906f160c-bbc0-48a5-bb0c-7338ebabf1e9", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4" + }, + "uco-observable:version": "10.3" + }, + "uco-core:name": "iOS" + }, + { + "@id": "kb:relationship-3707f6c4-b90a-4c70-9482-bb208d332e85", + "@type": "uco-observable:ObservableRelationship", + "uco-core:isDirectional": true, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:source": { + "@id": "kb:clytemnestra-device-3a61cb3a-422d-4953-af70-25a860456e50" + }, + "uco-core:target": { + "@id": "kb:operating-system-9eea07c7-c348-4fa3-aef6-67f2fe651204" + } + }, { "@id": "kb:clytemnestra-mobileaccount-363dd368-94bd-4dbb-af1d-f53d0085791e", "@type": "uco-observable:MobileAccount", diff --git a/examples/illustrations/Oresteia/Oresteia_validation-unstable-2.0.0.ttl b/examples/illustrations/Oresteia/Oresteia_validation-unstable-2.0.0.ttl index 360d4039..62d020f8 100644 --- a/examples/illustrations/Oresteia/Oresteia_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/Oresteia/Oresteia_validation-unstable-2.0.0.ttl @@ -8,7 +8,7 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; + sh:conforms "true"^^xsd:boolean ; sh:result [ a sh:ValidationResult ; @@ -39,32 +39,6 @@ sh:severity sh:Info ; ] ; sh:value "Phone" ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - 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 ; - 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 ; - ] ; ] ; . diff --git a/examples/illustrations/Oresteia/Oresteia_validation-unstable.ttl b/examples/illustrations/Oresteia/Oresteia_validation-unstable.ttl index 8c54e5e0..62d020f8 100644 --- a/examples/illustrations/Oresteia/Oresteia_validation-unstable.ttl +++ b/examples/illustrations/Oresteia/Oresteia_validation-unstable.ttl @@ -8,7 +8,7 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; + sh:conforms "true"^^xsd:boolean ; sh:result [ a sh:ValidationResult ; @@ -39,34 +39,6 @@ sh:severity sh:Info ; ] ; sh:value "Phone" ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:manufacturer ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:manufacturer ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:version ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:version ; - sh:severity sh:Warning ; - ] ; ] ; . diff --git a/examples/illustrations/Oresteia/figures/Oresteia-relationships.svg b/examples/illustrations/Oresteia/figures/Oresteia-relationships.svg index da50d5c6..9abdd4b5 100644 --- a/examples/illustrations/Oresteia/figures/Oresteia-relationships.svg +++ b/examples/illustrations/Oresteia/figures/Oresteia-relationships.svg @@ -4,37 +4,37 @@ - - + + CASE render of directional relationships - + _9e4cde24c30ce07bf4b9078546ff9ba2d16afcea1003f475930915476ca37d74 - -ID - kb:aeschylus-1ab8a80e-39fb-4209-9781-b10bdbc5d0c2 + +ID - kb:aeschylus-1ab8a80e-39fb-4209-9781-b10bdbc5d0c2 - + _b90dd04faefadfddef4ef2cbda0e12d87ee59eeb0f6fa741cee8917765793ca1 -Has_Role +Has_Role _9e4cde24c30ce07bf4b9078546ff9ba2d16afcea1003f475930915476ca37d74->_b90dd04faefadfddef4ef2cbda0e12d87ee59eeb0f6fa741cee8917765793ca1 - - + + _c0208b102f427ade898c90309434942d4fef5528bc1affd8343be35da6b29783 - -ID - kb:argos-palace-d9633e60-a44c-40f5-a0f0-c5225f3ef90e + +ID - kb:argos-palace-d9633e60-a44c-40f5-a0f0-c5225f3ef90e @@ -42,72 +42,72 @@ _ef8a81f9a607cbdba82858107d0711b4cdfba47eb35796b743993c33e3bd6ed1 - -ID - kb:attachment_file-ad07f4fb-ef85-4a74-ad88-68341a1e9606 + +ID - kb:attachment_file-ad07f4fb-ef85-4a74-ad88-68341a1e9606 - + _45637bcbb853f0203c92731b8a39b72a71721b1b34c873dd98b1a00959d54ac7 -Attachment_Of +Attachment_Of _ef8a81f9a607cbdba82858107d0711b4cdfba47eb35796b743993c33e3bd6ed1->_45637bcbb853f0203c92731b8a39b72a71721b1b34c873dd98b1a00959d54ac7 - - + + _615b47f56ce2df0f9f8f1660f3458349d6870f49d88531323814f159fbe9b568 - -ID - kb:cassandra-1b38d28a-f88f-471f-8f83-16877dedacc0 + +ID - kb:cassandra-1b38d28a-f88f-471f-8f83-16877dedacc0 - + _b72b429aee37083b515cf2763b002db33b90a0ab7cf2c2c75bdfb682659db8f0 -Has_Role +Has_Role _615b47f56ce2df0f9f8f1660f3458349d6870f49d88531323814f159fbe9b568->_b72b429aee37083b515cf2763b002db33b90a0ab7cf2c2c75bdfb682659db8f0 - - + + _68d3376d994fc5710c5e2d65f80584e045aee886122a698a96317b1676fb4133 - -ID - kb:cassandra-device-d2ac1471-2d0f-4032-8cca-53d317600cba + +ID - kb:cassandra-device-d2ac1471-2d0f-4032-8cca-53d317600cba - + _e8f51c6422e762af5ec372aba2edfa5b17d330bc67991d5ebafb3c6b40164746 -Located_At +Located_At _68d3376d994fc5710c5e2d65f80584e045aee886122a698a96317b1676fb4133->_e8f51c6422e762af5ec372aba2edfa5b17d330bc67991d5ebafb3c6b40164746 - - + + - + _effb0da279d756f5e11392dee18c5ab2266928ea70446ec913743bdb6a6ffa69 -Has_Account +Has_Account _68d3376d994fc5710c5e2d65f80584e045aee886122a698a96317b1676fb4133->_effb0da279d756f5e11392dee18c5ab2266928ea70446ec913743bdb6a6ffa69 - - + + @@ -119,7 +119,7 @@ - + _4f717301c984ebdd553b0d5c6d44d72de957833ced09f709bb3e64befc0b9218 Contained_Within @@ -139,7 +139,7 @@ - + _7fa064543a29b1849451edbcb4bb6d9780573e67ec2fe762aee837795624bc92 Contained_Within @@ -153,8 +153,8 @@ _fcd62ae023e4f6f176fd22fb70180871b922a7cc6cc8757239698b2993372d3e - -ID - kb:cassandra-mobileaccount-ddd1303c-a85e-4307-b79e-b800a2420842 + +ID - kb:cassandra-mobileaccount-ddd1303c-a85e-4307-b79e-b800a2420842 @@ -177,7 +177,7 @@ - + _d881e562fcd3ae44153b62db86524322943c6a0533d984b463aa3b44ba328021 Contained_Within @@ -191,28 +191,39 @@ _fc6e8bc0fd80eb2d94f8b312afabf61e0429ddbb0206a09363d0d4bd5e092030 - -ID - kb:clytemnestra-device-3a61cb3a-422d-4953-af70-25a860456e50 + +ID - kb:clytemnestra-device-3a61cb3a-422d-4953-af70-25a860456e50 - + _a47882c823ef7d983a6c6aa904a934ad519098079c9ac83564c363254e175e91 -Has_Account +Has_Account _fc6e8bc0fd80eb2d94f8b312afabf61e0429ddbb0206a09363d0d4bd5e092030->_a47882c823ef7d983a6c6aa904a934ad519098079c9ac83564c363254e175e91 - - + + + + + +_b9803024d67aa0ec5a5107f4b048980a5b92315f92e0d797f5c79928db9b18a5 +Has_Operating_System + + + +_fc6e8bc0fd80eb2d94f8b312afabf61e0429ddbb0206a09363d0d4bd5e092030->_b9803024d67aa0ec5a5107f4b048980a5b92315f92e0d797f5c79928db9b18a5 + + _8c0fc46bcf8294478d6c252feab732f605e8699c2c0730c0397b8b29d29c9537 - -ID - kb:clytemnestra-mobileaccount-363dd368-94bd-4dbb-af1d-f53d0085791e + +ID - kb:clytemnestra-mobileaccount-363dd368-94bd-4dbb-af1d-f53d0085791e @@ -220,28 +231,28 @@ _1b75697124e69347e0e37861741e3f89c7177b85faa74d99437fb21c757963f6 - -ID - kb:electra-a960648e-c88e-4728-9853-7b7f06de8caa + +ID - kb:electra-a960648e-c88e-4728-9853-7b7f06de8caa - + _eb0dcdbc715f5dfd30a76b666abcf6bbc244ec55962a5c1676db17c2c88c2391 -Has_Account +Has_Account - + _1b75697124e69347e0e37861741e3f89c7177b85faa74d99437fb21c757963f6->_eb0dcdbc715f5dfd30a76b666abcf6bbc244ec55962a5c1676db17c2c88c2391 - - + + _99f217e251b6e8f0c829cdde2a3f4851e6be7599d57e33a6bd2a6713c494eec8 - -ID - kb:electra-emailaccount-1a58cfc9-d50a-4861-bd0c-6638250eb0db + +ID - kb:electra-emailaccount-1a58cfc9-d50a-4861-bd0c-6638250eb0db @@ -249,29 +260,29 @@ _6c7a2319969674c8d7a95a587ba3981c2af5c6dde7af5720a93d4869353f43dd - -ID - kb:euripides-3696c710-161f-47af-9ae8-61b178611773 + +ID - kb:euripides-3696c710-161f-47af-9ae8-61b178611773 - + _266d33e5bec2d876ef4a9d5135c3b2b273daf5bbe95278eec601f48ba75be030 -Has_Role +Has_Role - + _6c7a2319969674c8d7a95a587ba3981c2af5c6dde7af5720a93d4869353f43dd->_266d33e5bec2d876ef4a9d5135c3b2b273daf5bbe95278eec601f48ba75be030 - - + + _07100fc0a937adfc2edc1067370f367eb155d9bef13801fe0ed9423948113a1e - -ID - kb:investigative-action-49e0d70c-f1bc-40a4-8866-45ddb8ad4e89 -parsed + +ID - kb:investigative-action-49e0d70c-f1bc-40a4-8866-45ddb8ad4e89 +parsed @@ -279,30 +290,30 @@ _bd40f374d8f2e85d5f211f446a5ea1078f32550ed896c666dc8ea9790dc0093b - -ID - kb:investigative-action-b8fd94b9-ceae-4c2f-aa38-8cfaa98804fe -extracted + +ID - kb:investigative-action-b8fd94b9-ceae-4c2f-aa38-8cfaa98804fe +extracted - + _3a71d01d822c7504c9197e43dbdc76fafa4a7426b8d844ec73859767642c6c43 -Initiated +Initiated - + _bd40f374d8f2e85d5f211f446a5ea1078f32550ed896c666dc8ea9790dc0093b->_3a71d01d822c7504c9197e43dbdc76fafa4a7426b8d844ec73859767642c6c43 - - + + _becc3c40125141cf7a29d5f51b989a313e6be9887b9af5139829b1c44fc36125 - -ID - kb:investigator-6f465841-07f4-40a6-b9ac-7b069a7cf196 -Investigator + +ID - kb:investigator-6f465841-07f4-40a6-b9ac-7b069a7cf196 +Investigator @@ -310,9 +321,9 @@ _f49372e9cffc6109da5e21920d5959ba21cdd104e44aaa036a58d1b4f54e9ff7 - -ID - kb:investigator-72986b46-69f5-4767-878c-d4894be9069e -Investigator + +ID - kb:investigator-72986b46-69f5-4767-878c-d4894be9069e +Investigator @@ -320,112 +331,122 @@ _c62581d0046ddd7f9286f5690ed5e5da6109510e51d833d04549a92b8f9de7e7 - -ID - kb:offender-46a9ed63-122d-40bc-a80d-cf7e047821a6 -Offender + +ID - kb:offender-46a9ed63-122d-40bc-a80d-cf7e047821a6 +Offender - + +_fc2de6dcda6f4fb7edb36f02fad2fba684aef9e25df5271908ac26cd0f2e1daf + + +ID - kb:operating-system-9eea07c7-c348-4fa3-aef6-67f2fe651204 +iOS + + + + + _b16bb4425c7624055199415466c7ab100c5ba20fb7cac77a2357a87b404039a6 - - -ID - kb:orestes-facebookmsg-f7c67008-efe1-441c-8e52-2ec189dd6e56 + + +ID - kb:orestes-facebookmsg-f7c67008-efe1-441c-8e52-2ec189dd6e56 - + _10c65ed8b92b2983766f24d048458224f9001233d2ea8e635f06816e9a83cc7a - - -ID - kb:thyestes-b9111c63-19a8-4bf4-8287-b14485f01b45 + + +ID - kb:thyestes-b9111c63-19a8-4bf4-8287-b14485f01b45 - + _2b7c4405a2fd518dd40adfa80128e4f34a3fc11d1c7755a8addac2077b9e3c56 -Has_Role +Has_Role - + _10c65ed8b92b2983766f24d048458224f9001233d2ea8e635f06816e9a83cc7a->_2b7c4405a2fd518dd40adfa80128e4f34a3fc11d1c7755a8addac2077b9e3c56 - - + + - + _b6c83d2e5bcfd567122fc38eaabbb4d22827bf1d1e94c4ac36bc7d90b31825e3 -Has_Role +Has_Role - + _10c65ed8b92b2983766f24d048458224f9001233d2ea8e635f06816e9a83cc7a->_b6c83d2e5bcfd567122fc38eaabbb4d22827bf1d1e94c4ac36bc7d90b31825e3 - - + + - + _92c39ed2a3925e1e01a9afb18c80fcf5a26286a89904b627642a8f427618327b - - -ID - kb:victim-a0306ec1-d6ef-4db6-96d2-785304d489f4 -Victim + + +ID - kb:victim-a0306ec1-d6ef-4db6-96d2-785304d489f4 +Victim - + _457579b8377eb59d733f4db121bb03ddbcaf80d935708334381b82dc45158f5b -Has_Device +Has_Device - + _92c39ed2a3925e1e01a9afb18c80fcf5a26286a89904b627642a8f427618327b->_457579b8377eb59d733f4db121bb03ddbcaf80d935708334381b82dc45158f5b - - + + - + _2e8fc3ef7ee58ad866ea33d544ee7d3cbbd2ad11c1600a74070262dcc05e20d4 - - -ID - kb:victim-bbb4d46f-099e-4bf8-828e-7befd2a5f535 -Victim + + +ID - kb:victim-bbb4d46f-099e-4bf8-828e-7befd2a5f535 +Victim _b90dd04faefadfddef4ef2cbda0e12d87ee59eeb0f6fa741cee8917765793ca1->_f49372e9cffc6109da5e21920d5959ba21cdd104e44aaa036a58d1b4f54e9ff7 - - + + _45637bcbb853f0203c92731b8a39b72a71721b1b34c873dd98b1a00959d54ac7->_b16bb4425c7624055199415466c7ab100c5ba20fb7cac77a2357a87b404039a6 - - + + _b72b429aee37083b515cf2763b002db33b90a0ab7cf2c2c75bdfb682659db8f0->_92c39ed2a3925e1e01a9afb18c80fcf5a26286a89904b627642a8f427618327b - - + + _e8f51c6422e762af5ec372aba2edfa5b17d330bc67991d5ebafb3c6b40164746->_c0208b102f427ade898c90309434942d4fef5528bc1affd8343be35da6b29783 - - + + _effb0da279d756f5e11392dee18c5ab2266928ea70446ec913743bdb6a6ffa69->_fcd62ae023e4f6f176fd22fb70180871b922a7cc6cc8757239698b2993372d3e - - + + @@ -448,44 +469,50 @@ _a47882c823ef7d983a6c6aa904a934ad519098079c9ac83564c363254e175e91->_8c0fc46bcf8294478d6c252feab732f605e8699c2c0730c0397b8b29d29c9537 - - + + - + +_b9803024d67aa0ec5a5107f4b048980a5b92315f92e0d797f5c79928db9b18a5->_fc2de6dcda6f4fb7edb36f02fad2fba684aef9e25df5271908ac26cd0f2e1daf + + + + + _eb0dcdbc715f5dfd30a76b666abcf6bbc244ec55962a5c1676db17c2c88c2391->_99f217e251b6e8f0c829cdde2a3f4851e6be7599d57e33a6bd2a6713c494eec8 - - + + - + _266d33e5bec2d876ef4a9d5135c3b2b273daf5bbe95278eec601f48ba75be030->_becc3c40125141cf7a29d5f51b989a313e6be9887b9af5139829b1c44fc36125 - - + + - + _3a71d01d822c7504c9197e43dbdc76fafa4a7426b8d844ec73859767642c6c43->_07100fc0a937adfc2edc1067370f367eb155d9bef13801fe0ed9423948113a1e - - + + - + _2b7c4405a2fd518dd40adfa80128e4f34a3fc11d1c7755a8addac2077b9e3c56->_c62581d0046ddd7f9286f5690ed5e5da6109510e51d833d04549a92b8f9de7e7 - - + + - + _b6c83d2e5bcfd567122fc38eaabbb4d22827bf1d1e94c4ac36bc7d90b31825e3->_2e8fc3ef7ee58ad866ea33d544ee7d3cbbd2ad11c1600a74070262dcc05e20d4 - - + + - + _457579b8377eb59d733f4db121bb03ddbcaf80d935708334381b82dc45158f5b->_68d3376d994fc5710c5e2d65f80584e045aee886122a698a96317b1676fb4133 - - + + diff --git a/examples/illustrations/cell_site/cell_site.json b/examples/illustrations/cell_site/cell_site.json index 4f1b914f..bcd5dca4 100644 --- a/examples/illustrations/cell_site/cell_site.json +++ b/examples/illustrations/cell_site/cell_site.json @@ -35,15 +35,6 @@ "@type": "uco-observable:MobileDeviceFacet", "uco-observable:IMEI": "356420075722843" }, - { - "@id": "kb:operating-system-facet-407e9113-cb7c-45af-b456-6de8df391d6f", - "@type": "uco-observable:OperatingSystemFacet", - "uco-core:name": "Android", - "uco-observable:manufacturer": { - "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec" - }, - "uco-observable:version": "6.0.1" - }, { "@id": "kb:bluetooth-address-facet-1206416f-2397-49e9-9606-3ce78b1ea0fd", "@type": "uco-observable:BluetoothAddressFacet", @@ -58,6 +49,34 @@ ], "uco-observable:hasChanged": true }, + { + "@id": "kb:operating-system-66ff1c3d-8cf0-439c-b8b0-5697df555b55", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], + "uco-core:hasFacet": { + "@id": "kb:software-facet-9796be5d-172d-4c84-aaa1-92daa24d49d7", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec" + }, + "uco-observable:version": "6.0.1" + }, + "uco-core:name": "Android" + }, + { + "@id": "kb:relationship-ae5bc717-1bef-433c-8753-4bc19adae8db", + "@type": "uco-observable:ObservableRelationship", + "uco-core:isDirectional": true, + "uco-core:kindOfRelationship": "Has_Operating_System", + "uco-core:source": { + "@id": "kb:6e2c8413-f681-4bc6-a66e-b70a7ecd9d3a" + }, + "uco-core:target": { + "@id": "kb:operating-system-66ff1c3d-8cf0-439c-b8b0-5697df555b55" + } + }, { "@id": "kb:2ca4e1c6-9d27-4ba3-fe34-6da3c591b5e2", "@type": "uco-observable:ObservableRelationship", diff --git a/examples/illustrations/cell_site/cell_site_validation-unstable-2.0.0.ttl b/examples/illustrations/cell_site/cell_site_validation-unstable-2.0.0.ttl index e22bdc0c..fbc74a5d 100644 --- a/examples/illustrations/cell_site/cell_site_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/cell_site/cell_site_validation-unstable-2.0.0.ttl @@ -1,5 +1,4 @@ @prefix core: . -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -8,44 +7,17 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - 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 ; - 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 ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "UcoThings are suggested to end with a UUID." ; - sh:resultSeverity sh:Info ; - sh:sourceConstraint [ - a sh:SPARQLConstraint ; - rdfs:seeAlso ; - sh:message "UcoThings are suggested to end with a UUID."@en ; - sh:select ''' + sh:conforms "true"^^xsd:boolean ; + sh:result [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "UcoThings are suggested to end with a UUID." ; + sh:resultSeverity sh:Info ; + sh:sourceConstraint [ + a sh:SPARQLConstraint ; + rdfs:seeAlso ; + sh:message "UcoThings are suggested to end with a UUID."@en ; + sh:select ''' PREFIX rdfs: PREFIX core: SELECT $this @@ -60,11 +32,10 @@ ) } ''' ; - ] ; - sh:sourceConstraintComponent sh:SPARQLConstraintComponent ; - sh:sourceShape core:UcoThing-identifier-regex-shape ; - sh:value ; - ] - ; + ] ; + sh:sourceConstraintComponent sh:SPARQLConstraintComponent ; + sh:sourceShape core:UcoThing-identifier-regex-shape ; + sh:value ; + ] ; . diff --git a/examples/illustrations/cell_site/cell_site_validation-unstable.ttl b/examples/illustrations/cell_site/cell_site_validation-unstable.ttl index 2a479b60..fbc74a5d 100644 --- a/examples/illustrations/cell_site/cell_site_validation-unstable.ttl +++ b/examples/illustrations/cell_site/cell_site_validation-unstable.ttl @@ -1,5 +1,4 @@ @prefix core: . -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -8,46 +7,17 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:manufacturer ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:manufacturer ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:version ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:version ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "UcoThings are suggested to end with a UUID." ; - sh:resultSeverity sh:Info ; - sh:sourceConstraint [ - a sh:SPARQLConstraint ; - rdfs:seeAlso ; - sh:message "UcoThings are suggested to end with a UUID."@en ; - sh:select ''' + sh:conforms "true"^^xsd:boolean ; + sh:result [ + a sh:ValidationResult ; + sh:focusNode ; + sh:resultMessage "UcoThings are suggested to end with a UUID." ; + sh:resultSeverity sh:Info ; + sh:sourceConstraint [ + a sh:SPARQLConstraint ; + rdfs:seeAlso ; + sh:message "UcoThings are suggested to end with a UUID."@en ; + sh:select ''' PREFIX rdfs: PREFIX core: SELECT $this @@ -62,11 +32,10 @@ ) } ''' ; - ] ; - sh:sourceConstraintComponent sh:SPARQLConstraintComponent ; - sh:sourceShape core:UcoThing-identifier-regex-shape ; - sh:value ; - ] - ; + ] ; + sh:sourceConstraintComponent sh:SPARQLConstraintComponent ; + sh:sourceShape core:UcoThing-identifier-regex-shape ; + sh:value ; + ] ; . diff --git a/examples/illustrations/cell_site/figures/cell_site-relationships.svg b/examples/illustrations/cell_site/figures/cell_site-relationships.svg index 94d3f347..c451757d 100644 --- a/examples/illustrations/cell_site/figures/cell_site-relationships.svg +++ b/examples/illustrations/cell_site/figures/cell_site-relationships.svg @@ -4,77 +4,88 @@ - - + + CASE render of directional relationships - + _a3e52ac9864426a7b675869b9d662696b20d1de9e5f90fef254a846eec03b108 - -ID - kb:3fef85a7-3fb4-4170-ba4d-fc69e2de4789 + +ID - kb:3fef85a7-3fb4-4170-ba4d-fc69e2de4789 - + _45e16a44aba45f0dca90bcf93d690a75aa5bf531d0bc9c8b387b3b2d69aeb107 -Connected_To +Connected_To _a3e52ac9864426a7b675869b9d662696b20d1de9e5f90fef254a846eec03b108->_45e16a44aba45f0dca90bcf93d690a75aa5bf531d0bc9c8b387b3b2d69aeb107 - - + + _cf5884b6460e5276e058c5b58c79537aeb206331673210438fb3355f5da5be0c - -ID - kb:6e2c8413-f681-4bc6-a66e-b70a7ecd9d3a + +ID - kb:6e2c8413-f681-4bc6-a66e-b70a7ecd9d3a - + _51e60013d2768884bde9b62c547b08fde110a43de1cdcb4601ae43787f89bd73 -Contained_Within +Contained_Within _cf5884b6460e5276e058c5b58c79537aeb206331673210438fb3355f5da5be0c->_51e60013d2768884bde9b62c547b08fde110a43de1cdcb4601ae43787f89bd73 - - + + + + + +_e6ad4236a87b9b0a542af4a23cb3664bca9aebffca4d3d39c1615c4800e15dd2 +Has_Operating_System + + + +_cf5884b6460e5276e058c5b58c79537aeb206331673210438fb3355f5da5be0c->_e6ad4236a87b9b0a542af4a23cb3664bca9aebffca4d3d39c1615c4800e15dd2 + + _419c93120fe67a8c1c73be0b79ac39b3251be12e9895554536755e66ce902512 - -ID - kb:dc9b8413-f681-4bc6-a66e-b70a7ecde4d4 + +ID - kb:dc9b8413-f681-4bc6-a66e-b70a7ecde4d4 - + _4f1e8a0cd4fe9b4bdb213ca71502b5596300e9b9d74880e38124e3323e7961c7 -Located_At +Located_At - + _419c93120fe67a8c1c73be0b79ac39b3251be12e9895554536755e66ce902512->_4f1e8a0cd4fe9b4bdb213ca71502b5596300e9b9d74880e38124e3323e7961c7 - - + + _c9f86698cdf6534d3c9ecdeea7035d61483db33644ddc61066994ced6fde34dd - -ID - kb:f2e90997-16c9-4822-be30-fa4f36553768 + +ID - kb:f2e90997-16c9-4822-be30-fa4f36553768 @@ -82,55 +93,71 @@ _1a5e6e99feb963d9b01affbfc0fe4c294aa3ea93a79b6146c31e80eaa6756a3c - -ID - kb:location-403d0147-f7ff-4f3e-aa43-19a988e8a3ee -Location of cell site, denoted by opencellid.org + +ID - kb:location-403d0147-f7ff-4f3e-aa43-19a988e8a3ee +Location of cell site, denoted by opencellid.org - + +_2423239d540d43e532d34dd048e39cc5a47d8fbbbc778a9874fc9f79bbd6e251 + + +ID - kb:operating-system-66ff1c3d-8cf0-439c-b8b0-5697df555b55 +Android + + + + + _74356f2298a366cc671d43a8c926590b61663edd883ac9cd981e16924b476e95 - - -ID - ns1:cell-cite-204-16-1014-13399 + + +ID - ns1:cell-cite-204-16-1014-13399 - + _2bcb4c559e04db723d7cfc8027cf90fe76f7e7deea1b15145f0b0145cf52116a -Located_At +Located_At - + _74356f2298a366cc671d43a8c926590b61663edd883ac9cd981e16924b476e95->_2bcb4c559e04db723d7cfc8027cf90fe76f7e7deea1b15145f0b0145cf52116a - - + + _45e16a44aba45f0dca90bcf93d690a75aa5bf531d0bc9c8b387b3b2d69aeb107->_419c93120fe67a8c1c73be0b79ac39b3251be12e9895554536755e66ce902512 - - + + _51e60013d2768884bde9b62c547b08fde110a43de1cdcb4601ae43787f89bd73->_a3e52ac9864426a7b675869b9d662696b20d1de9e5f90fef254a846eec03b108 - - + + - + +_e6ad4236a87b9b0a542af4a23cb3664bca9aebffca4d3d39c1615c4800e15dd2->_2423239d540d43e532d34dd048e39cc5a47d8fbbbc778a9874fc9f79bbd6e251 + + + + + _4f1e8a0cd4fe9b4bdb213ca71502b5596300e9b9d74880e38124e3323e7961c7->_c9f86698cdf6534d3c9ecdeea7035d61483db33644ddc61066994ced6fde34dd - - + + - + _2bcb4c559e04db723d7cfc8027cf90fe76f7e7deea1b15145f0b0145cf52116a->_1a5e6e99feb963d9b01affbfc0fe4c294aa3ea93a79b6146c31e80eaa6756a3c - - + + diff --git a/examples/illustrations/device/device_validation-unstable-2.0.0.ttl b/examples/illustrations/device/device_validation-unstable-2.0.0.ttl index 57724e4f..33496ff0 100644 --- a/examples/illustrations/device/device_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/device/device_validation-unstable-2.0.0.ttl @@ -1,4 +1,3 @@ -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -7,34 +6,6 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - 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 ; - 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 ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; . diff --git a/examples/illustrations/device/device_validation-unstable.ttl b/examples/illustrations/device/device_validation-unstable.ttl index a82899e3..33496ff0 100644 --- a/examples/illustrations/device/device_validation-unstable.ttl +++ b/examples/illustrations/device/device_validation-unstable.ttl @@ -1,4 +1,3 @@ -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -7,36 +6,6 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:manufacturer ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:manufacturer ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:version ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:version ; - sh:severity sh:Warning ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; . diff --git a/examples/illustrations/file/figures/file-relationships.svg b/examples/illustrations/file/figures/file-relationships.svg index 47c6b02a..0b21d2b1 100644 --- a/examples/illustrations/file/figures/file-relationships.svg +++ b/examples/illustrations/file/figures/file-relationships.svg @@ -4,253 +4,307 @@ - - + + CASE render of directional relationships - + _731e9b52c123809ee3a713aba4b34934fe7f3d8f01b400172f54b698c3524ec7 - -ID - kb:android_device-814c2229-d163-47af-87be-6437b205dde4 + +ID - kb:android_device-814c2229-d163-47af-87be-6437b205dde4 + + +_6f773a1d584dc6712a6750d388b9c88da5b02ad7ce20ef2f9535089f3f625f24 +Has_Operating_System + + + +_731e9b52c123809ee3a713aba4b34934fe7f3d8f01b400172f54b698c3524ec7->_6f773a1d584dc6712a6750d388b9c88da5b02ad7ce20ef2f9535089f3f625f24 + + + _1d1eb954dee8e388adaf711d50b3d7bf2c8f89891ee861bfe1aa13d17cd743aa - -ID - kb:android_image-e1837dd8-2275-436e-8694-1bc8124fc4c9 + +ID - kb:android_image-e1837dd8-2275-436e-8694-1bc8124fc4c9 - + _13b791c5c97222d619965a4065ab3e1defc1d056e2ba80c155333b91a50acf4d -Forensic_Image_Of +Forensic_Image_Of - + _1d1eb954dee8e388adaf711d50b3d7bf2c8f89891ee861bfe1aa13d17cd743aa->_13b791c5c97222d619965a4065ab3e1defc1d056e2ba80c155333b91a50acf4d - - + + - + _23be556c82cfc653336b65a978dfe7d07e0a6e0f919ed1b0854f1090b2d929d5 -Stored_On +Stored_On - + _1d1eb954dee8e388adaf711d50b3d7bf2c8f89891ee861bfe1aa13d17cd743aa->_23be556c82cfc653336b65a978dfe7d07e0a6e0f919ed1b0854f1090b2d929d5 - - + + _d5b0c1420ac6a8d4799dd9e15039d479d8c63e5fe557c6ed0004c33c8223390f - -ID - kb:chunk_of_data-4456c025-6e96-43b3-a2d1-e7b3952a1731 + +ID - kb:chunk_of_data-4456c025-6e96-43b3-a2d1-e7b3952a1731 - + _c7e551c3c24d077cd6a87fd67d7ff22b3741624a153be0cf1dce5ccc9186f2c2 -Contained_Within +Contained_Within - + _d5b0c1420ac6a8d4799dd9e15039d479d8c63e5fe557c6ed0004c33c8223390f->_c7e551c3c24d077cd6a87fd67d7ff22b3741624a153be0cf1dce5ccc9186f2c2 - - + + _a706bf780b833d79f80f4086c4d587acb31cbcc08fcfc2e38e4f4eaae01ab2a9 - -ID - kb:decoded_attachment-b7589f93-79b0-483b-b17d-46f5d9774704 + +ID - kb:decoded_attachment-b7589f93-79b0-483b-b17d-46f5d9774704 - + _e45cea7e349979901d800748109fa989cce8f1fd81a3d60500ff5d719ea59470 -Decoded_From +Decoded_From - + _a706bf780b833d79f80f4086c4d587acb31cbcc08fcfc2e38e4f4eaae01ab2a9->_e45cea7e349979901d800748109fa989cce8f1fd81a3d60500ff5d719ea59470 - - + + _c824ec3979b2849b7db53a7731f00a724abb14980b69f04e655d41348941ef68 - -ID - kb:decrypted_blob-cac885bc-f2f3-405d-907a-8b591aeeaf69 + +ID - kb:decrypted_blob-cac885bc-f2f3-405d-907a-8b591aeeaf69 - + _1e277c6eb6cb69d42fbdae364f7d5b18f5bae93e9d3b8ac43d4cd811c0a393e6 -Decrypted_From +Decrypted_From - + _c824ec3979b2849b7db53a7731f00a724abb14980b69f04e655d41348941ef68->_1e277c6eb6cb69d42fbdae364f7d5b18f5bae93e9d3b8ac43d4cd811c0a393e6 - - + + _fb50929ae6b13ea9d39213b87d8a29c181f50a13ebd3bb9ef8b9929affb0850a - -ID - kb:forensic_lab_computer-89c30df0-5e7f-4076-8f74-3271e730a013 + +ID - kb:forensic_lab_computer-89c30df0-5e7f-4076-8f74-3271e730a013 + + +_51de89037c605e76a09babf186363a663b0c10d375d9b3803fc38131eb5582a5 +Has_Operating_System + + + +_fb50929ae6b13ea9d39213b87d8a29c181f50a13ebd3bb9ef8b9929affb0850a->_51de89037c605e76a09babf186363a663b0c10d375d9b3803fc38131eb5582a5 + + + _c9b3f00b997bf483b04e194a5b3abaf0785c8e427f23764a4d2a520955518c61 - -ID - kb:image_partition-5a804a74-d146-4ab0-87f8-de09fc041a5e + +ID - kb:image_partition-5a804a74-d146-4ab0-87f8-de09fc041a5e - + _3a8185904f6f61fb444cce4c9a20fc52ff07e604a4a7b995753423321d7d1151 -Contained_Within +Contained_Within - + _c9b3f00b997bf483b04e194a5b3abaf0785c8e427f23764a4d2a520955518c61->_3a8185904f6f61fb444cce4c9a20fc52ff07e604a4a7b995753423321d7d1151 - - + + - + +_82ffd1625e025f7b5bf075841a51e21a420487a8d19aa5354ea8258e6cdaf70f + + +ID - kb:operating-system-1d468d48-3ac2-4242-a9cb-61bd47319d43 +Android + + + + + +_70dd5a9c2a3214dd9fb1a4826f2203cec318c8b03391eccf9460e4df92c14664 + + +ID - kb:operating-system-8a0026cb-2f40-460d-baac-e5b8dc2da0e0 +Windows 7 Ultimate Edition + + + + + _3692e07621224964ce63f78ff0bd1b4a45d76a78d3c59b2be2dc646d54fc8b02 - - -ID - kb:sqlite_blob-ef2be7d6-f4d0-48e4-bfc9-2e4432cc08a1 + + +ID - kb:sqlite_blob-ef2be7d6-f4d0-48e4-bfc9-2e4432cc08a1 - + _30ffa5066fc852dc151a972c0542a9600ba27938408256128cbe8cd0d0e9839f -Contained_Within +Contained_Within - + _3692e07621224964ce63f78ff0bd1b4a45d76a78d3c59b2be2dc646d54fc8b02->_30ffa5066fc852dc151a972c0542a9600ba27938408256128cbe8cd0d0e9839f - - + + - + _3bc719bfb3b8e44f94d0c36e6bfd46d7c47911d9ca45f6537a25ba5688ceb07a - - -ID - kb:sqlite_database-0ec9db0f-7dfc-4531-8def-f71505326884 + + +ID - kb:sqlite_database-0ec9db0f-7dfc-4531-8def-f71505326884 - + _04428edf92fc95f1f6b8f7229f4f85f0e75fb8bcaed82105660cfceca6fd03ad -Contained_Within +Contained_Within - + _3bc719bfb3b8e44f94d0c36e6bfd46d7c47911d9ca45f6537a25ba5688ceb07a->_04428edf92fc95f1f6b8f7229f4f85f0e75fb8bcaed82105660cfceca6fd03ad - - + + - + _3618a8847aaea7959d7539abf30b6fb61155c76912d2b2b8d75f40170f693724 - - -ID - kb:tar_archive_file-2857804a-91d7-4cfb-8929-8448d92bb8de + + +ID - kb:tar_archive_file-2857804a-91d7-4cfb-8929-8448d92bb8de - + _093ac51c48f9e2d95de1856316a4bb8927676648c5ba61775c9e91772147b392 -Contained_Within +Contained_Within - + _3618a8847aaea7959d7539abf30b6fb61155c76912d2b2b8d75f40170f693724->_093ac51c48f9e2d95de1856316a4bb8927676648c5ba61775c9e91772147b392 - - + + - + +_6f773a1d584dc6712a6750d388b9c88da5b02ad7ce20ef2f9535089f3f625f24->_82ffd1625e025f7b5bf075841a51e21a420487a8d19aa5354ea8258e6cdaf70f + + + + + _13b791c5c97222d619965a4065ab3e1defc1d056e2ba80c155333b91a50acf4d->_731e9b52c123809ee3a713aba4b34934fe7f3d8f01b400172f54b698c3524ec7 - - + + - + _23be556c82cfc653336b65a978dfe7d07e0a6e0f919ed1b0854f1090b2d929d5->_fb50929ae6b13ea9d39213b87d8a29c181f50a13ebd3bb9ef8b9929affb0850a - - + + - + _c7e551c3c24d077cd6a87fd67d7ff22b3741624a153be0cf1dce5ccc9186f2c2->_a706bf780b833d79f80f4086c4d587acb31cbcc08fcfc2e38e4f4eaae01ab2a9 - - + + - + _e45cea7e349979901d800748109fa989cce8f1fd81a3d60500ff5d719ea59470->_3618a8847aaea7959d7539abf30b6fb61155c76912d2b2b8d75f40170f693724 - - + + - + _1e277c6eb6cb69d42fbdae364f7d5b18f5bae93e9d3b8ac43d4cd811c0a393e6->_3692e07621224964ce63f78ff0bd1b4a45d76a78d3c59b2be2dc646d54fc8b02 - - + + + + + +_51de89037c605e76a09babf186363a663b0c10d375d9b3803fc38131eb5582a5->_70dd5a9c2a3214dd9fb1a4826f2203cec318c8b03391eccf9460e4df92c14664 + + - + _3a8185904f6f61fb444cce4c9a20fc52ff07e604a4a7b995753423321d7d1151->_1d1eb954dee8e388adaf711d50b3d7bf2c8f89891ee861bfe1aa13d17cd743aa - - + + - + _30ffa5066fc852dc151a972c0542a9600ba27938408256128cbe8cd0d0e9839f->_3bc719bfb3b8e44f94d0c36e6bfd46d7c47911d9ca45f6537a25ba5688ceb07a - - + + - + _04428edf92fc95f1f6b8f7229f4f85f0e75fb8bcaed82105660cfceca6fd03ad->_c9b3f00b997bf483b04e194a5b3abaf0785c8e427f23764a4d2a520955518c61 - - + + - + _093ac51c48f9e2d95de1856316a4bb8927676648c5ba61775c9e91772147b392->_c824ec3979b2849b7db53a7731f00a724abb14980b69f04e655d41348941ef68 - - + + diff --git a/examples/illustrations/file/file_validation-unstable-2.0.0.ttl b/examples/illustrations/file/file_validation-unstable-2.0.0.ttl index 8be433ba..33496ff0 100644 --- a/examples/illustrations/file/file_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/file/file_validation-unstable-2.0.0.ttl @@ -1,4 +1,3 @@ -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -7,60 +6,6 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - 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 ; - 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 ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - 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 ; - 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 ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; . diff --git a/examples/illustrations/file/file_validation-unstable.ttl b/examples/illustrations/file/file_validation-unstable.ttl index 1d458a7b..33496ff0 100644 --- a/examples/illustrations/file/file_validation-unstable.ttl +++ b/examples/illustrations/file/file_validation-unstable.ttl @@ -1,4 +1,3 @@ -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -7,64 +6,6 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:manufacturer ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:manufacturer ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:version ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:version ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:manufacturer ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:manufacturer ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:version ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:version ; - sh:severity sh:Warning ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; . diff --git a/examples/illustrations/message/message_validation-unstable-2.0.0.ttl b/examples/illustrations/message/message_validation-unstable-2.0.0.ttl index 5755098a..33496ff0 100644 --- a/examples/illustrations/message/message_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/message/message_validation-unstable-2.0.0.ttl @@ -1,4 +1,3 @@ -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -7,34 +6,6 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - 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 ; - 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 ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; . diff --git a/examples/illustrations/message/message_validation-unstable.ttl b/examples/illustrations/message/message_validation-unstable.ttl index 969af259..33496ff0 100644 --- a/examples/illustrations/message/message_validation-unstable.ttl +++ b/examples/illustrations/message/message_validation-unstable.ttl @@ -1,4 +1,3 @@ -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -7,36 +6,6 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:manufacturer ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:manufacturer ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:version ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:version ; - sh:severity sh:Warning ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; . diff --git a/examples/illustrations/mobile_device_and_sim_card/figures/mobile_device_and_sim_card-relationships.svg b/examples/illustrations/mobile_device_and_sim_card/figures/mobile_device_and_sim_card-relationships.svg index bdeca626..50cdc39f 100644 --- a/examples/illustrations/mobile_device_and_sim_card/figures/mobile_device_and_sim_card-relationships.svg +++ b/examples/illustrations/mobile_device_and_sim_card/figures/mobile_device_and_sim_card-relationships.svg @@ -4,17 +4,17 @@ - - + + CASE render of directional relationships - + _030b2b3d292a0e96e5d9b266598b846b68003ce02e335bb9640c20f30046f16c - -ID - kb:mobile-account-09da8ec2-8d6c-41e3-8bd9-bfd06a550141 + +ID - kb:mobile-account-09da8ec2-8d6c-41e3-8bd9-bfd06a550141 @@ -22,53 +22,80 @@ _24a9a37485728687fca54e74d00ad17835c29b778f6dfdb7b6a4f0951486d4e8 - -ID - kb:mobile-device-d5143a67-8b61-491b-a5e9-863b606e296a + +ID - kb:mobile-device-d5143a67-8b61-491b-a5e9-863b606e296a - + _b0bb7a1295b5f952386de6fae9cd972d2f64a81cdcc9738e08495ea02d8ecc61 -Has_Account +Has_Account _24a9a37485728687fca54e74d00ad17835c29b778f6dfdb7b6a4f0951486d4e8->_b0bb7a1295b5f952386de6fae9cd972d2f64a81cdcc9738e08495ea02d8ecc61 - - + + - + + +_88f52e52bb69c6c61fca689aab017a92903d5ffffd19608b6d829ddeb19830bd +Has_Operating_System + + + +_24a9a37485728687fca54e74d00ad17835c29b778f6dfdb7b6a4f0951486d4e8->_88f52e52bb69c6c61fca689aab017a92903d5ffffd19608b6d829ddeb19830bd + + + + +_34c98012b5d6bbb9bf451f8c46f0cf0b2bc43c515ffc166daeaac56cdfef5acf + + +ID - kb:operating-system-be32618a-dade-4284-9435-f18be7e035c6 +iOS + + + + + _5a7f6e874d92a227db7468aa56df2d7d1dcdde8950dbe12f95afb6ab1527c540 - - -ID - kb:sim-card-8b2024b5-1e73-405c-b89f-6e4be86692ef + + +ID - kb:sim-card-8b2024b5-1e73-405c-b89f-6e4be86692ef - + _cfc073381201585455119f64da5c6a84f7513fffa7e5fe64468812f2ae9c1215 -Contained_Within +Contained_Within - + _5a7f6e874d92a227db7468aa56df2d7d1dcdde8950dbe12f95afb6ab1527c540->_cfc073381201585455119f64da5c6a84f7513fffa7e5fe64468812f2ae9c1215 - - + + _b0bb7a1295b5f952386de6fae9cd972d2f64a81cdcc9738e08495ea02d8ecc61->_030b2b3d292a0e96e5d9b266598b846b68003ce02e335bb9640c20f30046f16c - - + + - + +_88f52e52bb69c6c61fca689aab017a92903d5ffffd19608b6d829ddeb19830bd->_34c98012b5d6bbb9bf451f8c46f0cf0b2bc43c515ffc166daeaac56cdfef5acf + + + + + _cfc073381201585455119f64da5c6a84f7513fffa7e5fe64468812f2ae9c1215->_24a9a37485728687fca54e74d00ad17835c29b778f6dfdb7b6a4f0951486d4e8 - - + + diff --git a/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable-2.0.0.ttl b/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable-2.0.0.ttl index 7bfd6bb2..33496ff0 100644 --- a/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable-2.0.0.ttl @@ -1,4 +1,3 @@ -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -7,34 +6,6 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - 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 ; - 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 ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; . diff --git a/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable.ttl b/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable.ttl index 2a2e103d..33496ff0 100644 --- a/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable.ttl +++ b/examples/illustrations/mobile_device_and_sim_card/mobile_device_and_sim_card_validation-unstable.ttl @@ -1,4 +1,3 @@ -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -7,36 +6,6 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:manufacturer ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:manufacturer ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:version ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:version ; - sh:severity sh:Warning ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; . diff --git a/examples/illustrations/partitions/partitions.json b/examples/illustrations/partitions/partitions.json index ee0b4902..019e814a 100644 --- a/examples/illustrations/partitions/partitions.json +++ b/examples/illustrations/partitions/partitions.json @@ -1936,15 +1936,21 @@ "uco-observable:OperatingSystem", "uco-observable:Software" ], - "uco-core:hasFacet": { - "@id": "kb:OperatingSystemFacet-aeb7c83f-3fc6-4775-806a-a83b7a875623", - "@type": "uco-observable:OperatingSystemFacet", - "drafting:buildID": "22621.2283", - "uco-observable:manufacturer": { - "@id": "kb:Organization-a94338c2-030a-493f-9d26-55cade656276" + "uco-core:hasFacet": [ + { + "@id": "kb:OperatingSystemFacet-aeb7c83f-3fc6-4775-806a-a83b7a875623", + "@type": "uco-observable:OperatingSystemFacet", + "drafting:buildID": "22621.2283" }, - "uco-observable:version": "22H2" - }, + { + "@id": "kb:SoftwareFacet-247fe7a7-8434-4fca-8f9b-ac7e136f6ca5", + "@type": "uco-observable:SoftwareFacet", + "uco-observable:manufacturer": { + "@id": "kb:Organization-a94338c2-030a-493f-9d26-55cade656276" + }, + "uco-observable:version": "22H2" + } + ], "uco-core:name": "Windows 11 Pro" }, { diff --git a/examples/illustrations/partitions/partitions_validation-unstable-2.0.0.ttl b/examples/illustrations/partitions/partitions_validation-unstable-2.0.0.ttl index 4d22b045..33496ff0 100644 --- a/examples/illustrations/partitions/partitions_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/partitions/partitions_validation-unstable-2.0.0.ttl @@ -1,4 +1,3 @@ -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -7,34 +6,6 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - 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 ; - 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 ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; . diff --git a/examples/illustrations/partitions/partitions_validation-unstable.ttl b/examples/illustrations/partitions/partitions_validation-unstable.ttl index 568b2fd0..33496ff0 100644 --- a/examples/illustrations/partitions/partitions_validation-unstable.ttl +++ b/examples/illustrations/partitions/partitions_validation-unstable.ttl @@ -1,4 +1,3 @@ -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -7,36 +6,6 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; - sh:result - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:manufacturer ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:manufacturer ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ; - sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:version ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:version ; - sh:severity sh:Warning ; - ] ; - ] - ; + sh:conforms "true"^^xsd:boolean ; . diff --git a/examples/illustrations/spear_phishing/spear_phishing.ttl b/examples/illustrations/spear_phishing/spear_phishing.ttl index 2bc32700..89511553 100644 --- a/examples/illustrations/spear_phishing/spear_phishing.ttl +++ b/examples/illustrations/spear_phishing/spear_phishing.ttl @@ -564,15 +564,16 @@ kb:operating-system-900c35f2-f000-4bc5-92ae-16b96152b0d6 uco-observable:Software ; rdfs:comment "TODO, UCO - bitness should use the BitnessVocabulary." ; - uco-core:hasFacet kb:operating-system-facet-9081ae82-8691-4830-9846-c3a4b26e7398 ; + uco-core:hasFacet + kb:operating-system-facet-9081ae82-8691-4830-9846-c3a4b26e7398 , + kb:software-facet-686c4cb6-6f9a-45c5-b1b6-8d6d520f5d2e + ; uco-core:name "Windows 10 Enterprise Evaluation" ; . kb:operating-system-facet-9081ae82-8691-4830-9846-c3a4b26e7398 a uco-observable:OperatingSystemFacet ; uco-observable:bitness "64" ; - uco-observable:manufacturer ; - uco-observable:version "10.0" ; . kb:process-facet-054efc43-754d-4c8b-9106-5c690cdc3cfc @@ -619,6 +620,12 @@ kb:relationship-7cbcc94e-0472-46bd-8cf5-86c33b27c0a0 uco-core:target kb:ManagerRole01 ; . +kb:software-facet-686c4cb6-6f9a-45c5-b1b6-8d6d520f5d2e + a uco-observable:SoftwareFacet ; + uco-observable:manufacturer ; + uco-observable:version "10.0" ; + . + kb:url-a9b1bdec-8228-4356-a18c-a5357eee613d a uco-observable:URL ; uco-core:hasFacet kb:url-facet-431dc4be-8a13-4aaa-8762-91e152fbee25 ; diff --git a/examples/illustrations/spear_phishing/spear_phishing_validation-unstable-2.0.0.ttl b/examples/illustrations/spear_phishing/spear_phishing_validation-unstable-2.0.0.ttl index 4886b816..13031562 100644 --- a/examples/illustrations/spear_phishing/spear_phishing_validation-unstable-2.0.0.ttl +++ b/examples/illustrations/spear_phishing/spear_phishing_validation-unstable-2.0.0.ttl @@ -1,5 +1,4 @@ @prefix ep: . -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -9,7 +8,7 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; + sh:conforms "true"^^xsd:boolean ; sh:result [ a sh:ValidationResult ; @@ -625,32 +624,6 @@ sh:resultSeverity sh:Info ; sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; sh:sourceShape ep:designatedBy-shape ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ep:operating-system-facet-9081ae82-8691-4830-9846-c3a4b26e7398 ; - 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 ep:operating-system-facet-9081ae82-8691-4830-9846-c3a4b26e7398 ; - 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 ; - ] ; ] ; . diff --git a/examples/illustrations/spear_phishing/spear_phishing_validation-unstable.ttl b/examples/illustrations/spear_phishing/spear_phishing_validation-unstable.ttl index 5c256b7f..13031562 100644 --- a/examples/illustrations/spear_phishing/spear_phishing_validation-unstable.ttl +++ b/examples/illustrations/spear_phishing/spear_phishing_validation-unstable.ttl @@ -1,5 +1,4 @@ @prefix ep: . -@prefix observable: . @prefix owl: . @prefix rdf: . @prefix rdfs: . @@ -9,7 +8,7 @@ [] a sh:ValidationReport ; - sh:conforms "false"^^xsd:boolean ; + sh:conforms "true"^^xsd:boolean ; sh:result [ a sh:ValidationResult ; @@ -625,34 +624,6 @@ sh:resultSeverity sh:Info ; sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; sh:sourceShape ep:designatedBy-shape ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ep:operating-system-facet-9081ae82-8691-4830-9846-c3a4b26e7398 ; - sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:manufacturer ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:manufacturer ; - sh:severity sh:Warning ; - ] ; - ] , - [ - a sh:ValidationResult ; - sh:focusNode ep:operating-system-facet-9081ae82-8691-4830-9846-c3a4b26e7398 ; - sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:resultPath observable:version ; - sh:resultSeverity sh:Warning ; - sh:sourceConstraintComponent sh:MaxCountConstraintComponent ; - sh:sourceShape [ - sh:maxCount "0"^^xsd:integer ; - sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; - sh:path observable:version ; - sh:severity sh:Warning ; - ] ; ] ; .