Skip to content

Commit

Permalink
Merge pull request #151 from casework/UCO-Feature-Issue-632
Browse files Browse the repository at this point in the history 
UCO Issue 632: Migrate software properties of operating systems into new objects; add relationships
  • Loading branch information
@kchason
kchason authored Oct 18, 2024
2 parents ccadef0 + fb8600c commit 7d74280
Show file tree
Hide file tree
Showing 18 changed files with 769 additions and 433 deletions.
2 changes: 1 addition & 1 deletion dependencies/CASE-unstable
Submodule CASE-unstable updated 1 files
+1 −1 dependencies/UCO
2 changes: 1 addition & 1 deletion dependencies/CASE-unstable-2.0.0
Submodule CASE-unstable-2.0.0 updated 1 files
+1 −1 dependencies/UCO
43 changes: 34 additions & 9 deletions examples/illustrations/Oresteia/Oresteia.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
319 changes: 173 additions & 146 deletions examples/illustrations/Oresteia/figures/Oresteia-relationships.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 34 additions & 9 deletions examples/illustrations/Oresteia/src/Oresteia_base.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
37 changes: 28 additions & 9 deletions examples/illustrations/cell_site/cell_site.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Loading

0 comments on commit 7d74280

Please sign in to comment.