Use configuration-namespace concepts for Tool configurations

A follow-on patch will regenerate Make-managed files. References: * ucoProject/UCO#432 Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
casework · Aug 22, 2022 · 051e6cc · 051e6cc
1 parent 2fa28fa
commit 051e6cc
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 68 deletions.
diff --git a/examples/asgard/src/asgard-2.json b/examples/asgard/src/asgard-2.json
@@ -51,30 +51,29 @@
     },
     {
         "@id": "kb:tool-embeddedextractor1-uid",
-        "@type": "uco-tool:Tool",
+        "@type": "uco-tool:ConfiguredTool",
         "uco-core:name": "Embedded Device Extrator",
         "uco-tool:toolType": "Extraction",
         "uco-tool:creator": {
             "@id": "kb:person-38cb4243-bc7e-48a4-91b0-9d296b8f862a"
         },
         "uco-tool:version": "1.2.0",
-        "uco-core:hasFacet": [
-            {
-                "@type": "uco-tool:ToolConfigurationTypeFacet",
-                "uco-tool:configurationSettings": [
-                    {
-                        "@type": "uco-tool:ConfigurationSettingType",
-                        "uco-tool:itemName": "ExtractionMethod",
-                        "uco-tool:itemValue": "iOS_Backup"
-                    },
-                    {
-                        "@type": "uco-tool:ConfigurationSettingType",
-                        "uco-tool:itemName": "ExtractionType",
-                        "uco-tool:itemValue": "File System"
-                    }
-                ]
-            }
-        ]
+        "uco-configuration:usesConfiguration": {
+            "@id": "kb:configuration-23657472-c4c9-472b-835c-a105e8832064",
+            "@type": "uco-configuration:Configuration",
+            "uco-configuration:configurationEntry": [
+                {
+                    "@type": "uco-configuration:ConfigurationEntry",
+                    "uco-configuration:itemName": "ExtractionMethod",
+                    "uco-configuration:itemValue": "iOS_Backup"
+                },
+                {
+                    "@type": "uco-configuration:ConfigurationEntry",
+                    "uco-configuration:itemName": "ExtractionType",
+                    "uco-configuration:itemValue": "File System"
+                }
+            ]
+        }
     },
     {
         "@id": "kb:suspect-mobiledevice-forensicduplicate-uuid",

diff --git a/examples/asgard/src/asgard_base.json b/examples/asgard/src/asgard_base.json
@@ -8,6 +8,7 @@
         "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
         "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
         "uco-action": "https://ontology.unifiedcyberontology.org/uco/action/",
+        "uco-configuration": "https://ontology.unifiedcyberontology.org/uco/configuration/",
         "uco-core": "https://ontology.unifiedcyberontology.org/uco/core/",
         "uco-identity": "https://ontology.unifiedcyberontology.org/uco/identity/",
         "uco-location": "https://ontology.unifiedcyberontology.org/uco/location/",

diff --git a/examples/crossover_wmd/src/crossover_wmd-data_extraction.json b/examples/crossover_wmd/src/crossover_wmd-data_extraction.json
@@ -1,31 +1,30 @@
 [
     {
         "@id": "kb:cellebrite-ufed1-uuid",
-        "@type": "uco-tool:Tool",
+        "@type": "uco-tool:ConfiguredTool",
         "uco-core:name": "UFED",
         "uco-tool:toolType": "Extraction",
         "drafting:toolIdentifier": "557488159",
         "uco-tool:creator": {
             "@id": "kb:organization-ff30d83e-ff57-45f9-8d54-e79b323c2e8b"
         },
         "uco-tool:version": "7.1.0.751",
-        "uco-core:hasFacet": [
-            {
-                "@type": "uco-tool:ToolConfigurationTypeFacet",
-                "uco-tool:configurationSettings": [
-                    {
-                        "@type": "uco-tool:ConfigurationSettingType",
-                        "uco-tool:itemName": "DeviceInfoConnectionType",
-                        "uco-tool:itemValue": "Cable No. 130"
-                    },
-                    {
-                        "@type": "uco-tool:ConfigurationSettingType",
-                        "uco-tool:itemName": "ExtractionType",
-                        "uco-tool:itemValue": "Physical"
-                    }
-                ]
-            }
-        ]
+        "uco-configuration:usesConfiguration": {
+            "@id": "kb:7d574534-2013-414e-a349-77d819d5d8d7",
+            "@type": "uco-configuration:Configuration",
+            "uco-configuration:configurationEntry": [
+                {
+                    "@type": "uco-configuration:ConfigurationEntry",
+                    "uco-configuration:itemName": "DeviceInfoConnectionType",
+                    "uco-configuration:itemValue": "Cable No. 130"
+                },
+                {
+                    "@type": "uco-configuration:ConfigurationEntry",
+                    "uco-configuration:itemName": "ExtractionType",
+                    "uco-configuration:itemValue": "Physical"
+                }
+            ]
+        }
     },
     {
         "@id": "kb:organization-ff30d83e-ff57-45f9-8d54-e79b323c2e8b",

diff --git a/examples/crossover_wmd/src/crossover_wmd-report_generation.json b/examples/crossover_wmd/src/crossover_wmd-report_generation.json
@@ -1,25 +1,24 @@
 [
     {
         "@id": "kb:cellebrite-pa1-uuid",
-        "@type": "uco-tool:Tool",
+        "@type": "uco-tool:ConfiguredTool",
         "uco-core:name": "Physical Analyser",
         "uco-tool:toolType": "Analysis",
         "uco-tool:creator": {
             "@id": "kb:organization-ff30d83e-ff57-45f9-8d54-e79b323c2e8b"
         },
         "uco-tool:version": "7.1.0.106",
-        "uco-core:hasFacet": [
-            {
-                "@type": "uco-tool:ToolConfigurationTypeFacet",
-                "uco-tool:configurationSettings": [
-                    {
-                        "@type": "uco-tool:ConfigurationSettingType",
-                        "uco-tool:itemName": "OutputFormat",
-                        "uco-tool:itemValue": "XML"
-                    }
-                ]
-            }
-        ]
+        "uco-configuration:usesConfiguration": {
+            "@id": "kb:configuration-eb85b199-51a9-49bb-bd07-3a8c5e8c7aa3",
+            "@type": "uco-configuration:Configuration",
+            "uco-configuration:configurationEntry": [
+                {
+                    "@type": "uco-configuration:ConfigurationEntry",
+                    "uco-configuration:itemName": "OutputFormat",
+                    "uco-configuration:itemValue": "XML"
+                }
+            ]
+        }
     },
     {
         "@id": "kb:investigative-action2-uuid",

diff --git a/examples/crossover_wmd/src/crossover_wmd_base.json b/examples/crossover_wmd/src/crossover_wmd_base.json
@@ -7,6 +7,7 @@
         "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
         "kb": "http://example.org/kb/",
         "uco-action": "https://ontology.unifiedcyberontology.org/uco/action/",
+        "uco-configuration": "https://ontology.unifiedcyberontology.org/uco/configuration/",
         "uco-core": "https://ontology.unifiedcyberontology.org/uco/core/",
         "uco-identity": "https://ontology.unifiedcyberontology.org/uco/identity/",
         "uco-location": "https://ontology.unifiedcyberontology.org/uco/location/",

diff --git a/examples/owl_trafficking/src/owl_trafficking-01.json b/examples/owl_trafficking/src/owl_trafficking-01.json
@@ -1,30 +1,29 @@
 [
     {
         "@id": "kb:magnet-acquire2005412-83715215-c5fc-4231-99ff-29a3c51cb5f1",
-        "@type": "uco-tool:Tool",
+        "@type": "uco-tool:ConfiguredTool",
         "uco-core:name": "Magnet ACQUIRE",
         "uco-tool:toolType": "Extraction",
         "uco-tool:creator": {
             "@id": "kb:organization-magnet-1ad4338b-fa60-4823-b9af-38de3d388e36"
         },
         "uco-tool:version": "2.0.0.5412",
-        "uco-core:hasFacet": [
-            {
-                "@type": "uco-tool:ToolConfigurationTypeFacet",
-                "uco-tool:configurationSettings": [
-                    {
-                        "@type": "uco-tool:ConfigurationSettingType",
-                        "uco-tool:itemName": "DeviceInfoConnectionType",
-                        "uco-tool:itemValue": "Cable No. 10"
-                    },
-                    {
-                        "@type": "uco-tool:ConfigurationSettingType",
-                        "uco-tool:itemName": "ExtractionType",
-                        "uco-tool:itemValue": "Physical"
-                    }
-                ]
-            }
-        ]
+        "uco-configuration:usesConfiguration": {
+            "@id": "kb:configuration-6cd3efd7-9550-4913-94a4-92d2579dc778",
+            "@type": "uco-configuration:Configuration",
+            "uco-configuration:configurationEntry": [
+                {
+                    "@type": "uco-configuration:ConfigurationEntry",
+                    "uco-configuration:itemName": "DeviceInfoConnectionType",
+                    "uco-configuration:itemValue": "Cable No. 10"
+                },
+                {
+                    "@type": "uco-configuration:ConfigurationEntry",
+                    "uco-configuration:itemName": "ExtractionType",
+                    "uco-configuration:itemValue": "Physical"
+                }
+            ]
+        }
     },
     {
         "@id": "kb:organization-magnet-1ad4338b-fa60-4823-b9af-38de3d388e36",

diff --git a/examples/owl_trafficking/src/owl_trafficking_base.json b/examples/owl_trafficking/src/owl_trafficking_base.json
@@ -7,6 +7,7 @@
         "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
         "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
         "uco-action": "https://ontology.unifiedcyberontology.org/uco/action/",
+        "uco-configuration": "https://ontology.unifiedcyberontology.org/uco/configuration/",
         "uco-core": "https://ontology.unifiedcyberontology.org/uco/core/",
         "uco-identity": "https://ontology.unifiedcyberontology.org/uco/identity/",
         "uco-location": "https://ontology.unifiedcyberontology.org/uco/location/",

diff --git a/examples/owl_trafficking/src/query-imaging_action.sparql b/examples/owl_trafficking/src/query-imaging_action.sparql
@@ -43,7 +43,7 @@ WHERE {
     .
 
   ?nImagingTool
-    a uco-tool:Tool ;
+    a/rdfs:subClassOf* uco-tool:Tool ;
     uco-core:name ?lToolName ;
     uco-tool:version ?lToolVersion ;
     .