Migrate software properties of operating systems into new objects; ad…

…d relationships and provenance A follow-on patch will regenerate Make-managed files. References: * ucoProject/UCO#632 Signed-off-by: Alex Nelson <[email protected]>
casework · Oct 16, 2024 · 73d429d · 73d429d
1 parent d45c080
commit 73d429d
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 32 deletions.
diff --git a/examples/asgard/src/asgard-1.json b/examples/asgard/src/asgard-1.json
@@ -23,6 +23,12 @@
             },
             {
                 "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f"
+            },
+            {
+                "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3"
+            },
+            {
+                "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4"
             }
         ]
     },
@@ -34,6 +40,12 @@
         "uco-core:object": [
             {
                 "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f"
+            },
+            {
+                "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3"
+            },
+            {
+                "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4"
             }
         ]
     },
@@ -81,15 +93,6 @@
                 "drafting:uniqueID": "B3858A69A29375E6C706226B3633A3A11EB2A774",
                 "drafting:ownerName": "Loki iPhone"
             },
-            {
-                "@id": "kb:operating-system-facet-262f1b31-e23d-4324-84cb-5d55528caf63",
-                "@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-27d5903b-0037-4a98-acad-4f5003461899",
                 "@type": "uco-observable:WifiAddressFacet",
@@ -102,6 +105,34 @@
             }
         ]
     },
+    {
+        "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3",
+        "@type": [
+            "uco-observable:OperatingSystem",
+            "uco-observable:Software"
+        ],
+        "uco-core:name": "iOS",
+        "uco-core:hasFacet": {
+            "@id": "kb:software-facet-fbedb8fd-0b1c-4470-a8dd-14612514bd56",
+            "@type": "uco-observable:SoftwareFacet",
+            "uco-observable:manufacturer": {
+                "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4"
+            },
+            "uco-observable:version": "10.3"
+        }
+    },
+    {
+        "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4",
+        "@type": "uco-observable:ObservableRelationship",
+        "uco-core:kindOfRelationship": "Has_Operating_System",
+        "uco-core:isDirectional": true,
+        "uco-core:source": {
+            "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f"
+        },
+        "uco-core:target": {
+            "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3"
+        }
+    },
     {
         "@id": "kb:mobileaccount-74b4e46a-bee3-48f7-a5db-a6178d92aa90",
         "@type": "uco-observable:MobileAccount",

diff --git a/examples/crossover_wmd/src/crossover_wmd-android_device_properties.json b/examples/crossover_wmd/src/crossover_wmd-android_device_properties.json
@@ -40,16 +40,6 @@
                 ],
                 "uco-observable:IMEI": "356420075722843"
             },
-            {
-                "@id": "kb:operating-system-facet-b55d7244-720f-4fb8-a4d3-2a26d407a353",
-                "@type": "uco-observable:OperatingSystemFacet",
-                "uco-core:name": "Android",
-                "uco-observable:manufacturer": {
-                    "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec"
-                },
-                "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259",
-                "uco-observable:version": "6.0.1"
-            },
             {
                 "@id": "kb:wifi-address-facet-047a5278-1e8a-4e38-b2f6-1b77894624b8",
                 "@type": "uco-observable:WifiAddressFacet",
@@ -62,6 +52,41 @@
             }
         ]
     },
+    {
+        "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d",
+        "@type": [
+            "uco-observable:OperatingSystem",
+            "uco-observable:Software"
+        ],
+        "uco-core:name": "Android",
+        "uco-core:hasFacet": [
+            {
+                "@id": "kb:operating-system-facet-b55d7244-720f-4fb8-a4d3-2a26d407a353",
+                "@type": "uco-observable:OperatingSystemFacet",
+                "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259"
+            },
+            {
+                "@id": "kb:software-facet-da02e9c9-b35b-42e7-bbc8-013b15e17803",
+                "@type": "uco-observable:SoftwareFacet",
+                "uco-observable:manufacturer": {
+                    "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec"
+                },
+                "uco-observable:version": "6.0.1"
+            }
+        ]
+    },
+    {
+        "@id": "kb:relationship-aca6d788-12e4-45d1-8f00-06a63579309d",
+        "@type": "uco-observable:ObservableRelationship",
+        "uco-core:isDirectional": true,
+        "uco-core:kindOfRelationship": "Has_Operating_System",
+        "uco-core:source": {
+            "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4"
+        },
+        "uco-core:target": {
+            "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d"
+        }
+    },
     {
         "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec",
         "@type": "uco-identity:Organization",

diff --git a/examples/crossover_wmd/src/crossover_wmd-data_extraction.json b/examples/crossover_wmd/src/crossover_wmd-data_extraction.json
@@ -85,8 +85,16 @@
     {
         "@id": "kb:provenancerecord-9326149a-31c5-4d20-ada3-b97743d3e563",
         "@type": "case-investigation:ProvenanceRecord",
-        "uco-core:object": {
-            "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4"
-        }
+        "uco-core:object": [
+            {
+                "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4"
+            },
+            {
+                "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d"
+            },
+            {
+                "@id": "kb:relationship-aca6d788-12e4-45d1-8f00-06a63579309d"
+            }
+        ]
     }
 ]
