Merge pull request #265 from casework/bump_prerelease_pointers

casework · Dec 22, 2023 · 026b641 · 026b641
2 parents 454cb47 + f163b49
commit 026b641
Show file tree

Hide file tree

Showing 17 changed files with 217 additions and 45 deletions.
diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable
diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0
diff --git a/examples/crossover_heist/crossover_heist.json b/examples/crossover_heist/crossover_heist.json
@@ -51,7 +51,7 @@
         },
         {
             "@id": "kb:Relationship-ec126575-d6a4-4590-9690-f2571a48b8ac",
-            "@type": "uco-observable:ObservableRelationship",
+            "@type": "uco-core:Relationship",
             "uco-core:source": {
                 "@id": "kb:Identity-cbfbd171-e56c-4f59-a01b-4404a1e5eb28"
             },

diff --git a/examples/crossover_heist/index.html b/examples/crossover_heist/index.html
@@ -86,7 +86,7 @@ <h4>CASE Representation of Investigation</h4>
         },
         {
             "@id": "kb:Relationship-ec126575-d6a4-4590-9690-f2571a48b8ac",
-            "@type": "uco-observable:ObservableRelationship",
+            "@type": "uco-core:Relationship",
             "uco-core:source": {
                 "@id": "kb:Identity-cbfbd171-e56c-4f59-a01b-4404a1e5eb28"
             },

diff --git a/examples/crossover_heist/src/crossover_heist_base.json b/examples/crossover_heist/src/crossover_heist_base.json
@@ -51,7 +51,7 @@
         },
         {
             "@id": "kb:Relationship-ec126575-d6a4-4590-9690-f2571a48b8ac",
-            "@type": "uco-observable:ObservableRelationship",
+            "@type": "uco-core:Relationship",
             "uco-core:source": {
                 "@id": "kb:Identity-cbfbd171-e56c-4f59-a01b-4404a1e5eb28"
             },

diff --git a/examples/crossover_wmd/crossover_wmd.json b/examples/crossover_wmd/crossover_wmd.json
@@ -487,7 +487,7 @@
         },
         {
             "@id": "kb:investigatorrole-e9a01d66-fff4-4fa8-88d4-8e445f3369aa",
-            "@type": "uco-observable:ObservableRelationship",
+            "@type": "uco-core:Relationship",
             "uco-core:source": {
                 "@id": "kb:identity-0108480e-1e7a-4341-8b1d-558877c4cc39"
             },

diff --git a/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl b/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl
@@ -1,3 +1,4 @@
+@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -8,7 +9,7 @@
 
 []
 	a sh:ValidationReport ;
-	sh:conforms "true"^^xsd:boolean ;
+	sh:conforms "false"^^xsd:boolean ;
 	sh:result
 		[
 			a sh:ValidationResult ;
@@ -39,6 +40,32 @@
 				sh:severity sh:Info ;
 			] ;
 			sh:value "Phone" ;
+		] ,
+		[
+			a sh:ValidationResult ;
+			sh:focusNode <http://example.org/kb/primaryuser-email-3c4d0804-6ed0-4dfe-a152-3dab6b5f9111> ;
+			sh:resultMessage "Value does not have class uco-observable:Observable" ;
+			sh:resultPath core:source ;
+			sh:resultSeverity sh:Violation ;
+			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
+			sh:sourceShape [
+				sh:class uco-observable:Observable ;
+				sh:path core:source ;
+			] ;
+			sh:value <http://example.org/kb/primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19> ;
+		] ,
+		[
+			a sh:ValidationResult ;
+			sh:focusNode <http://example.org/kb/primaryuser-whatsapp-b295bc93-b65c-4670-a5d7-5c2206d78e92> ;
+			sh:resultMessage "Value does not have class uco-observable:Observable" ;
+			sh:resultPath core:source ;
+			sh:resultSeverity sh:Violation ;
+			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
+			sh:sourceShape [
+				sh:class uco-observable:Observable ;
+				sh:path core:source ;
+			] ;
+			sh:value <http://example.org/kb/primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19> ;
 		]
 		;
 	.

