Skip to content

Commit

Permalink
Merge branch 'bump_prerelease_pointers' into case-release-1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajnelson-nist
ajnelson-nist committed Aug 23, 2022
2 parents d96a62c + 33f3526 commit 7035bee
Show file tree
Hide file tree
Showing 12 changed files with 1,738 additions and 1,289 deletions.
2 changes: 1 addition & 1 deletion dependencies/CASE-develop
Submodule CASE-develop updated 8 files
+1 −1 dependencies/UCO
+0 −1 ontology/investigation/Makefile
+37 −3 ontology/investigation/investigation.ttl
+0 −1 ontology/master/Makefile
+0 −2 ontology/master/case.ttl
+0 −1 ontology/vocabulary/Makefile
+9 −9 ontology/vocabulary/vocabulary.ttl
+15 −6 tests/Makefile
2 changes: 1 addition & 1 deletion dependencies/CASE-unstable
Submodule CASE-unstable updated 2 files
+1 −1 dependencies/UCO
+0 −3 ontology/investigation/investigation.ttl
2 changes: 1 addition & 1 deletion dependencies/UCO-develop
Submodule UCO-develop updated 11 files
+37 −28 ontology/owl/owl.ttl
+0 −1 ontology/uco/identity/identity.ttl
+488 −56 ontology/uco/observable/observable.ttl
+4 −10 ontology/uco/tool/tool.ttl
+1,043 −898 ontology/uco/vocabulary/vocabulary.ttl
+6 −5 tests/Makefile
+0 −11 tests/examples/hash_XFAIL_validation.ttl
+1 −1 tests/examples/owl_axiom_XFAIL_validation.ttl
+3 −3 tests/examples/owl_properties_XFAIL_validation.ttl
+0 −39 tests/src/glom_graph.py
+4 −0 tests/test_uco_monolithic.py
2 changes: 1 addition & 1 deletion dependencies/UCO-unstable
Submodule UCO-unstable updated 1 files
+50 −1 ontology/uco/observable/observable.ttl
9 changes: 8 additions & 1 deletion examples/asgard/src/asgard_validation-develop.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,17 @@
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:datatype vocab:InvestigationFormVocab ;
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:or (
[
sh:datatype vocab:InvestigationFormVocab ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path investigation:investigationForm ;
] ;
]
Expand Down
57 changes: 1 addition & 56 deletions examples/asgard/src/asgard_validation-unstable.ttl
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,11 @@
@prefix investigation: <https://ontology.caseontology.org/case/investigation/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@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 vocab: <https://ontology.caseontology.org/case/vocabulary/> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

[]
a sh:ValidationReport ;
sh:conforms "false"^^xsd:boolean ;
sh:result
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb#authorization-79D6AB60-D679-49CE-9573-7176DFEEB7C3> ;
sh:resultMessage "Less than 1 values on kb:authorization-79D6AB60-D679-49CE-9573-7176DFEEB7C3->investigation:authorizationIdentifier" ;
sh:resultPath investigation:authorizationIdentifier ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:datatype xsd:string ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path investigation:authorizationIdentifier ;
] ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb#authorization-79D6AB60-D679-49CE-9573-7176DFEEB7C3> ;
sh:resultMessage "Less than 1 values on kb:authorization-79D6AB60-D679-49CE-9573-7176DFEEB7C3->investigation:authorizationType" ;
sh:resultPath investigation:authorizationType ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:datatype xsd:string ;
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path investigation:authorizationType ;
] ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb#investigation-555E5FBB-BA09-449D-AF77-8A210D016FD7> ;
sh:resultMessage "Less than 1 values on kb:investigation-555E5FBB-BA09-449D-AF77-8A210D016FD7->investigation:investigationForm" ;
sh:resultPath investigation:investigationForm ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:or (
[
sh:datatype vocab:InvestigationFormVocab ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path investigation:investigationForm ;
] ;
]
;
sh:conforms "true"^^xsd:boolean ;
.

85 changes: 8 additions & 77 deletions examples/crossover_wmd/src/crossover_wmd_validation-develop.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,6 @@
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

[]
rdf:first "radius"^^vocabulary:AccountTypeVocab ;
rdf:rest (
"tacacs"^^vocabulary:AccountTypeVocab
"unix"^^vocabulary:AccountTypeVocab
"windows_domain"^^vocabulary:AccountTypeVocab
"windows_local"^^vocabulary:AccountTypeVocab
) ;
.