diff --git a/examples/owl_trafficking/src/owl_trafficking-02.json b/examples/owl_trafficking/src/owl_trafficking-02.json
@@ -16,6 +16,12 @@
         "uco-core:object": [
             {
                 "@id": "kb:lge-device-eee670c6-01d4-4e42-bb6b-ebeca149b168"
+            },
+            {
+                "@id": "kb:operating-system-c56dde27-0a50-49dc-ae9e-8a0473e80137"
+            },
+            {
+                "@id": "kb:relationship-b41ecf43-d68c-440e-a8ae-b5978ebcbf98"
             }
         ]
     },

diff --git a/examples/owl_trafficking/src/owl_trafficking-03.json b/examples/owl_trafficking/src/owl_trafficking-03.json
@@ -51,16 +51,6 @@
                 },
                 "uco-observable:storageCapacityInBytes": 31268536320
             },
-            {
-                "@id": "kb:operating-system-facet-478dc553-2d39-45ff-8974-d3d1b8df7c75",
-                "@type": "uco-observable:OperatingSystemFacet",
-                "uco-core:name": "Android",
-                "uco-observable:manufacturer": {
-                    "@id": "kb:organization-lge-e7ae1d96-e054-44b5-9943-8da6515e8332"
-                },
-                "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259",
-                "uco-observable:version": "6.0.1"
-            },
             {
                 "@id": "kb:wifi-address-facet-57724dcb-18f7-4913-a659-64ca79336107",
                 "@type": "uco-observable:WifiAddressFacet",
@@ -73,6 +63,41 @@
             }
         ]
     },
+    {
+        "@id": "kb:operating-system-c56dde27-0a50-49dc-ae9e-8a0473e80137",
+        "@type": [
+            "uco-observable:OperatingSystem",
+            "uco-observable:Software"
+        ],
+        "uco-core:name": "Android",
+        "uco-core:hasFacet": [
+            {
+                "@id": "kb:operating-system-facet-478dc553-2d39-45ff-8974-d3d1b8df7c75",
+                "@type": "uco-observable:OperatingSystemFacet",
+                "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259"
+            },
+            {
+                "@id": "kb:software-facet-a3cd613c-1c35-4f0e-8983-a4720121fa9e",
+                "@type": "uco-observable:SoftwareFacet",
+                "uco-observable:manufacturer": {
+                    "@id": "kb:organization-lge-e7ae1d96-e054-44b5-9943-8da6515e8332"
+                },
+                "uco-observable:version": "6.0.1"
+            }
+        ]
+    },
+    {
+        "@id": "kb:relationship-b41ecf43-d68c-440e-a8ae-b5978ebcbf98",
+        "@type": "uco-observable:ObservableRelationship",
+        "uco-core:source": {
+            "@id": "kb:lge-device-eee670c6-01d4-4e42-bb6b-ebeca149b168"
+        },
+        "uco-core:target": {
+            "@id": "kb:operating-system-c56dde27-0a50-49dc-ae9e-8a0473e80137"
+        },
+        "uco-core:kindOfRelationship": "Has_Operating_System",
+        "uco-core:isDirectional": true
+    },
     {
         "@id": "kb:relationship-6d7a7a20-ca70-4f7f-994d-c2db39e08545",
         "@type": "uco-core:Relationship",