Skip to content

Commit 574a8cd

Browse files
kchasonkchason
authored
Merge pull request #294 from casework/BugFix-CASE-Examples-QC-Pull-54
Test for IRIs that share UUIDs
2 parents 7b0f064 + 1c59404 commit 574a8cd

28 files changed

+284
-230
lines changed

‎examples/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
*.diff
2+
all-drafting.ttl
23
generated-*
34
query-*.html
45
query-*.md
6+
kb.ttl

‎examples/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ all-%: \
3030

3131
check: \
3232
$(check_targets)
33+
$(MAKE) \
34+
--file postvisit.mk \
35+
check
3336

3437
check-%: \
3538
%/Makefile
@@ -39,6 +42,9 @@ check-%: \
3942

4043
clean: \
4144
$(clean_targets)
45+
@$(MAKE) \
46+
--file postvisit.mk \
47+
clean
4248

4349
clean-%: \
4450
%/Makefile

‎examples/crossover_heist/crossover_heist.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@
754754
]
755755
},
756756
{
757-
"@id": "kb:url-history-39ff4987-8ae5-47e3-8369-dbd0d5f79398",
757+
"@id": "kb:url-history-51cf5cf9-806a-4944-ae6b-ba61229cb3a5",
758758
"@type": "uco-observable:URLHistory",
759759
"uco-core:hasFacet": [
760760
{

‎examples/crossover_heist/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ <h4>Web Browser History</h4>
753753
]
754754
},
755755
{
756-
"@id": "kb:url-history-39ff4987-8ae5-47e3-8369-dbd0d5f79398",
756+
"@id": "kb:url-history-51cf5cf9-806a-4944-ae6b-ba61229cb3a5",
757757
"@type": "uco-observable:URLHistory",
758758
"uco-core:hasFacet": [
759759
{

‎examples/crossover_heist/src/crossover_heist-web_browser_history_wow_usb.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
]
5858
},
5959
{
60-
"@id": "kb:url-history-39ff4987-8ae5-47e3-8369-dbd0d5f79398",
60+
"@id": "kb:url-history-51cf5cf9-806a-4944-ae6b-ba61229cb3a5",
6161
"@type": "uco-observable:URLHistory",
6262
"uco-core:hasFacet": [
6363
{

‎examples/crossover_wmd/crossover_wmd.json

Lines changed: 24 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258
]
259259
},
260260
{
261-
"@id": "kb:emailmessage-2c032220-8c21-11e9-9c99-0c4de9c21b53",
261+
"@id": "kb:emailmessage-c9a3cfa6-41c3-4c0c-9343-c011c1660467",
262262
"@type": "uco-observable:EmailMessage",
263263
"uco-core:hasFacet": [
264264
{
@@ -268,7 +268,7 @@
268268
"@id": "kb:gmail-a1ce9965-ba9c-4fa1-9bfe-58c68ecaadc5"
269269
},
270270
"uco-observable:sender": {
271-
"@id": "kb:emailaccount-99d72bac-8c21-11e9-8902-0c4de9c21b53"
271+
"@id": "kb:emailaccount-11bf944d-b540-4abf-86a2-b439a157f325"
272272
},
273273
"uco-observable:sentTime": {
274274
"@type": "xsd:dateTime",
@@ -307,7 +307,7 @@
307307
]
308308
},
309309
{
310-
"@id": "kb:emailaccount-99d72bac-8c21-11e9-8902-0c4de9c21b53",
310+
"@id": "kb:emailaccount-11bf944d-b540-4abf-86a2-b439a157f325",
311311
"@type": "uco-observable:EmailAccount",
312312
"uco-core:hasFacet": [
313313
{
@@ -571,7 +571,7 @@
571571
"@id": "kb:reddit-6f321baa-cc57-4c0a-9dd2-7f2038fd44d1"
572572
},
573573
"uco-core:target": {
574-
"@id": "kb:chromelogindata-16805dff-05f9-4cba-9266-d5fa712f3d8f"
574+
"@id": "kb:chromelogindata-16399672-32ad-4c83-9a40-efe68c690bb8"
575575
},
576576
"uco-core:kindOfRelationship": "Contained_Within",
577577
"uco-core:isDirectional": true,
@@ -593,7 +593,7 @@
593593
]
594594
},
595595
{
596-
"@id": "kb:chromelogindata-16805dff-05f9-4cba-9266-d5fa712f3d8f",
596+
"@id": "kb:chromelogindata-16399672-32ad-4c83-9a40-efe68c690bb8",
597597
"@type": "uco-observable:ObservableObject"
598598
},
599599
{
@@ -819,7 +819,7 @@
819819
]
820820
},
821821
{
822-
"@id": "kb:file-cd52c3b8-7759-40b7-ae10-dfc90a35f644",
822+
"@id": "kb:telephony-cd52c3b8-7759-40b7-ae10-dfc90a35f644",
823823
"@type": "uco-observable:File",
824824
"uco-core:hasFacet": [
825825
{
@@ -839,7 +839,7 @@
839839
"@id": "kb:simcard-1c401020-c200-4b90-9128-adb3b5e0b6fb"
840840
},
841841
"uco-core:target": {
842-
"@id": "kb:file-cd52c3b8-7759-40b7-ae10-dfc90a35f644"
842+
"@id": "kb:telephony-cd52c3b8-7759-40b7-ae10-dfc90a35f644"
843843
},
844844
"uco-core:kindOfRelationship": "Referenced_Within",
845845
"uco-core:isDirectional": true,
@@ -861,7 +861,7 @@
861861
]
862862
},
863863
{
864-
"@id": "kb:url-39ff4987-8ae5-47e3-8369-dbd0d5f79398",
864+
"@id": "kb:url-8abab405-9029-45b0-a30d-be0dc6f353cc",
865865
"@type": "uco-observable:URL",
866866
"uco-core:hasFacet": [
867867
{
@@ -875,6 +875,13 @@
875875
"@id": "kb:14354987-8ae5-47e3-8369-dbd0d5f77489",
876876
"@type": "uco-observable:URL"
877877
},
878+
{
879+
"@id": "kb:a83adacb-ceaf-4b4b-b078-7c12dce990b9",
880+
"@type": [
881+
"uco-observable:Application",
882+
"uco-observable:Software"
883+
]
884+
},
878885
{
879886
"@id": "kb:urlhistory-860fc853-9c3f-41fc-b144-8ac80d8f5849",
880887
"@type": "uco-observable:URLHistory",
@@ -898,14 +905,14 @@
898905
"@id": "uco-observable:expirationTime"
899906
},
900907
"uco-observable:browserInformation": {
901-
"@id": "kb:5d96df90-d9e1-423c-b8db-c2327812ab38"
908+
"@id": "kb:a83adacb-ceaf-4b4b-b078-7c12dce990b9"
902909
},
903910
"rdfs:comment": "TODO: Is uco-observable:browserUserProfile meant to be an object reference?",
904911
"drafting:browserUserProfileAccount": {
905912
"@id": "kb:profile--account-uuid"
906913
},
907914
"uco-observable:url": {
908-
"@id": "kb:url-39ff4987-8ae5-47e3-8369-dbd0d5f79398"
915+
"@id": "kb:url-8abab405-9029-45b0-a30d-be0dc6f353cc"
909916
},
910917
"uco-observable:referrerUrl": {
911918
"@id": "kb:14354987-8ae5-47e3-8369-dbd0d5f77489"
@@ -1041,13 +1048,13 @@
10411048
"@id": "kb:primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19"
10421049
},
10431050
"uco-core:target": {
1044-
"@id": "kb:whatsapp-90652808-7341-40d3-9285-774d865ad3f9"
1051+
"@id": "kb:account-90652808-7341-40d3-9285-774d865ad3f9"
10451052
},
10461053
"uco-core:kindOfRelationship": "Has_Account",
10471054
"uco-core:isDirectional": true
10481055
},
10491056
{
1050-
"@id": "kb:emailaddress-99d72bac-8c21-11e9-8902-0c4de9c21b53",
1057+
"@id": "kb:emailaddress-ec940324-eb79-467a-825b-0f1136d2b6d3",
10511058
"@type": "uco-observable:EmailAddress",
10521059
"uco-core:hasFacet": [
10531060
{
@@ -1065,7 +1072,7 @@
10651072
"@id": "kb:email-account-facet-e0dd5970-71d8-4261-a43a-1d216b84680f",
10661073
"@type": "uco-observable:EmailAccountFacet",
10671074
"uco-observable:emailAddress": {
1068-
"@id": "kb:emailaddress-99d72bac-8c21-11e9-8902-0c4de9c21b53"
1075+
"@id": "kb:emailaddress-ec940324-eb79-467a-825b-0f1136d2b6d3"
10691076
}
10701077
}
10711078
]
@@ -1094,41 +1101,14 @@
10941101
"@id": "kb:relationship-bf423267-3afe-4f4d-aa9f-d903eae55f99",
10951102
"@type": "uco-observable:ObservableRelationship",
10961103
"uco-core:source": {
1097-
"@id": "kb:whatsapp-90652808-7341-40d3-9285-774d865ad3f9"
1104+
"@id": "kb:account-90652808-7341-40d3-9285-774d865ad3f9"
10981105
},
10991106
"uco-core:target": {
11001107
"@id": "kb:phoneaccount-c1d3237a-6d7f-4e96-bbef-6eb4c0a621d1"
11011108
},
11021109
"uco-core:kindOfRelationship": "Associated_Account",
11031110
"uco-core:isDirectional": true
11041111
},
1105-
{
1106-
"@id": "kb:whatsapp-90652808-7341-40d3-9285-774d865ad3f9",
1107-
"@type": "uco-observable:ApplicationAccount",
1108-
"uco-core:hasFacet": [
1109-
{
1110-
"@id": "kb:account-facet-502bc393-9727-415d-b336-e466f0fa21bf",
1111-
"@type": "uco-observable:AccountFacet",
1112-
"uco-observable:accountIssuer": {
1113-
"@id": "kb:organization-whatsapp-7a3fb3d1-0b30-4305-8c9e-f8f90f839bf3"
1114-
},
1115-
"uco-observable:accountIdentifier": "31647934784@s.whatsapp.net",
1116-
"uco-observable:isActive": true
1117-
},
1118-
{
1119-
"@id": "kb:application-account-facet-15811836-e4ed-48d1-ae51-1822aab89aa9",
1120-
"@type": "uco-observable:ApplicationAccountFacet",
1121-
"uco-observable:application": {
1122-
"@id": "kb:application-whatsapp-e662a9de-02bb-47ad-8666-625a0a5dc2fa"
1123-
}
1124-
},
1125-
{
1126-
"@id": "kb:digital-account-facet-8794c717-cc13-44ab-8f93-77cca75fc649",
1127-
"@type": "uco-observable:DigitalAccountFacet",
1128-
"uco-observable:displayName": "Ares Lupin"
1129-
}
1130-
]
1131-
},
11321112
{
11331113
"@id": "kb:organization-lebara-3ca7cf13-7d8b-4665-97b9-2c48fdb94ac5",
11341114
"@type": "uco-identity:Organization",
@@ -1166,18 +1146,6 @@
11661146
"drafting:appName": "GMail"
11671147
}
11681148
},
1169-
{
1170-
"@id": "kb:application-whatsapp-e662a9de-02bb-47ad-8666-625a0a5dc2fa",
1171-
"@type": [
1172-
"uco-observable:Application",
1173-
"uco-observable:Software"
1174-
],
1175-
"uco-core:hasFacet": {
1176-
"@id": "kb:application-facet-74e8a566-4575-4ce2-84d5-4bcea81f9b70",
1177-
"@type": "uco-observable:ApplicationFacet",
1178-
"drafting:appName": "WhatsApp"
1179-
}
1180-
},
11811149
{
11821150
"@id": "kb:account-90652808-7341-40d3-9285-774d865ad3f9",
11831151
"@type": "uco-observable:ApplicationAccount",
@@ -1240,7 +1208,7 @@
12401208
"@id": "kb:relationship-20f7ade6-93a7-4d67-a657-adeffba35dc7",
12411209
"@type": "uco-observable:ObservableRelationship",
12421210
"uco-core:source": {
1243-
"@id": "kb:msgstoredb-16805dff-05f9-4cba-9266-d5fa712f3d8f"
1211+
"@id": "kb:msgstoredb-d82c3aae-488c-43d4-bcbd-a3ac38bacfd4"
12441212
},
12451213
"uco-core:target": {
12461214
"@id": "kb:forensicimage-f3fd304e-ef6c-4cbd-94cb-425880f82748"
@@ -1256,7 +1224,7 @@
12561224
]
12571225
},
12581226
{
1259-
"@id": "kb:msgstoredb-16805dff-05f9-4cba-9266-d5fa712f3d8f",
1227+
"@id": "kb:msgstoredb-d82c3aae-488c-43d4-bcbd-a3ac38bacfd4",
12601228
"@type": "uco-observable:File",
12611229
"uco-core:hasFacet": [
12621230
{
@@ -1330,7 +1298,7 @@
13301298
"@id": "kb:message-ed5d35d6-6e7c-4099-80f4-1fadfc0ee08c"
13311299
},
13321300
"uco-core:target": {
1333-
"@id": "kb:msgstoredb-16805dff-05f9-4cba-9266-d5fa712f3d8f"
1301+
"@id": "kb:msgstoredb-d82c3aae-488c-43d4-bcbd-a3ac38bacfd4"
13341302
},
13351303
"uco-core:kindOfRelationship": "Contained_Within",
13361304
"uco-core:isDirectional": true,

0 commit comments

Comments
 (0)