Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump prerelease pointers #303

Merged
merged 16 commits into from
Oct 17, 2024
Merged

Bump prerelease pointers #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
07608ff
Bump unstable pointers
ajnelson-nist Sep 11, 2024
74573a7
Regenerate Make-managed files
ajnelson-nist Sep 11, 2024
de5fc7f
Bump unstable pointers
ajnelson-nist Sep 11, 2024
54077b6
Regenerate Make-managed files
ajnelson-nist Sep 11, 2024
a049764
Bump prerelease pointers
ajnelson-nist Sep 11, 2024
4496d7d
Regenerate Make-managed files
ajnelson-nist Sep 11, 2024
7fcde0e
Bump unstable pointers
ajnelson-nist Sep 11, 2024
987c464
Merge branch 'master' into bump_prerelease_pointers
ajnelson-nist Oct 16, 2024
2b33da9
Bump unstable pointers
ajnelson-nist Oct 16, 2024
8bad53e
Regenerate Make-managed files
ajnelson-nist Oct 16, 2024
190872a
Bump prerelease pointers
ajnelson-nist Oct 16, 2024
7e40d7c
Regenerate Make-managed files
ajnelson-nist Oct 16, 2024
ff32f1d
Bump unstable pointers
ajnelson-nist Oct 16, 2024
d45c080
Regenerate Make-managed files
ajnelson-nist Oct 16, 2024
73d429d
Migrate software properties of operating systems into new objects; ad…
ajnelson-nist Oct 16, 2024
3799583
Regenerate Make-managed files
ajnelson-nist Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies/CASE-develop
Open in desktop
Submodule CASE-develop updated 1 files
+1 −1 dependencies/UCO
2 changes: 1 addition & 1 deletion dependencies/CASE-unstable
Open in desktop
Submodule CASE-unstable updated 2 files
+1 −1 dependencies/UCO
+0 −1 ontology/vocabulary/vocabulary.ttl
2 changes: 1 addition & 1 deletion dependencies/CASE-unstable-2.0.0
Open in desktop
Submodule CASE-unstable-2.0.0 updated 2 files
+1 −1 dependencies/UCO
+0 −1 ontology/vocabulary/vocabulary.ttl
49 changes: 40 additions & 9 deletions examples/asgard/asgard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,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"
}
]
},
Expand All @@ -112,6 +118,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"
}
]
},
Expand Down Expand Up @@ -159,15 +171,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",
Expand All @@ -180,6 +183,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",
Expand Down
49 changes: 40 additions & 9 deletions examples/asgard/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,12 @@ <h6>Examples of an InvestigativeAction &amp; ProvenanceRecord Objects</h6>
},
{
"@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"
}
]
},
Expand All @@ -152,6 +158,12 @@ <h6>Examples of an InvestigativeAction &amp; ProvenanceRecord Objects</h6>
"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"
}
]
},
Expand Down Expand Up @@ -199,15 +211,6 @@ <h6>Examples of an InvestigativeAction &amp; ProvenanceRecord Objects</h6>
"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",
Expand All @@ -220,6 +223,34 @@ <h6>Examples of an InvestigativeAction &amp; ProvenanceRecord Objects</h6>
}
]
},
{
"@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",
Expand Down
49 changes: 40 additions & 9 deletions examples/asgard/src/asgard-1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
},
Expand All @@ -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"
}
]
},
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
59 changes: 46 additions & 13 deletions examples/crossover_wmd/crossover_wmd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,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",
Expand All @@ -102,6 +92,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",
Expand Down Expand Up @@ -193,9 +218,17 @@
{
"@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"
}
]
},
{
"@id": "kb:file-f7cad990-6687-4849-89dc-55795675f3f5",
Expand Down
59 changes: 46 additions & 13 deletions examples/crossover_wmd/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,17 @@ <h4>CASE Representation of data extraction</h4>
{
"@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"
}
]
}
]
{% endhighlight %}
Expand Down Expand Up @@ -550,16 +558,6 @@ <h4>CASE Representation of Android Device Properties</h4>
],
"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",
Expand All @@ -572,6 +570,41 @@ <h4>CASE Representation of Android Device Properties</h4>
}
]
},
{
"@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",
Expand Down
Loading
Loading