diff --git a/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl b/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl
@@ -1,3 +1,4 @@
+@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -8,7 +9,7 @@
 
 []
 	a sh:ValidationReport ;
-	sh:conforms "true"^^xsd:boolean ;
+	sh:conforms "false"^^xsd:boolean ;
 	sh:result
 		[
 			a sh:ValidationResult ;
@@ -39,6 +40,36 @@
 				sh:severity sh:Info ;
 			] ;
 			sh:value "Phone" ;
+		] ,
+		[
+			a sh:ValidationResult ;
+			sh:focusNode <http://example.org/kb/primaryuser-email-3c4d0804-6ed0-4dfe-a152-3dab6b5f9111> ;
+			sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+			sh:resultPath core:source ;
+			sh:resultSeverity sh:Warning ;
+			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
+			sh:sourceShape [
+				sh:class uco-observable:Observable ;
+				sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+				sh:path core:source ;
+				sh:severity sh:Warning ;
+			] ;
+			sh:value <http://example.org/kb/primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19> ;
+		] ,
+		[
+			a sh:ValidationResult ;
+			sh:focusNode <http://example.org/kb/primaryuser-whatsapp-b295bc93-b65c-4670-a5d7-5c2206d78e92> ;
+			sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+			sh:resultPath core:source ;
+			sh:resultSeverity sh:Warning ;
+			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
+			sh:sourceShape [
+				sh:class uco-observable:Observable ;
+				sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+				sh:path core:source ;
+				sh:severity sh:Warning ;
+			] ;
+			sh:value <http://example.org/kb/primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19> ;
 		]
 		;
 	.

