Skip to content

UCO Issue 629: Enforce vocabulary pattern revision (adding CASE 1.4.0 changes) #174

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

Merged
plbt5 merged 5 commits into from
Mar 21, 2025
Merged

UCO Issue 629: Enforce vocabulary pattern revision (adding CASE 1.4.0 changes) #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4482054
Revise vocabulary pattern for `investigation:investigationForm`
ajnelson-nist Feb 21, 2025
aafa90e
Move sh:in review to named PropertyShape
ajnelson-nist Feb 26, 2025
7ecdaf4
Bump UCO to current state of develop
ajnelson-nist Mar 17, 2025
54aac69
Merge pull request #172 from casework/UCO-BugFix-Issue-629
plbt5 Mar 18, 2025
5f23830
Merge branch 'develop' into UCO-BugFix-Issue-629-2.0.0
ajnelson-nist Mar 21, 2025
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
50 changes: 19 additions & 31 deletions ontology/investigation/investigation.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ investigation:Investigation
rdfs:label "Investigation"@en ;
rdfs:comment "An investigation is a grouping of characteristics unique to an exploration of the facts involved in a cyber-relevant set of suspicious activity."@en ;
sh:property
investigation:Investigation-investigationForm-in-shape ,
[
sh:class investigation:Authorization ;
sh:nodeKind sh:BlankNodeOrIRI ;
Expand All @@ -130,49 +131,36 @@ investigation:Investigation
] ,
[
sh:datatype xsd:string ;
sh:nodeKind sh:Literal ;
sh:path investigation:focus ;
] ,
[
sh:datatype vocabulary:InvestigationFormVocab ;
sh:message "Value is outside the default vocabulary InvestigationFormVocab." ;
sh:message "As of CASE 1.4.0, the datatype to use for investigation:investigationForm should be xsd:string. Not using xsd:string will be an error in CASE 2.0.0." ;
sh:path investigation:investigationForm ;
sh:severity sh:Info ;
sh:severity sh:Warning ;
] ,
[
sh:maxCount "1"^^xsd:integer ;
sh:datatype xsd:string ;
sh:nodeKind sh:Literal ;
sh:or (
[
sh:datatype vocabulary:InvestigationFormVocab ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path investigation:investigationForm ;
sh:path investigation:focus ;
] ,
[
sh:message "Value is not member of the vocabulary InvestigationFormVocab." ;
sh:or (
[
sh:datatype vocabulary:InvestigationFormVocab ;
sh:in (
"case"^^vocabulary:InvestigationFormVocab
"incident"^^vocabulary:InvestigationFormVocab
"suspicious-activity"^^vocabulary:InvestigationFormVocab
) ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:maxCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path investigation:investigationForm ;
]
;
sh:targetClass investigation:Investigation ;
.

investigation:Investigation-investigationForm-in-shape
a sh:PropertyShape ;
sh:in (
"case"
"incident"
"suspicious-activity"
) ;
sh:message "Value is not member of the vocabulary InvestigationFormVocab." ;
sh:path investigation:investigationForm ;
sh:severity sh:Info ;
.

investigation:InvestigativeAction
a
owl:Class ,
Expand Down
6 changes: 3 additions & 3 deletions ontology/vocabulary/vocabulary.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ vocab:InvestigationFormVocab
owl:equivalentClass [
a rdfs:Datatype ;
owl:oneOf (
"case"^^vocab:InvestigationFormVocab
"incident"^^vocab:InvestigationFormVocab
"suspicious-activity"^^vocab:InvestigationFormVocab
"case"
"incident"
"suspicious-activity"
) ;
] ;
.
Expand Down