From f88f5afec308f2acbdf562711869e26049cfa6e1 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Fri, 10 May 2024 16:23:24 -0400 Subject: [PATCH] Port Application and Operating System subclass alignment A follow-on patch will regenerate Make-managed files. References: * https://github.com/ucoProject/UCO/issues/596 Signed-off-by: Alex Nelson --- examples/illustrations/Oresteia/Oresteia.json | 5 ++++- examples/illustrations/accounts/accounts.json | 10 ++++++++-- examples/illustrations/call_log/call_log.json | 15 +++++++++++--- .../forensic_lifecycle.json | 5 ++++- examples/illustrations/message/message.json | 15 +++++++++++--- .../src/partitions-supplemental.json | 5 ++++- .../sms_and_contacts/sms_and_contacts.json | 15 +++++++++++--- .../spear_phishing/spear_phishing.json | 20 +++++++++++++++---- 8 files changed, 72 insertions(+), 18 deletions(-) diff --git a/examples/illustrations/Oresteia/Oresteia.json b/examples/illustrations/Oresteia/Oresteia.json index 0b7552de..69511119 100644 --- a/examples/illustrations/Oresteia/Oresteia.json +++ b/examples/illustrations/Oresteia/Oresteia.json @@ -1412,7 +1412,10 @@ }, { "@id": "kb:sms-application-4e98e83c-4d9e-48da-ac3a-9bc42b7a545e", - "@type": "uco-observable:Application" + "@type": [ + "uco-observable:Application", + "uco-observable:Software" + ] }, { "@id": "kb:sms-message-853716fe-c35e-45af-81d3-368dfb6b7eba", diff --git a/examples/illustrations/accounts/accounts.json b/examples/illustrations/accounts/accounts.json index 426d80a5..cb1ec8f3 100644 --- a/examples/illustrations/accounts/accounts.json +++ b/examples/illustrations/accounts/accounts.json @@ -31,11 +31,17 @@ }, { "@id": "kb:application-ed4caa32-84c8-4813-b21d-f350e47cba7c", - "@type": "uco-observable:Application" + "@type": [ + "uco-observable:Application", + "uco-observable:Software" + ] }, { "@id": "kb:application-db5e8cbe-70e7-4dff-b981-2c5751b7923c", - "@type": "uco-observable:Application" + "@type": [ + "uco-observable:Application", + "uco-observable:Software" + ] }, { "@id": "kb:facebook_org-84a47032-567a-4580-9b88-f0141abdc7bf", diff --git a/examples/illustrations/call_log/call_log.json b/examples/illustrations/call_log/call_log.json index afd78219..d744b70c 100644 --- a/examples/illustrations/call_log/call_log.json +++ b/examples/illustrations/call_log/call_log.json @@ -26,15 +26,24 @@ }, { "@id": "kb:application-79636b28-77c9-4005-b62d-b87a233687ef", - "@type": "uco-observable:Application" + "@type": [ + "uco-observable:Application", + "uco-observable:Software" + ] }, { "@id": "kb:application-a5378ee2-32e0-40ba-b31c-3a5c110e7a29", - "@type": "uco-observable:Application" + "@type": [ + "uco-observable:Application", + "uco-observable:Software" + ] }, { "@id": "kb:application-b01d8144-5fa9-44e9-a5f9-668d433b6108", - "@type": "uco-observable:Application" + "@type": [ + "uco-observable:Application", + "uco-observable:Software" + ] }, { "@id": "kb:phone_account-4e172ed5-7b58-4903-96fe-4558f46820ba", diff --git a/examples/illustrations/forensic_lifecycle/forensic_lifecycle.json b/examples/illustrations/forensic_lifecycle/forensic_lifecycle.json index 2eaaab0e..d757e0b4 100644 --- a/examples/illustrations/forensic_lifecycle/forensic_lifecycle.json +++ b/examples/illustrations/forensic_lifecycle/forensic_lifecycle.json @@ -1170,7 +1170,10 @@ }, { "@id": "kb:os-ca81c2d9-d496-4a06-a0f5-0b6bd5647a9e", - "@type": "uco-observable:OperatingSystem" + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ] }, { "@id": "kb:parser-26d4c427-5408-46cb-9ecd-90f570b2947b", diff --git a/examples/illustrations/message/message.json b/examples/illustrations/message/message.json index 24f4fa2f..079c8702 100644 --- a/examples/illustrations/message/message.json +++ b/examples/illustrations/message/message.json @@ -19,7 +19,10 @@ }, { "@id": "kb:os-abf0fe20-6852-4004-82bb-d9e8da06aea6", - "@type": "uco-observable:OperatingSystem", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], "uco-core:hasFacet": [ { "@id": "kb:operating-system-facet-04d6b0b1-b491-4438-b889-d16a28dffaa4", @@ -34,7 +37,10 @@ }, { "@id": "kb:application-5340d5ad-0fe1-463c-a461-f211e64edfd4", - "@type": "uco-observable:Application", + "@type": [ + "uco-observable:Application", + "uco-observable:Software" + ], "uco-core:hasFacet": [ { "@id": "kb:application-facet-d3237eac-1805-43b2-8ff2-58f7c71f0ac6", @@ -51,7 +57,10 @@ }, { "@id": "kb:application-5630b5c9-5a2d-4864-b3c4-3e434404d996", - "@type": "uco-observable:Application" + "@type": [ + "uco-observable:Application", + "uco-observable:Software" + ] }, { "@id": "kb:account-3b61cb4c-f5fd-428c-80d7-79ac841a4f87", diff --git a/examples/illustrations/partitions/src/partitions-supplemental.json b/examples/illustrations/partitions/src/partitions-supplemental.json index 59cb525c..87e1ed64 100644 --- a/examples/illustrations/partitions/src/partitions-supplemental.json +++ b/examples/illustrations/partitions/src/partitions-supplemental.json @@ -6,7 +6,10 @@ }, { "@id": "kb:OperatingSystem-cccf32d9-3d70-4513-8e33-ff6127a7da61", - "@type": "uco-observable:OperatingSystem", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], "uco-core:name": "Windows 11 Pro", "uco-core:hasFacet": { "@id": "kb:OperatingSystemFacet-aeb7c83f-3fc6-4775-806a-a83b7a875623", diff --git a/examples/illustrations/sms_and_contacts/sms_and_contacts.json b/examples/illustrations/sms_and_contacts/sms_and_contacts.json index 45e83606..0c7d7f91 100644 --- a/examples/illustrations/sms_and_contacts/sms_and_contacts.json +++ b/examples/illustrations/sms_and_contacts/sms_and_contacts.json @@ -11,7 +11,10 @@ "@graph": [ { "@id": "kb:sms_application-97fd9144-39d2-4da2-b955-c8ee9df9848b", - "@type": "uco-observable:Application" + "@type": [ + "uco-observable:Application", + "uco-observable:Software" + ] }, { "@id": "kb:sms_message-3f59e298-ac20-433b-adaa-2c5efe510ba2", @@ -195,11 +198,17 @@ }, { "@id": "kb:os-5b6c1685-c603-4df4-9728-026ebfc78cd5", - "@type": "uco-observable:OperatingSystem" + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ] }, { "@id": "kb:android_phonebook-5907a3f4-3e63-44d1-8501-2a33adfa4b72", - "@type": "uco-observable:Application", + "@type": [ + "uco-observable:Application", + "uco-observable:Software" + ], "uco-core:hasFacet": [ { "@id": "kb:application-facet-2d0fc498-fb73-481a-a996-99fe941b1fd5", diff --git a/examples/illustrations/spear_phishing/spear_phishing.json b/examples/illustrations/spear_phishing/spear_phishing.json index 82d050c9..85478be6 100644 --- a/examples/illustrations/spear_phishing/spear_phishing.json +++ b/examples/illustrations/spear_phishing/spear_phishing.json @@ -781,7 +781,10 @@ }, { "@id": "kb:operating-system-900c35f2-f000-4bc5-92ae-16b96152b0d6", - "@type": "uco-observable:OperatingSystem", + "@type": [ + "uco-observable:OperatingSystem", + "uco-observable:Software" + ], "rdfs:comment": "TODO, UCO - bitness should use the BitnessVocabulary.", "uco-core:name": "Windows 10 Enterprise Evaluation", "uco-core:hasFacet": { @@ -849,7 +852,10 @@ }, { "@id": "kb:windows-process-82b66ba3-5fb3-4fdc-a34a-5dbb077e28b6", - "@type": "uco-observable:WindowsProcess", + "@type": [ + "uco-observable:WindowsProcess", + "uco-observable:Software" + ], "uco-core:hasFacet": [ { "@id": "kb:process-facet-837f4a50-97ba-4726-b85e-5988f5d4a69b", @@ -878,7 +884,10 @@ }, { "@id": "kb:windows-process-9bea652f-27d1-49ad-897f-6963977f3bc2", - "@type": "uco-observable:WindowsProcess", + "@type": [ + "uco-observable:WindowsProcess", + "uco-observable:Software" + ], "uco-core:hasFacet": { "@id": "kb:process-facet-8486787d-a29f-4250-b77e-108cbe4675ac", "@type": "uco-observable:ProcessFacet", @@ -891,7 +900,10 @@ }, { "@id": "kb:windows-process-b2afcc1c-2f41-4b4d-8c8f-b74d4b7ec22c", - "@type": "uco-observable:WindowsProcess", + "@type": [ + "uco-observable:WindowsProcess", + "uco-observable:Software" + ], "uco-core:description": "Browser process" }, {