Skip to content

Commit

Permalink
De-duplicate node identifiers from Crossover Heist scenario data
Browse files Browse the repository at this point in the history 
A follow-on patch will regenerate Make-managed files.

References:
* #138

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
  • Loading branch information
@ajnelson-nist
ajnelson-nist committed Jan 9, 2024
1 parent ee2f560 commit 7437719
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion examples/illustrations/partitions/src/partitions-diskpartition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"drafting:diskPartitionLength": 52428800
},
{
"@id": "kb:recovered-object-facet-0a916246-a9a0-43ad-a158-ae76cc2c1bb7",
"@id": "kb:recovered-object-facet-f135ac26-bbf0-4eab-949b-6a5dfe147c22",
"@type": "uco-observable:RecoveredObjectFacet",
"uco-observable:contentRecoveredStatus": {
"@type": "uco-vocabulary:RecoveredObjectStatusVocab",
Expand Down
8 changes: 4 additions & 4 deletions examples/illustrations/partitions/src/partitions-preparation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@id": "kb:Tool-e7ce892b-8a19-4f62-b43d-4736ccb6b696"
},
"uco-action:performer": {
"@id": "kb:Role-870e2626-5ffd-4a80-83c2-8ee429709c81"
"@id": "kb:Role-4e37c6b0-f4d7-4720-baa6-0a8f421180f8"
},
"uco-action:object": [
{
Expand Down Expand Up @@ -124,7 +124,7 @@
"uco-core:name": "file_copier.py",
"uco-core:description": "A one-off test subject population script.",
"prov:wasAttributedTo": {
"@id": "kb:Identity-cbfbd171-e56c-4f59-a01b-4404a1e5eb28"
"@id": "kb:Identity-4090b871-838f-4e42-b33e-f7b69928e804"
}
},
{
Expand All @@ -138,7 +138,7 @@
"@id": "kb:Tool-8ae63f46-44cb-40d9-9e50-539b29f05ea8"
},
"uco-action:performer": {
"@id": "kb:Role-870e2626-5ffd-4a80-83c2-8ee429709c81"
"@id": "kb:Role-4e37c6b0-f4d7-4720-baa6-0a8f421180f8"
},
"uco-action:object": [
{
Expand Down Expand Up @@ -316,7 +316,7 @@
"@id": "kb:Tool-e7ce892b-8a19-4f62-b43d-4736ccb6b696"
},
"uco-action:performer": {
"@id": "kb:Role-870e2626-5ffd-4a80-83c2-8ee429709c81"
"@id": "kb:Role-4e37c6b0-f4d7-4720-baa6-0a8f421180f8"
},
"uco-action:object": [
{
Expand Down
40 changes: 20 additions & 20 deletions examples/illustrations/partitions/src/partitions_base.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,22 @@
"uco-core:description": "Test whether digital forensic tools can correctly detect and recover deleted partiton and overwritten file.",
"uco-core:object": [
{
"@id": "kb:Identity-cbfbd171-e56c-4f59-a01b-4404a1e5eb28"
"@id": "kb:Identity-4090b871-838f-4e42-b33e-f7b69928e804"
},
{
"@id": "kb:Role-870e2626-5ffd-4a80-83c2-8ee429709c81"
"@id": "kb:Role-4e37c6b0-f4d7-4720-baa6-0a8f421180f8"
},
{
"@id": "kb:Relationship-ec126575-d6a4-4590-9690-f2571a48b8ac"
"@id": "kb:Relationship-e1d02a55-16aa-4490-a115-1695ed8be2d4"
},
{
"@id": "kb:ConfiguredTool-22cb1ad6-7910-4a71-8654-5e93280111a3"
},
{
"@id": "kb:organization-cf3010bb-7716-473d-98ee-25e4917e7b80"
"@id": "kb:organization-c9223e2e-4a3b-436d-ad5f-10794d8e17fa"
},
{
"@id": "kb:InvestigativeAction-e019ed92-af10-4a9f-a914-7a9ba539807c"
"@id": "kb:InvestigativeAction-e55a3d16-a516-4ebe-bba2-cf7aa9a6b8ba"
},
{
"@id": "kb:Disk-8ad9fa04-cf49-4082-b828-29b7f01f47cb"
Expand Down Expand Up @@ -137,23 +137,23 @@
]
},
{
"@id": "kb:Identity-cbfbd171-e56c-4f59-a01b-4404a1e5eb28",
"@id": "kb:Identity-4090b871-838f-4e42-b33e-f7b69928e804",
"@type": "uco-identity:Organization",
"uco-core:name": "Chris Hargreaves"
},
{
"@id": "kb:Role-870e2626-5ffd-4a80-83c2-8ee429709c81",
"@id": "kb:Role-4e37c6b0-f4d7-4720-baa6-0a8f421180f8",
"@type": "uco-role:Role",
"uco-core:name": "Forensic Researcher"
},
{
"@id": "kb:Relationship-ec126575-d6a4-4590-9690-f2571a48b8ac",
"@id": "kb:Relationship-e1d02a55-16aa-4490-a115-1695ed8be2d4",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:Identity-cbfbd171-e56c-4f59-a01b-4404a1e5eb28"
"@id": "kb:Identity-4090b871-838f-4e42-b33e-f7b69928e804"
},
"uco-core:target": {
"@id": "kb:Role-870e2626-5ffd-4a80-83c2-8ee429709c81"
"@id": "kb:Role-4e37c6b0-f4d7-4720-baa6-0a8f421180f8"
},
"uco-core:kindOfRelationship": "Has_Role",
"uco-core:isDirectional": true
Expand All @@ -164,7 +164,7 @@
"uco-core:name": "Tool 5",
"uco-tool:toolType": "acquisition/duplication",
"uco-tool:creator": {
"@id": "kb:organization-cf3010bb-7716-473d-98ee-25e4917e7b80"
"@id": "kb:organization-c9223e2e-4a3b-436d-ad5f-10794d8e17fa"
},
"uco-tool:version": "5.6.7",
"uco-configuration:usesConfiguration": {
Expand Down Expand Up @@ -193,12 +193,12 @@
}
},
{
"@id": "kb:organization-cf3010bb-7716-473d-98ee-25e4917e7b80",
"@id": "kb:organization-c9223e2e-4a3b-436d-ad5f-10794d8e17fa",
"@type": "uco-identity:Identity",
"uco-core:name": "Company 5"
},
{
"@id": "kb:InvestigativeAction-e019ed92-af10-4a9f-a914-7a9ba539807c",
"@id": "kb:InvestigativeAction-e55a3d16-a516-4ebe-bba2-cf7aa9a6b8ba",
"@type": "case-investigation:InvestigativeAction",
"uco-core:name": "disk image",
"uco-core:description": "Acquisition of USB",
Expand All @@ -214,7 +214,7 @@
"@id": "kb:ConfiguredTool-22cb1ad6-7910-4a71-8654-5e93280111a3"
},
"uco-action:performer": {
"@id": "kb:Role-870e2626-5ffd-4a80-83c2-8ee429709c81"
"@id": "kb:Role-4e37c6b0-f4d7-4720-baa6-0a8f421180f8"
},
"uco-action:object": [
{
Expand Down Expand Up @@ -280,7 +280,7 @@
"@type": "case-investigation:InvestigativeAction",
"uco-core:description": "Enter USB Disk into chain of custody",
"uco-action:performer": {
"@id": "kb:Role-870e2626-5ffd-4a80-83c2-8ee429709c81"
"@id": "kb:Role-4e37c6b0-f4d7-4720-baa6-0a8f421180f8"
},
"uco-action:result": [
{
Expand Down Expand Up @@ -327,7 +327,7 @@
}
},
{
"@id": "kb:content-data-facet-17661dfc-7b8a-46c0-8b0e-0f7b1eac3096",
"@id": "kb:content-data-facet-340937e3-0e27-4da8-ada1-d2e8394103ea",
"@type": "uco-observable:ContentDataFacet",
"uco-observable:hash": {
"@id": "kb:hash-66d11615-dd6c-4bba-8643-efe5fe8f58f4",
Expand Down Expand Up @@ -402,7 +402,7 @@
"@id": "kb:ConfiguredTool-571e5240-0e58-42f8-89c2-f1917580504b"
},
"uco-action:performer": {
"@id": "kb:Role-870e2626-5ffd-4a80-83c2-8ee429709c81"
"@id": "kb:Role-4e37c6b0-f4d7-4720-baa6-0a8f421180f8"
},
"uco-action:object": [
{
Expand Down Expand Up @@ -529,7 +529,7 @@
"@id": "kb:ConfiguredTool-fec1a824-f519-403f-a700-d4047ecdb51e"
},
"uco-action:performer": {
"@id": "kb:Role-870e2626-5ffd-4a80-83c2-8ee429709c81"
"@id": "kb:Role-4e37c6b0-f4d7-4720-baa6-0a8f421180f8"
},
"uco-action:object": [
{
Expand Down Expand Up @@ -838,7 +838,7 @@
"@type": "uco-observable:FileSystem",
"uco-core:hasFacet": [
{
"@id": "kb:file-system-facet-d14c4ae7-75e4-4043-97c5-e16b383ca714",
"@id": "kb:file-system-facet-4fe95932-8b21-4463-a20b-85e3b151e388",
"@type": "uco-observable:FileSystemFacet",
"uco-observable:fileSystemType": "FAT32"
}
Expand Down Expand Up @@ -868,7 +868,7 @@
"@type": "uco-observable:File",
"uco-core:hasFacet": [
{
"@id": "kb:file-facet-16b6a9f9-0b3d-4b7a-9c61-6859e7ca7e45",
"@id": "kb:file-facet-8f25239c-5952-470f-ad3a-505d15998bb0",
"uco-observable:extension": "txt",
"uco-observable:fileName": "missedme.txt",
"uco-observable:filePath": "/NewUSBExample.E01/vol_vol4/missedme.txt",
Expand Down

0 comments on commit 7437719

Please sign in to comment.