diff --git a/examples/crossover_wmd/index.html b/examples/crossover_wmd/index.html
@@ -368,7 +368,7 @@ <h4>CASE Representation of data extraction</h4>
     },
     {
         "@id": "kb:investigatorrole-e9a01d66-fff4-4fa8-88d4-8e445f3369aa",
-        "@type": "uco-observable:ObservableRelationship",
+        "@type": "uco-core:Relationship",
         "uco-core:source": {
             "@id": "kb:identity-0108480e-1e7a-4341-8b1d-558877c4cc39"
         },

diff --git a/examples/crossover_wmd/src/crossover_wmd-investigator_role.json b/examples/crossover_wmd/src/crossover_wmd-investigator_role.json
@@ -18,7 +18,7 @@
     },
     {
         "@id": "kb:investigatorrole-e9a01d66-fff4-4fa8-88d4-8e445f3369aa",
-        "@type": "uco-observable:ObservableRelationship",
+        "@type": "uco-core:Relationship",
         "uco-core:source": {
             "@id": "kb:identity-0108480e-1e7a-4341-8b1d-558877c4cc39"
         },

diff --git a/examples/hardware_duplicator/hardware_duplicator.json b/examples/hardware_duplicator/hardware_duplicator.json
@@ -49,7 +49,7 @@
                 },
                 {
                     "@id": "kb:relationship-d5b4a1e1-0e25-4257-81f7-19febc86ded1",
-                    "@type": "uco-observable:ObservableRelationship",
+                    "@type": "uco-core:Relationship",
                     "uco-core:source": {
                         "@id": "kb:identity-c5bb09c3-3612-4bf2-b165-6f12d0e3c6af"
                     },

diff --git a/examples/hardware_duplicator/index.html b/examples/hardware_duplicator/index.html
@@ -68,7 +68,7 @@ <h3>CASE INVESTIGATION CONTEXT</h3>
                 },
                 {
                     "@id": "kb:relationship-d5b4a1e1-0e25-4257-81f7-19febc86ded1",
-                    "@type": "uco-observable:ObservableRelationship",
+                    "@type": "uco-core:Relationship",
                     "uco-core:source": {
                         "@id": "kb:identity-c5bb09c3-3612-4bf2-b165-6f12d0e3c6af"
                     },

diff --git a/examples/hardware_duplicator/src/hardware_duplicator_base.json b/examples/hardware_duplicator/src/hardware_duplicator_base.json
@@ -49,7 +49,7 @@
                 },
                 {
                     "@id": "kb:relationship-d5b4a1e1-0e25-4257-81f7-19febc86ded1",
-                    "@type": "uco-observable:ObservableRelationship",
+                    "@type": "uco-core:Relationship",
                     "uco-core:source": {
                         "@id": "kb:identity-c5bb09c3-3612-4bf2-b165-6f12d0e3c6af"
                     },

diff --git a/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl b/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl
@@ -1,3 +1,4 @@
+@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -8,21 +9,62 @@
 
 []
 	a sh:ValidationReport ;
-	sh:conforms "true"^^xsd:boolean ;
-	sh:result [
-		a sh:ValidationResult ;
-		sh:focusNode <http://example.org/kb/account-facet-ccba5bf1-e927-40a9-bce5-d6dc8a3d8758> ;
-		sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
-		sh:resultPath uco-observable:accountType ;
-		sh:resultSeverity sh:Info ;
-		sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
-		sh:sourceShape [
-			sh:datatype vocabulary:AccountTypeVocab ;
-			sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
-			sh:path uco-observable:accountType ;
-			sh:severity sh:Info ;
-		] ;
-		sh:value "phone" ;
-	] ;
+	sh:conforms "false"^^xsd:boolean ;
+	sh:result
+		[
+			a sh:ValidationResult ;
+			sh:focusNode <http://example.org/kb/account-facet-ccba5bf1-e927-40a9-bce5-d6dc8a3d8758> ;
+			sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
+			sh:resultPath uco-observable:accountType ;
+			sh:resultSeverity sh:Info ;
+			sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
+			sh:sourceShape [
+				sh:datatype vocabulary:AccountTypeVocab ;
+				sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
+				sh:path uco-observable:accountType ;
+				sh:severity sh:Info ;
+			] ;
+			sh:value "phone" ;
+		] ,
+		[
+			a sh:ValidationResult ;
+			sh:focusNode <http://example.org/kb/cameralocation-relationship-c6f64e98-68c5-4d2e-9ae8-a7e110f2ac83> ;
+			sh:resultMessage "Value does not have class uco-observable:Observable" ;
+			sh:resultPath core:source ;
+			sh:resultSeverity sh:Violation ;
+			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
+			sh:sourceShape [
+				sh:class uco-observable:Observable ;
+				sh:path core:source ;
+			] ;
+			sh:value <http://example.org/kb/latlong-8667ec82-8c21-11e9-934e-0c4de9c21b53> ;
+		] ,
+		[
+			a sh:ValidationResult ;
+			sh:focusNode <http://example.org/kb/primaryuser-email-cb34b068-324b-4162-a9e5-6c96879b061c> ;
+			sh:resultMessage "Value does not have class uco-observable:Observable" ;
+			sh:resultPath core:source ;
+			sh:resultSeverity sh:Violation ;
+			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
+			sh:sourceShape [
+				sh:class uco-observable:Observable ;
+				sh:path core:source ;
+			] ;
+			sh:value <http://example.org/kb/primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f> ;
+		] ,
+		[
+			a sh:ValidationResult ;
+			sh:focusNode <http://example.org/kb/primaryuser-faceboook-cb34b068-324b-4162-a9e5-6c96879b061c> ;
+			sh:resultMessage "Value does not have class uco-observable:Observable" ;
+			sh:resultPath core:source ;
+			sh:resultSeverity sh:Violation ;
+			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
+			sh:sourceShape [
+				sh:class uco-observable:Observable ;
+				sh:path core:source ;
+			] ;
+			sh:value <http://example.org/kb/primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f> ;
+		]
+		;
 	.
 
diff --git a/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl b/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl
@@ -1,3 +1,4 @@
+@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -8,21 +9,68 @@
 
 []
 	a sh:ValidationReport ;
-	sh:conforms "true"^^xsd:boolean ;
-	sh:result [
-		a sh:ValidationResult ;
-		sh:focusNode <http://example.org/kb/account-facet-ccba5bf1-e927-40a9-bce5-d6dc8a3d8758> ;
-		sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
-		sh:resultPath uco-observable:accountType ;
-		sh:resultSeverity sh:Info ;
-		sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
-		sh:sourceShape [
-			sh:datatype vocabulary:AccountTypeVocab ;
-			sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
-			sh:path uco-observable:accountType ;
-			sh:severity sh:Info ;
-		] ;
-		sh:value "phone" ;
-	] ;
+	sh:conforms "false"^^xsd:boolean ;
+	sh:result
+		[
+			a sh:ValidationResult ;
+			sh:focusNode <http://example.org/kb/account-facet-ccba5bf1-e927-40a9-bce5-d6dc8a3d8758> ;
+			sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
+			sh:resultPath uco-observable:accountType ;
+			sh:resultSeverity sh:Info ;
+			sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
+			sh:sourceShape [
+				sh:datatype vocabulary:AccountTypeVocab ;
+				sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
+				sh:path uco-observable:accountType ;
+				sh:severity sh:Info ;
+			] ;
+			sh:value "phone" ;
+		] ,
+		[
+			a sh:ValidationResult ;
+			sh:focusNode <http://example.org/kb/cameralocation-relationship-c6f64e98-68c5-4d2e-9ae8-a7e110f2ac83> ;
+			sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+			sh:resultPath core:source ;
+			sh:resultSeverity sh:Warning ;
+			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
+			sh:sourceShape [
+				sh:class uco-observable:Observable ;
+				sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+				sh:path core:source ;
+				sh:severity sh:Warning ;
+			] ;
+			sh:value <http://example.org/kb/latlong-8667ec82-8c21-11e9-934e-0c4de9c21b53> ;
+		] ,
+		[
+			a sh:ValidationResult ;
+			sh:focusNode <http://example.org/kb/primaryuser-email-cb34b068-324b-4162-a9e5-6c96879b061c> ;
+			sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+			sh:resultPath core:source ;
+			sh:resultSeverity sh:Warning ;
+			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
+			sh:sourceShape [
+				sh:class uco-observable:Observable ;
+				sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+				sh:path core:source ;
+				sh:severity sh:Warning ;
+			] ;
+			sh:value <http://example.org/kb/primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f> ;
+		] ,
+		[
+			a sh:ValidationResult ;
+			sh:focusNode <http://example.org/kb/primaryuser-faceboook-cb34b068-324b-4162-a9e5-6c96879b061c> ;
+			sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+			sh:resultPath core:source ;
+			sh:resultSeverity sh:Warning ;
+			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
+			sh:sourceShape [
+				sh:class uco-observable:Observable ;
+				sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+				sh:path core:source ;
+				sh:severity sh:Warning ;
+			] ;
+			sh:value <http://example.org/kb/primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f> ;
+		]
+		;
 	.
 
diff --git a/ontology/CASE-unstable-2.0.0.ttl b/ontology/CASE-unstable-2.0.0.ttl
@@ -8617,6 +8617,16 @@ observable:ObservableRelationship
 		;
 	rdfs:label "ObservableRelationship"@en ;
 	rdfs:comment "An observable relationship is a grouping of characteristics unique to an assertion of an association between two observable objects."@en ;
+	sh:property
+		[
+			sh:class observable:Observable ;
+			sh:path core:source ;
+		] ,
+		[
+			sh:class observable:Observable ;
+			sh:path core:target ;
+		]
+		;
 	sh:targetClass observable:ObservableRelationship ;
 	.
 

diff --git a/ontology/CASE-unstable.ttl b/ontology/CASE-unstable.ttl
@@ -8545,6 +8545,20 @@ observable:ObservableRelationship
 		;
 	rdfs:label "ObservableRelationship"@en ;
 	rdfs:comment "An observable relationship is a grouping of characteristics unique to an assertion of an association between two observable objects."@en ;
+	sh:property
+		[
+			sh:class observable:Observable ;
+			sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+			sh:path core:source ;
+			sh:severity sh:Warning ;
+		] ,
+		[
+			sh:class observable:Observable ;
+			sh:message "The target on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+			sh:path core:target ;
+			sh:severity sh:Warning ;
+		]
+		;
 	sh:targetClass observable:ObservableRelationship ;
 	.