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.

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

Test for IRIs that share UUIDs #294

Merged
merged 30 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
441bdba
Disambiguate email account identifier
ajnelson-nist May 30, 2024
9403648
Regenerate Make-managed files
ajnelson-nist May 30, 2024
b4cdde1
Disambiguate forensic image identifier
ajnelson-nist May 30, 2024
901c224
Regenerate Make-managed files
ajnelson-nist May 30, 2024
92d41db
Align telephony file identifier
ajnelson-nist May 30, 2024
5cb72ec
Regenerate Make-managed files
ajnelson-nist May 30, 2024
74ad50a
Disambiguate relationship identifier
ajnelson-nist May 30, 2024
2ec6fd7
Regenerate Make-managed files
ajnelson-nist May 30, 2024
a70d6c8
Disambiguate relationship identifier
ajnelson-nist May 30, 2024
7a2a716
Regenerate Make-managed files
ajnelson-nist May 30, 2024
aa0387d
Disambiguate phone account identifier
ajnelson-nist May 30, 2024
081d664
Regenerate Make-managed files
ajnelson-nist May 30, 2024
b20899c
Disambiguate relationship identifier
ajnelson-nist May 30, 2024
a291866
Regenerate Make-managed files
ajnelson-nist May 30, 2024
3072cc2
Disambiguate multiple email identifiers
ajnelson-nist May 30, 2024
c87dfce
Regenerate Make-managed files
ajnelson-nist May 30, 2024
519ef8e
Disambiguate multiple account and application identifiers
ajnelson-nist May 31, 2024
7ae0936
Regenerate Make-managed files
ajnelson-nist May 31, 2024
65d803e
Disambiguate software identifier
ajnelson-nist May 31, 2024
ced68de
Regenerate Make-managed files
ajnelson-nist May 31, 2024
c66c07c
Disambiguate UUID used in URL, URLVisit, and mapped tool data
ajnelson-nist May 31, 2024
3f80c0c
Regenerate Make-managed files
ajnelson-nist May 31, 2024
fb21d57
Disambiguate message identifier
ajnelson-nist May 31, 2024
7ccd913
Regenerate Make-managed files
ajnelson-nist May 31, 2024
ec01ff5
Disambiguate identifier
ajnelson-nist May 31, 2024
bcd92ab
Regenerate Make-managed files
ajnelson-nist May 31, 2024
197fd86
Disambiguate identifiers
ajnelson-nist May 31, 2024
6f1a425
Regenerate Make-managed files
ajnelson-nist May 31, 2024
11b57db
Add kb compilation
ajnelson-nist May 31, 2024
1c59404
Test for IRIs that share UUIDs
ajnelson-nist May 31, 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: 2 additions & 0 deletions examples/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
*.diff
all-drafting.ttl
generated-*
query-*.html
query-*.md
kb.ttl
6 changes: 6 additions & 0 deletions examples/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ all-%: \

check: \
$(check_targets)
$(MAKE) \
--file postvisit.mk \
check

check-%: \
%/Makefile
Expand All @@ -39,6 +42,9 @@ check-%: \

clean: \
$(clean_targets)
@$(MAKE) \
--file postvisit.mk \
clean