[]
rdf:first "unix"^^vocabulary:AccountTypeVocab ;
rdf:rest (
"windows_domain"^^vocabulary:AccountTypeVocab
"windows_local"^^vocabulary:AccountTypeVocab
) ;
.

[]
a sh:ValidationReport ;
sh:conforms "false"^^xsd:boolean ;
Expand All @@ -43,7 +25,6 @@
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class observable:URLHistoryEntry ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:BlankNodeOrIRI ;
sh:path observable:urlHistoryEntry ;
] ;
Expand Down Expand Up @@ -84,10 +65,17 @@
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:datatype vocab:InvestigationFormVocab ;
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:or (
[
sh:datatype vocab:InvestigationFormVocab ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path investigation:investigationForm ;
] ;
] ,
Expand Down Expand Up @@ -197,44 +185,6 @@
] ;
sh:value "__NOT_PROVIDED" ;
] ,
[
a sh:ValidationResult ;
sh:focusNode [
a observable:AccountFacet ;
observable:accountIssuer <http://example.org/kb/organization-salt-uuid> ;
observable:isActive "true"^^xsd:boolean ;
] ;
sh:resultMessage 'Less than 1 values on [ rdf:type uco-observable:AccountFacet ; uco-observable:accountIssuer kb:organization-salt-uuid ; uco-observable:isActive Literal("true" = True, datatype=xsd:boolean) ]->observable:accountIdentifier' ;
sh:resultPath observable:accountIdentifier ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:datatype xsd:string ;
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path observable:accountIdentifier ;
] ;
] ,
[
a sh:ValidationResult ;
sh:focusNode [
a observable:AccountFacet ;
observable:accountType "Phone"^^vocabulary:AccountTypeVocab ;
observable:isActive "false"^^xsd:boolean ;
] ;
sh:resultMessage 'Less than 1 values on [ rdf:type uco-observable:AccountFacet ; uco-observable:accountType Literal("Phone" = None, datatype=uco-vocabulary:AccountTypeVocab) ; uco-observable:isActive Literal("false" = False, datatype=xsd:boolean) ]->observable:accountIdentifier' ;
sh:resultPath observable:accountIdentifier ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:datatype xsd:string ;
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path observable:accountIdentifier ;
] ;
] ,
[
a sh:ValidationResult ;
sh:focusNode [
Expand Down Expand Up @@ -270,25 +220,6 @@
] ;
sh:value "Phone"^^vocabulary:AccountTypeVocab ;
] ,
[
a sh:ValidationResult ;
sh:focusNode [
a observable:AccountFacet ;
observable:accountType "Phone"^^vocabulary:AccountTypeVocab ;
observable:isActive "true"^^xsd:boolean ;
] ;
sh:resultMessage 'Less than 1 values on [ rdf:type uco-observable:AccountFacet ; uco-observable:accountType Literal("Phone" = None, datatype=uco-vocabulary:AccountTypeVocab) ; uco-observable:isActive Literal("true" = True, datatype=xsd:boolean) ]->observable:accountIdentifier' ;
sh:resultPath observable:accountIdentifier ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:datatype xsd:string ;
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path observable:accountIdentifier ;
] ;
] ,
[
a sh:ValidationResult ;
sh:focusNode [
Expand Down
24 changes: 0 additions & 24 deletions examples/crossover_wmd/src/crossover_wmd_validation-unstable.ttl
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@prefix identity: <https://ontology.unifiedcyberontology.org/uco/identity/> .
@prefix investigation: <https://ontology.caseontology.org/case/investigation/> .
@prefix ns1: <http://example.org/ontology/drafting#> .
@prefix observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@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 vocab: <https://ontology.caseontology.org/case/vocabulary/> .
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

Expand Down Expand Up @@ -56,28 +54,6 @@
] ;
sh:value <http://example.org/kb/860FC853-9C3F-41FC-B144-8AC80D8F5849-URLHistory> ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/investigation-555E5FBB-BA09-449D-AF77-8A210D016FD7> ;
sh:resultMessage "Less than 1 values on kb:investigation-555E5FBB-BA09-449D-AF77-8A210D016FD7->investigation:investigationForm" ;
sh:resultPath investigation:investigationForm ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:or (
[
sh:datatype vocab:InvestigationFormVocab ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path investigation:investigationForm ;
] ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/investigation-555E5FBB-BA09-449D-AF77-8A210D016FD7> ;
Expand Down
66 changes: 8 additions & 58 deletions examples/owl_trafficking/src/owl_trafficking_validation-develop.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,17 @@
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:datatype vocab:InvestigationFormVocab ;
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:or (
[
sh:datatype vocab:InvestigationFormVocab ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path investigation:investigationForm ;
] ;
] ,
Expand Down Expand Up @@ -73,63 +80,6 @@
] ;
sh:value <http://example.org/kb/magnet-acquire2005412-83715215-c5fc-4231-99ff-29a3c51cb5f1> ;
] ,
[
a sh:ValidationResult ;
sh:focusNode [
a observable:AccountFacet ;
observable:accountIssuer <http://example.org/kb/organization-att-d60ffcec-4d89-48a1-b264-9cd4bc700a70> ;
observable:isActive "true"^^xsd:boolean ;
] ;
sh:resultMessage 'Less than 1 values on [ rdf:type uco-observable:AccountFacet ; uco-observable:accountIssuer kb:organization-att-d60ffcec-4d89-48a1-b264-9cd4bc700a70 ; uco-observable:isActive Literal("true" = True, datatype=xsd:boolean) ]->observable:accountIdentifier' ;
sh:resultPath observable:accountIdentifier ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:datatype xsd:string ;
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path observable:accountIdentifier ;
] ;
] ,
[
a sh:ValidationResult ;
sh:focusNode [
a observable:AccountFacet ;
observable:accountIssuer <http://example.org/kb/organization-att-d60ffcec-4d89-48a1-b264-9cd4bc700a70> ;
observable:isActive "true"^^xsd:boolean ;
] ;
sh:resultMessage 'Less than 1 values on [ rdf:type uco-observable:AccountFacet ; uco-observable:accountIssuer kb:organization-att-d60ffcec-4d89-48a1-b264-9cd4bc700a70 ; uco-observable:isActive Literal("true" = True, datatype=xsd:boolean) ]->observable:accountIdentifier' ;
sh:resultPath observable:accountIdentifier ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:datatype xsd:string ;
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path observable:accountIdentifier ;
] ;
] ,
[
a sh:ValidationResult ;
sh:focusNode [
a observable:AccountFacet ;
observable:accountType "phone"^^vocabulary:AccountTypeVocab ;
observable:isActive "true"^^xsd:boolean ;
] ;
sh:resultMessage 'Less than 1 values on [ rdf:type uco-observable:AccountFacet ; uco-observable:accountType Literal("phone" = None, datatype=uco-vocabulary:AccountTypeVocab) ; uco-observable:isActive Literal("true" = True, datatype=xsd:boolean) ]->observable:accountIdentifier' ;
sh:resultPath observable:accountIdentifier ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:datatype xsd:string ;
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path observable:accountIdentifier ;
] ;
] ,
[
a sh:ValidationResult ;
sh:focusNode [
Expand Down
24 changes: 0 additions & 24 deletions examples/owl_trafficking/src/owl_trafficking_validation-unstable.ttl
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,16 @@
@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@prefix investigation: <https://ontology.caseontology.org/case/investigation/> .
@prefix observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@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 vocab: <https://ontology.caseontology.org/case/vocabulary/> .
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

[]
a sh:ValidationReport ;
sh:conforms "false"^^xsd:boolean ;
sh:result
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/investigation-555e5fbb-ba09-449d-af77-8a210d016fd7> ;
sh:resultMessage "Less than 1 values on kb:investigation-555e5fbb-ba09-449d-af77-8a210d016fd7->investigation:investigationForm" ;
sh:resultPath investigation:investigationForm ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
sh:sourceShape [
sh:maxCount "1"^^xsd:integer ;
sh:minCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:or (
[
sh:datatype vocab:InvestigationFormVocab ;
]
[
sh:datatype xsd:string ;
]
) ;
sh:path investigation:investigationForm ;
] ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/investigation-555e5fbb-ba09-449d-af77-8a210d016fd7> ;
Expand Down
Loading

0 comments on commit 7035bee

Please sign in to comment.