Skip to content

Commit 8541cea

Browse files
vulnmastervulnmaster
authored
Merge pull request #335 from casework/adopt-case-1.4.0
Bump case-utils, and adjust examples for CASE 1.4.0 updates
2 parents ffe3fe9 + 7f809da commit 8541cea

58 files changed

Lines changed: 331 additions & 8926 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples/asgard/asgard.json‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,7 @@
350350
{
351351
"@id": "kb:hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d",
352352
"@type": "uco-types:Hash",
353-
"uco-types:hashMethod": {
354-
"@type": "uco-vocabulary:HashNameVocab",
355-
"@value": "SHA256"
356-
},
353+
"uco-types:hashMethod": "SHA256",
357354
"uco-types:hashValue": {
358355
"@type": "xsd:hexBinary",
359356
"@value": "7ea081166336119da78ee4bbdbd06840b94efe28988a2bdb0bcf2387a481e283"
@@ -389,10 +386,7 @@
389386
{
390387
"@id": "kb:hash-c6cc7dd6-1bf9-5454-9653-37caff09411d",
391388
"@type": "uco-types:Hash",
392-
"uco-types:hashMethod": {
393-
"@type": "uco-vocabulary:HashNameVocab",
394-
"@value": "SHA256"
395-
},
389+
"uco-types:hashMethod": "SHA256",
396390
"uco-types:hashValue": {
397391
"@type": "xsd:hexBinary",
398392
"@value": "a13225720074371d56a4f4d5117fbb4953c5b1d316b31f21edcb7ed8fdf66c6e"

‎examples/asgard/asgard_validation-develop-2.0.0.ttl‎

Lines changed: 11 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -2,77 +2,21 @@
22
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
33
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
44
@prefix sh: <http://www.w3.org/ns/shacl#> .
5-
@prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
65
@prefix uco-observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
7-
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
86
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
97

108
[]
119
a sh:ValidationReport ;
12-
sh:conforms "false"^^xsd:boolean ;
13-
sh:result
14-
[
15-
a sh:ValidationResult ;
16-
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
17-
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
18-
sh:resultPath uco-observable:accountType ;
19-
sh:resultSeverity sh:Info ;
20-
sh:sourceConstraintComponent sh:InConstraintComponent ;
21-
sh:sourceShape uco-observable:AccountFacet-accountType-in-shape ;
22-
sh:value "Phone" ;
23-
] ,
24-
[
25-
a sh:ValidationResult ;
26-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
27-
sh:resultMessage "Value is not Literal with datatype xsd:string" ;
28-
sh:resultPath types:hashMethod ;
29-
sh:resultSeverity sh:Violation ;
30-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
31-
sh:sourceShape [
32-
sh:datatype xsd:string ;
33-
sh:maxCount "1"^^xsd:integer ;
34-
sh:minCount "1"^^xsd:integer ;
35-
sh:nodeKind sh:Literal ;
36-
sh:path types:hashMethod ;
37-
] ;
38-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
39-
] ,
40-
[
41-
a sh:ValidationResult ;
42-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
43-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
44-
sh:resultPath types:hashMethod ;
45-
sh:resultSeverity sh:Info ;
46-
sh:sourceConstraintComponent sh:InConstraintComponent ;
47-
sh:sourceShape types:Hash-hashMethod-in-shape ;
48-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
49-
] ,
50-
[
51-
a sh:ValidationResult ;
52-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
53-
sh:resultMessage "Value is not Literal with datatype xsd:string" ;
54-
sh:resultPath types:hashMethod ;
55-
sh:resultSeverity sh:Violation ;
56-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
57-
sh:sourceShape [
58-
sh:datatype xsd:string ;
59-
sh:maxCount "1"^^xsd:integer ;
60-
sh:minCount "1"^^xsd:integer ;
61-
sh:nodeKind sh:Literal ;
62-
sh:path types:hashMethod ;
63-
] ;
64-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
65-
] ,
66-
[
67-
a sh:ValidationResult ;
68-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
69-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
70-
sh:resultPath types:hashMethod ;
71-
sh:resultSeverity sh:Info ;
72-
sh:sourceConstraintComponent sh:InConstraintComponent ;
73-
sh:sourceShape types:Hash-hashMethod-in-shape ;
74-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
75-
]
76-
;
10+
sh:conforms "true"^^xsd:boolean ;
11+
sh:result [
12+
a sh:ValidationResult ;
13+
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
14+
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
15+
sh:resultPath uco-observable:accountType ;
16+
sh:resultSeverity sh:Info ;
17+
sh:sourceConstraintComponent sh:InConstraintComponent ;
18+
sh:sourceShape uco-observable:AccountFacet-accountType-in-shape ;
19+
sh:value "Phone" ;
20+
] ;
7721
.
7822

‎examples/asgard/asgard_validation-develop.ttl‎

Lines changed: 11 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -2,75 +2,21 @@
22
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
33
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
44
@prefix sh: <http://www.w3.org/ns/shacl#> .
5-
@prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
65
@prefix uco-observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
7-
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
86
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
97

108
[]
119
a sh:ValidationReport ;
12-
sh:conforms "false"^^xsd:boolean ;
13-
sh:result
14-
[
15-
a sh:ValidationResult ;
16-
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
17-
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
18-
sh:resultPath uco-observable:accountType ;
19-
sh:resultSeverity sh:Info ;
20-
sh:sourceConstraintComponent sh:InConstraintComponent ;
21-
sh:sourceShape uco-observable:AccountFacet-accountType-in-shape ;
22-
sh:value "Phone" ;
23-
] ,
24-
[
25-
a sh:ValidationResult ;
26-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
27-
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
28-
sh:resultPath types:hashMethod ;
29-
sh:resultSeverity sh:Warning ;
30-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
31-
sh:sourceShape [
32-
sh:datatype xsd:string ;
33-
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
34-
sh:path types:hashMethod ;
35-
sh:severity sh:Warning ;
36-
] ;
37-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
38-
] ,
39-
[
40-
a sh:ValidationResult ;
41-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
42-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
43-
sh:resultPath types:hashMethod ;
44-
sh:resultSeverity sh:Info ;
45-
sh:sourceConstraintComponent sh:InConstraintComponent ;
46-
sh:sourceShape types:Hash-hashMethod-in-shape ;
47-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
48-
] ,
49-
[
50-
a sh:ValidationResult ;
51-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
52-
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
53-
sh:resultPath types:hashMethod ;
54-
sh:resultSeverity sh:Warning ;
55-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
56-
sh:sourceShape [
57-
sh:datatype xsd:string ;
58-
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
59-
sh:path types:hashMethod ;
60-
sh:severity sh:Warning ;
61-
] ;
62-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
63-
] ,
64-
[
65-
a sh:ValidationResult ;
66-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
67-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
68-
sh:resultPath types:hashMethod ;
69-
sh:resultSeverity sh:Info ;
70-
sh:sourceConstraintComponent sh:InConstraintComponent ;
71-
sh:sourceShape types:Hash-hashMethod-in-shape ;
72-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
73-
]
74-
;
10+
sh:conforms "true"^^xsd:boolean ;
11+
sh:result [
12+
a sh:ValidationResult ;
13+
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
14+
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
15+
sh:resultPath uco-observable:accountType ;
16+
sh:resultSeverity sh:Info ;
17+
sh:sourceConstraintComponent sh:InConstraintComponent ;
18+
sh:sourceShape uco-observable:AccountFacet-accountType-in-shape ;
19+
sh:value "Phone" ;
20+
] ;
7521
.
7622

‎examples/asgard/asgard_validation-unstable-2.0.0.ttl‎

Lines changed: 11 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -2,77 +2,21 @@
22
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
33
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
44
@prefix sh: <http://www.w3.org/ns/shacl#> .
5-
@prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
65
@prefix uco-observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
7-
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
86
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
97

108
[]
119
a sh:ValidationReport ;
12-
sh:conforms "false"^^xsd:boolean ;
13-
sh:result
14-
[
15-
a sh:ValidationResult ;
16-
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
17-
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
18-
sh:resultPath uco-observable:accountType ;
19-
sh:resultSeverity sh:Info ;
20-
sh:sourceConstraintComponent sh:InConstraintComponent ;
21-
sh:sourceShape uco-observable:AccountFacet-accountType-in-shape ;
22-
sh:value "Phone" ;
23-
] ,
24-
[
25-
a sh:ValidationResult ;
26-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
27-
sh:resultMessage "Value is not Literal with datatype xsd:string" ;
28-
sh:resultPath types:hashMethod ;
29-
sh:resultSeverity sh:Violation ;
30-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
31-
sh:sourceShape [
32-
sh:datatype xsd:string ;
33-
sh:maxCount "1"^^xsd:integer ;
34-
sh:minCount "1"^^xsd:integer ;
35-
sh:nodeKind sh:Literal ;
36-
sh:path types:hashMethod ;
37-
] ;
38-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
39-
] ,
40-
[
41-
a sh:ValidationResult ;
42-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
43-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
44-
sh:resultPath types:hashMethod ;
45-
sh:resultSeverity sh:Info ;
46-
sh:sourceConstraintComponent sh:InConstraintComponent ;
47-
sh:sourceShape types:Hash-hashMethod-in-shape ;
48-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
49-
] ,
50-
[
51-
a sh:ValidationResult ;
52-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
53-
sh:resultMessage "Value is not Literal with datatype xsd:string" ;
54-
sh:resultPath types:hashMethod ;
55-
sh:resultSeverity sh:Violation ;
56-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
57-
sh:sourceShape [
58-
sh:datatype xsd:string ;
59-
sh:maxCount "1"^^xsd:integer ;
60-
sh:minCount "1"^^xsd:integer ;
61-
sh:nodeKind sh:Literal ;
62-
sh:path types:hashMethod ;
63-
] ;
64-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
65-
] ,
66-
[
67-
a sh:ValidationResult ;
68-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
69-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
70-
sh:resultPath types:hashMethod ;
71-
sh:resultSeverity sh:Info ;
72-
sh:sourceConstraintComponent sh:InConstraintComponent ;
73-
sh:sourceShape types:Hash-hashMethod-in-shape ;
74-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
75-
]
76-
;
10+
sh:conforms "true"^^xsd:boolean ;
11+
sh:result [
12+
a sh:ValidationResult ;
13+
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
14+
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
15+
sh:resultPath uco-observable:accountType ;
16+
sh:resultSeverity sh:Info ;
17+
sh:sourceConstraintComponent sh:InConstraintComponent ;
18+
sh:sourceShape uco-observable:AccountFacet-accountType-in-shape ;
19+
sh:value "Phone" ;
20+
] ;
7721
.
7822

‎examples/asgard/asgard_validation-unstable.ttl‎

Lines changed: 11 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -2,75 +2,21 @@
22
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
33
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
44
@prefix sh: <http://www.w3.org/ns/shacl#> .
5-
@prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
65
@prefix uco-observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
7-
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
86
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
97

108
[]
119
a sh:ValidationReport ;
12-
sh:conforms "false"^^xsd:boolean ;
13-
sh:result
14-
[
15-
a sh:ValidationResult ;
16-
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
17-
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
18-
sh:resultPath uco-observable:accountType ;
19-
sh:resultSeverity sh:Info ;
20-
sh:sourceConstraintComponent sh:InConstraintComponent ;
21-
sh:sourceShape uco-observable:AccountFacet-accountType-in-shape ;
22-
sh:value "Phone" ;
23-
] ,
24-
[
25-
a sh:ValidationResult ;
26-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
27-
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
28-
sh:resultPath types:hashMethod ;
29-
sh:resultSeverity sh:Warning ;
30-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
31-
sh:sourceShape [
32-
sh:datatype xsd:string ;
33-
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
34-
sh:path types:hashMethod ;
35-
sh:severity sh:Warning ;
36-
] ;
37-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
38-
] ,
39-
[
40-
a sh:ValidationResult ;
41-
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
42-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
43-
sh:resultPath types:hashMethod ;
44-
sh:resultSeverity sh:Info ;
45-
sh:sourceConstraintComponent sh:InConstraintComponent ;
46-
sh:sourceShape types:Hash-hashMethod-in-shape ;
47-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
48-
] ,
49-
[
50-
a sh:ValidationResult ;
51-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
52-
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
53-
sh:resultPath types:hashMethod ;
54-
sh:resultSeverity sh:Warning ;
55-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
56-
sh:sourceShape [
57-
sh:datatype xsd:string ;
58-
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
59-
sh:path types:hashMethod ;
60-
sh:severity sh:Warning ;
61-
] ;
62-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
63-
] ,
64-
[
65-
a sh:ValidationResult ;
66-
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
67-
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
68-
sh:resultPath types:hashMethod ;
69-
sh:resultSeverity sh:Info ;
70-
sh:sourceConstraintComponent sh:InConstraintComponent ;
71-
sh:sourceShape types:Hash-hashMethod-in-shape ;
72-
sh:value "SHA256"^^vocabulary:HashNameVocab ;
73-
]
74-
;
10+
sh:conforms "true"^^xsd:boolean ;
11+
sh:result [
12+
a sh:ValidationResult ;
13+
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
14+
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
15+
sh:resultPath uco-observable:accountType ;
16+
sh:resultSeverity sh:Info ;
17+
sh:sourceConstraintComponent sh:InConstraintComponent ;
18+
sh:sourceShape uco-observable:AccountFacet-accountType-in-shape ;
19+
sh:value "Phone" ;
20+
] ;
7521
.
7622

0 commit comments

Comments
 (0)