Skip to content

Add CASE 0.7.1 #63

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
merged 3 commits into from
Sep 1, 2022
Merged

Add CASE 0.7.1 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dab39b0
Build CASE 0.7.1 monolithic .ttl files
ajnelson-nist Sep 1, 2022
bf9b2ab
Update CASE ontology pointer to version 0.7.1
ajnelson-nist Sep 1, 2022
b16d082
Regenerate Make-managed files
ajnelson-nist Sep 1, 2022
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
1,580 changes: 1,580 additions & 0 deletions case_utils/ontology/case-0.7.1-subclasses.ttl
View file
Open in desktop

Large diffs are not rendered by default.

16,977 changes: 16,977 additions & 0 deletions case_utils/ontology/case-0.7.1.ttl
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion case_utils/ontology/version_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@
__all__ = ["CURRENT_CASE_VERSION", "built_version_choices_list"]

# Tested with CI to match versionInfo of <https://ontology.caseontology.org/case/case>.
CURRENT_CASE_VERSION: str = "0.7.0"
CURRENT_CASE_VERSION: str = "0.7.1"

# Tested with CI to match set of ontology files available.
built_version_choices_list = [
"none",
"case-0.5.0",
"case-0.6.0",
"case-0.7.0",
"case-" + CURRENT_CASE_VERSION,
]

Expand Down
2 changes: 1 addition & 1 deletion dependencies/CASE
Open in desktop
Submodule CASE updated 11 files
+9 −1 ChangeLog
+1 −1 dependencies/UCO
+0 −1 ontology/investigation/Makefile
+8 −12 ontology/investigation/investigation.ttl
+0 −1 ontology/master/Makefile
+8 −11 ontology/master/case.ttl
+0 −1 ontology/vocabulary/Makefile
+2 −3 ontology/vocabulary/vocabulary.ttl
+44 −3 tests/Makefile
+53 −0 tests/shapes/Makefile
+71 −0 tests/shapes/case-qc.ttl
4 changes: 2 additions & 2 deletions tests/case_utils/case_validate/uco_test_examples/action_inheritance_PASS_validation.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix sh: <http://www.w3.org/ns/shacl#> .
@prefix vocabulary1: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

[]
Expand All @@ -17,7 +17,7 @@
sh:resultSeverity sh:Info ;
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary1:ActionStatusTypeVocab ;
sh:datatype vocabulary:ActionStatusTypeVocab ;
sh:message "Value is outside the default vocabulary ActionStatusTypeVocab." ;
sh:path action:actionStatus ;
sh:severity sh:Info ;
Expand Down
16 changes: 8 additions & 8 deletions tests/case_utils/case_validate/uco_test_examples/action_inheritance_XFAIL_validation.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix sh: <http://www.w3.org/ns/shacl#> .
@prefix vocabulary1: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

[]
Expand All @@ -18,7 +18,7 @@
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MaxCountConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary1:ActionStatusTypeVocab ;
sh:datatype vocabulary:ActionStatusTypeVocab ;
sh:maxCount "0"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path action:actionStatus ;
Expand All @@ -27,12 +27,12 @@
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/action-lifecycle1> ;
sh:resultMessage "Value is not Literal with datatype vocabulary1:ActionStatusTypeVocab" ;
sh:resultMessage "Value is not Literal with datatype vocabulary:ActionStatusTypeVocab" ;
sh:resultPath action:actionStatus ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary1:ActionStatusTypeVocab ;
sh:datatype vocabulary:ActionStatusTypeVocab ;
sh:maxCount "0"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path action:actionStatus ;
Expand All @@ -47,7 +47,7 @@
sh:resultSeverity sh:Info ;
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary1:ActionStatusTypeVocab ;
sh:datatype vocabulary:ActionStatusTypeVocab ;
sh:message "Value is outside the default vocabulary ActionStatusTypeVocab." ;
sh:path action:actionStatus ;
sh:severity sh:Info ;
Expand All @@ -62,7 +62,7 @@
sh:resultSeverity sh:Info ;
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary1:ActionStatusTypeVocab ;
sh:datatype vocabulary:ActionStatusTypeVocab ;
sh:message "Value is outside the default vocabulary ActionStatusTypeVocab." ;
sh:path action:actionStatus ;
sh:severity sh:Info ;
Expand All @@ -77,7 +77,7 @@
sh:resultSeverity sh:Info ;
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary1:ActionStatusTypeVocab ;
sh:datatype vocabulary:ActionStatusTypeVocab ;
sh:message "Value is outside the default vocabulary ActionStatusTypeVocab." ;
sh:path action:actionStatus ;
sh:severity sh:Info ;
Expand All @@ -92,7 +92,7 @@
sh:resultSeverity sh:Info ;
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary1:ActionStatusTypeVocab ;
sh:datatype vocabulary:ActionStatusTypeVocab ;
sh:message "Value is outside the default vocabulary ActionStatusTypeVocab." ;
sh:path action:actionStatus ;
sh:severity sh:Info ;
Expand Down
22 changes: 11 additions & 11 deletions tests/case_utils/case_validate/uco_test_examples/hash_XFAIL_validation.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix sh: <http://www.w3.org/ns/shacl#> .
@prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
@prefix vocabulary1: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