clean-%: \
%/Makefile
Expand Down
2 changes: 1 addition & 1 deletion examples/crossover_heist/crossover_heist.json
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@
]
},
{
"@id": "kb:url-history-39ff4987-8ae5-47e3-8369-dbd0d5f79398",
"@id": "kb:url-history-51cf5cf9-806a-4944-ae6b-ba61229cb3a5",
"@type": "uco-observable:URLHistory",
"uco-core:hasFacet": [
{
Expand Down
2 changes: 1 addition & 1 deletion examples/crossover_heist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ <h4>Web Browser History</h4>
]
},
{
"@id": "kb:url-history-39ff4987-8ae5-47e3-8369-dbd0d5f79398",
"@id": "kb:url-history-51cf5cf9-806a-4944-ae6b-ba61229cb3a5",
"@type": "uco-observable:URLHistory",
"uco-core:hasFacet": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
]
},
{
"@id": "kb:url-history-39ff4987-8ae5-47e3-8369-dbd0d5f79398",
"@id": "kb:url-history-51cf5cf9-806a-4944-ae6b-ba61229cb3a5",
"@type": "uco-observable:URLHistory",
"uco-core:hasFacet": [
{
Expand Down
80 changes: 24 additions & 56 deletions examples/crossover_wmd/crossover_wmd.json
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
]
},
{
"@id": "kb:emailmessage-2c032220-8c21-11e9-9c99-0c4de9c21b53",
"@id": "kb:emailmessage-c9a3cfa6-41c3-4c0c-9343-c011c1660467",
"@type": "uco-observable:EmailMessage",
"uco-core:hasFacet": [
{
Expand All @@ -268,7 +268,7 @@
"@id": "kb:gmail-a1ce9965-ba9c-4fa1-9bfe-58c68ecaadc5"
},
"uco-observable:sender": {
"@id": "kb:emailaccount-99d72bac-8c21-11e9-8902-0c4de9c21b53"
"@id": "kb:emailaccount-11bf944d-b540-4abf-86a2-b439a157f325"
},
"uco-observable:sentTime": {
"@type": "xsd:dateTime",
Expand Down Expand Up @@ -307,7 +307,7 @@
]
},
{
"@id": "kb:emailaccount-99d72bac-8c21-11e9-8902-0c4de9c21b53",
"@id": "kb:emailaccount-11bf944d-b540-4abf-86a2-b439a157f325",
"@type": "uco-observable:EmailAccount",
"uco-core:hasFacet": [
{
Expand Down Expand Up @@ -571,7 +571,7 @@
"@id": "kb:reddit-6f321baa-cc57-4c0a-9dd2-7f2038fd44d1"
},
"uco-core:target": {
"@id": "kb:chromelogindata-16805dff-05f9-4cba-9266-d5fa712f3d8f"
"@id": "kb:chromelogindata-16399672-32ad-4c83-9a40-efe68c690bb8"
},
"uco-core:kindOfRelationship": "Contained_Within",
"uco-core:isDirectional": true,
Expand All @@ -593,7 +593,7 @@
]
},
{
"@id": "kb:chromelogindata-16805dff-05f9-4cba-9266-d5fa712f3d8f",
"@id": "kb:chromelogindata-16399672-32ad-4c83-9a40-efe68c690bb8",
"@type": "uco-observable:ObservableObject"
},
{
Expand Down Expand Up @@ -819,7 +819,7 @@
]
},
{
"@id": "kb:file-cd52c3b8-7759-40b7-ae10-dfc90a35f644",
"@id": "kb:telephony-cd52c3b8-7759-40b7-ae10-dfc90a35f644",
"@type": "uco-observable:File",
"uco-core:hasFacet": [
{
Expand All @@ -839,7 +839,7 @@
"@id": "kb:simcard-1c401020-c200-4b90-9128-adb3b5e0b6fb"
},
"uco-core:target": {
"@id": "kb:file-cd52c3b8-7759-40b7-ae10-dfc90a35f644"
"@id": "kb:telephony-cd52c3b8-7759-40b7-ae10-dfc90a35f644"
},
"uco-core:kindOfRelationship": "Referenced_Within",
"uco-core:isDirectional": true,
Expand All @@ -861,7 +861,7 @@
]
},
{
"@id": "kb:url-39ff4987-8ae5-47e3-8369-dbd0d5f79398",
"@id": "kb:url-8abab405-9029-45b0-a30d-be0dc6f353cc",
"@type": "uco-observable:URL",
"uco-core:hasFacet": [
{
Expand All @@ -875,6 +875,13 @@
"@id": "kb:14354987-8ae5-47e3-8369-dbd0d5f77489",
"@type": "uco-observable:URL"
},
{
"@id": "kb:a83adacb-ceaf-4b4b-b078-7c12dce990b9",
"@type": [
"uco-observable:Application",
"uco-observable:Software"
]
},
{
"@id": "kb:urlhistory-860fc853-9c3f-41fc-b144-8ac80d8f5849",
"@type": "uco-observable:URLHistory",
Expand All @@ -898,14 +905,14 @@
"@id": "uco-observable:expirationTime"
},
"uco-observable:browserInformation": {
"@id": "kb:5d96df90-d9e1-423c-b8db-c2327812ab38"
"@id": "kb:a83adacb-ceaf-4b4b-b078-7c12dce990b9"
},
"rdfs:comment": "TODO: Is uco-observable:browserUserProfile meant to be an object reference?",
"drafting:browserUserProfileAccount": {
"@id": "kb:profile--account-uuid"
},
"uco-observable:url": {
"@id": "kb:url-39ff4987-8ae5-47e3-8369-dbd0d5f79398"
"@id": "kb:url-8abab405-9029-45b0-a30d-be0dc6f353cc"
},
"uco-observable:referrerUrl": {
"@id": "kb:14354987-8ae5-47e3-8369-dbd0d5f77489"
Expand Down Expand Up @@ -1041,13 +1048,13 @@
"@id": "kb:primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19"
},
"uco-core:target": {
"@id": "kb:whatsapp-90652808-7341-40d3-9285-774d865ad3f9"
"@id": "kb:account-90652808-7341-40d3-9285-774d865ad3f9"
},
"uco-core:kindOfRelationship": "Has_Account",
"uco-core:isDirectional": true
},
{
"@id": "kb:emailaddress-99d72bac-8c21-11e9-8902-0c4de9c21b53",
"@id": "kb:emailaddress-ec940324-eb79-467a-825b-0f1136d2b6d3",
"@type": "uco-observable:EmailAddress",
"uco-core:hasFacet": [
{
Expand All @@ -1065,7 +1072,7 @@
"@id": "kb:email-account-facet-e0dd5970-71d8-4261-a43a-1d216b84680f",
"@type": "uco-observable:EmailAccountFacet",
"uco-observable:emailAddress": {
"@id": "kb:emailaddress-99d72bac-8c21-11e9-8902-0c4de9c21b53"
"@id": "kb:emailaddress-ec940324-eb79-467a-825b-0f1136d2b6d3"
}
}
]
Expand Down Expand Up @@ -1094,41 +1101,14 @@
"@id": "kb:relationship-bf423267-3afe-4f4d-aa9f-d903eae55f99",
"@type": "uco-observable:ObservableRelationship",
"uco-core:source": {
"@id": "kb:whatsapp-90652808-7341-40d3-9285-774d865ad3f9"
"@id": "kb:account-90652808-7341-40d3-9285-774d865ad3f9"
},
"uco-core:target": {
"@id": "kb:phoneaccount-c1d3237a-6d7f-4e96-bbef-6eb4c0a621d1"
},
"uco-core:kindOfRelationship": "Associated_Account",
"uco-core:isDirectional": true
},
{
"@id": "kb:whatsapp-90652808-7341-40d3-9285-774d865ad3f9",
"@type": "uco-observable:ApplicationAccount",
"uco-core:hasFacet": [
{
"@id": "kb:account-facet-502bc393-9727-415d-b336-e466f0fa21bf",
"@type": "uco-observable:AccountFacet",
"uco-observable:accountIssuer": {
"@id": "kb:organization-whatsapp-7a3fb3d1-0b30-4305-8c9e-f8f90f839bf3"
},
"uco-observable:accountIdentifier": "[email protected]",
"uco-observable:isActive": true
},
{
"@id": "kb:application-account-facet-15811836-e4ed-48d1-ae51-1822aab89aa9",
"@type": "uco-observable:ApplicationAccountFacet",
"uco-observable:application": {
"@id": "kb:application-whatsapp-e662a9de-02bb-47ad-8666-625a0a5dc2fa"
}
},
{
"@id": "kb:digital-account-facet-8794c717-cc13-44ab-8f93-77cca75fc649",
"@type": "uco-observable:DigitalAccountFacet",
"uco-observable:displayName": "Ares Lupin"
}
]
},
{
"@id": "kb:organization-lebara-3ca7cf13-7d8b-4665-97b9-2c48fdb94ac5",
"@type": "uco-identity:Organization",
Expand Down Expand Up @@ -1166,18 +1146,6 @@
"drafting:appName": "GMail"
}
},
{
"@id": "kb:application-whatsapp-e662a9de-02bb-47ad-8666-625a0a5dc2fa",
"@type": [
"uco-observable:Application",
"uco-observable:Software"
],
"uco-core:hasFacet": {
"@id": "kb:application-facet-74e8a566-4575-4ce2-84d5-4bcea81f9b70",
"@type": "uco-observable:ApplicationFacet",
"drafting:appName": "WhatsApp"
}
},
{
"@id": "kb:account-90652808-7341-40d3-9285-774d865ad3f9",
"@type": "uco-observable:ApplicationAccount",
Expand Down Expand Up @@ -1240,7 +1208,7 @@
"@id": "kb:relationship-20f7ade6-93a7-4d67-a657-adeffba35dc7",
"@type": "uco-observable:ObservableRelationship",
"uco-core:source": {
"@id": "kb:msgstoredb-16805dff-05f9-4cba-9266-d5fa712f3d8f"
"@id": "kb:msgstoredb-d82c3aae-488c-43d4-bcbd-a3ac38bacfd4"
},
"uco-core:target": {
"@id": "kb:forensicimage-f3fd304e-ef6c-4cbd-94cb-425880f82748"
Expand All @@ -1256,7 +1224,7 @@
]
},
{
"@id": "kb:msgstoredb-16805dff-05f9-4cba-9266-d5fa712f3d8f",
"@id": "kb:msgstoredb-d82c3aae-488c-43d4-bcbd-a3ac38bacfd4",
"@type": "uco-observable:File",
"uco-core:hasFacet": [
{
Expand Down Expand Up @@ -1330,7 +1298,7 @@
"@id": "kb:message-ed5d35d6-6e7c-4099-80f4-1fadfc0ee08c"
},
"uco-core:target": {
"@id": "kb:msgstoredb-16805dff-05f9-4cba-9266-d5fa712f3d8f"
"@id": "kb:msgstoredb-d82c3aae-488c-43d4-bcbd-a3ac38bacfd4"
},
"uco-core:kindOfRelationship": "Contained_Within",
"uco-core:isDirectional": true,
Expand Down
Loading
Loading