[]
Expand All @@ -18,7 +18,7 @@
sh:resultSeverity sh:Info ;
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary1:HashNameVocab ;
sh:datatype vocabulary:HashNameVocab ;
sh:message "Value is outside the default vocabulary HashNameVocab." ;
sh:path types:hashMethod ;
sh:severity sh:Info ;
Expand All @@ -36,16 +36,16 @@
sh:message "Value is not member of the vocabulary HashNameVocab." ;
sh:or (
[
sh:datatype vocabulary1:HashNameVocab ;
sh:in vocabulary1:HashNameVocab-members ;
sh:datatype vocabulary:HashNameVocab ;
sh:in vocabulary:HashNameVocab-members ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path types:hashMethod ;
] ;
sh:value "SHA-1"^^vocabulary1:HashNameVocab ;
sh:value "SHA-1"^^vocabulary:HashNameVocab ;
] ,
[
a sh:ValidationResult ;
Expand All @@ -55,7 +55,7 @@
sh:resultSeverity sh:Info ;
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary1:HashNameVocab ;
sh:datatype vocabulary:HashNameVocab ;
sh:message "Value is outside the default vocabulary HashNameVocab." ;
sh:path types:hashMethod ;
sh:severity sh:Info ;
Expand All @@ -65,7 +65,7 @@
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/hash-5> ;
sh:resultMessage 'Node Literal("1", datatype=xsd:integer) does not conform to one or more shapes in [ sh:datatype vocabulary1:HashNameVocab ] , [ sh:datatype xsd:string ]' ;
sh:resultMessage 'Node Literal("1", datatype=xsd:integer) does not conform to one or more shapes in [ sh:datatype vocabulary:HashNameVocab ] , [ sh:datatype xsd:string ]' ;
sh:resultPath types:hashMethod ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:OrConstraintComponent ;
Expand All @@ -75,7 +75,7 @@
sh:nodeKind sh:Literal ;
sh:or (
[
sh:datatype vocabulary1:HashNameVocab ;
sh:datatype vocabulary:HashNameVocab ;
]
[
sh:datatype xsd:string ;
Expand All @@ -96,8 +96,8 @@
sh:message "Value is not member of the vocabulary HashNameVocab." ;
sh:or (
[
sh:datatype vocabulary1:HashNameVocab ;
sh:in vocabulary1:HashNameVocab-members ;
sh:datatype vocabulary:HashNameVocab ;
sh:in vocabulary:HashNameVocab-members ;
]
[
sh:datatype xsd:string ;
Expand All @@ -115,7 +115,7 @@
sh:resultSeverity sh:Info ;
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary1:HashNameVocab ;
sh:datatype vocabulary:HashNameVocab ;
sh:message "Value is outside the default vocabulary HashNameVocab." ;
sh:path types:hashMethod ;
sh:severity sh:Info ;
Expand Down
26 changes: 13 additions & 13 deletions tests/case_utils/case_validate/uco_test_examples/relationship_XFAIL_validation.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix sh: <http://www.w3.org/ns/shacl#> .
@prefix vocabulary1: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

[]
Expand All @@ -23,7 +23,7 @@
sh:nodeKind sh:Literal ;
sh:path core:kindOfRelationship ;
] ;
sh:value "CUSTOM_Influenced"^^vocabulary1:ActionRelationshipTypeVocab ;
sh:value "CUSTOM_Influenced"^^vocabulary:ActionRelationshipTypeVocab ;
] ,
[
a sh:ValidationResult ;
Expand All @@ -38,7 +38,7 @@
sh:nodeKind sh:Literal ;
sh:path core:kindOfRelationship ;
] ;
sh:value "CUSTOM_Influenced"^^vocabulary1:ObservableObjectRelationshipVocab ;
sh:value "CUSTOM_Influenced"^^vocabulary:ObservableObjectRelationshipVocab ;
] ,
[
a sh:ValidationResult ;
Expand All @@ -53,7 +53,7 @@
sh:nodeKind sh:Literal ;
sh:path core:kindOfRelationship ;
] ;
sh:value "Initiated"^^vocabulary1:ActionRelationshipTypeVocab ;
sh:value "Initiated"^^vocabulary:ActionRelationshipTypeVocab ;
] ,
[
a sh:ValidationResult ;
Expand All @@ -68,7 +68,7 @@
sh:nodeKind sh:Literal ;
sh:path core:kindOfRelationship ;
] ;
sh:value "Initiated"^^vocabulary1:ObservableObjectRelationshipVocab ;
sh:value "Initiated"^^vocabulary:ObservableObjectRelationshipVocab ;
] ,
[
a sh:ValidationResult ;
Expand All @@ -83,7 +83,7 @@
sh:nodeKind sh:Literal ;
sh:path core:kindOfRelationship ;
] ;
sh:value "Contained_Within"^^vocabulary1:ActionRelationshipTypeVocab ;
sh:value "Contained_Within"^^vocabulary:ActionRelationshipTypeVocab ;
] ,
[
a sh:ValidationResult ;
Expand All @@ -98,7 +98,7 @@
sh:nodeKind sh:Literal ;
sh:path core:kindOfRelationship ;
] ;
sh:value "Contained_Within"^^vocabulary1:ObservableObjectRelationshipVocab ;
sh:value "Contained_Within"^^vocabulary:ObservableObjectRelationshipVocab ;
] ,
[
a sh:ValidationResult ;
Expand All @@ -113,7 +113,7 @@
sh:nodeKind sh:Literal ;
sh:path core:kindOfRelationship ;
] ;
sh:value "CUSTOM_Influenced"^^vocabulary1:ActionRelationshipTypeVocab ;
sh:value "CUSTOM_Influenced"^^vocabulary:ActionRelationshipTypeVocab ;
] ,
[
a sh:ValidationResult ;
Expand All @@ -128,7 +128,7 @@
sh:nodeKind sh:Literal ;
sh:path core:kindOfRelationship ;
] ;
sh:value "CUSTOM_Influenced"^^vocabulary1:ObservableObjectRelationshipVocab ;
sh:value "CUSTOM_Influenced"^^vocabulary:ObservableObjectRelationshipVocab ;
] ,
[
a sh:ValidationResult ;
Expand All @@ -143,7 +143,7 @@
sh:nodeKind sh:Literal ;
sh:path core:kindOfRelationship ;
] ;
sh:value "Initiated"^^vocabulary1:ActionRelationshipTypeVocab ;
sh:value "Initiated"^^vocabulary:ActionRelationshipTypeVocab ;
] ,
[
a sh:ValidationResult ;
Expand All @@ -158,7 +158,7 @@
sh:nodeKind sh:Literal ;
sh:path core:kindOfRelationship ;
] ;
sh:value "Initiated"^^vocabulary1:ObservableObjectRelationshipVocab ;
sh:value "Initiated"^^vocabulary:ObservableObjectRelationshipVocab ;
] ,
[
a sh:ValidationResult ;
Expand All @@ -173,7 +173,7 @@
sh:nodeKind sh:Literal ;
sh:path core:kindOfRelationship ;
] ;
sh:value "Contained_Within"^^vocabulary1:ActionRelationshipTypeVocab ;
sh:value "Contained_Within"^^vocabulary:ActionRelationshipTypeVocab ;
] ,
[
a sh:ValidationResult ;
Expand All @@ -188,7 +188,7 @@
sh:nodeKind sh:Literal ;
sh:path core:kindOfRelationship ;
] ;
sh:value "Contained_Within"^^vocabulary1:ObservableObjectRelationshipVocab ;
sh:value "Contained_Within"^^vocabulary:ObservableObjectRelationshipVocab ;
]
;
.
Expand Down