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.

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

Jump to bottom

Issue 632: Prepare OperatingSystem to become a subclass of Software #633

Merged
merged 2 commits into from
Nov 8, 2024
Merged

Issue 632: Prepare OperatingSystem to become a subclass of Software #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62ebeab
Prepare OperatingSystem to become a subclass of Software
ajnelson-nist Sep 13, 2024
40b285a
Regenerate Make-managed files
ajnelson-nist Sep 13, 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
20 changes: 20 additions & 0 deletions ontology/uco/observable/observable.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5158,6 +5158,14 @@ observable:OperatingSystem
rdfs:subClassOf observable:ObservableObject ;
rdfs:label "OperatingSystem"@en ;
rdfs:comment "An operating system is the software that manages computer hardware, software resources, and provides common services for computer programs. [based on https://en.wikipedia.org/wiki/Operating_system]"@en ;
rdfs:seeAlso [
a sh:NodeShape ;
rdfs:comment "This anonymous shape is attached with rdfs:seeAlso in order to associate a warning-severity class constraint, that will only be necessary as an independent shape until UCO 2.0.0."@en ;
sh:class observable:Software ;
sh:message "In UCO 2.0.0, uco-observable:OperatingSystem will be a subclass of uco-observable:Software. In preparation for UCO 2.0.0, the additional type uco-observable:Software should be assigned to this node."@en ;
sh:severity sh:Warning ;
sh:targetClass observable:OperatingSystem ;
] ;
sh:targetClass observable:OperatingSystem ;
.

Expand Down Expand Up @@ -5210,6 +5218,18 @@ observable:OperatingSystemFacet
sh:datatype xsd:string ;
sh:nodeKind sh:Literal ;
sh:path observable:advertisingID ;
] ,
[
sh:maxCount "0"^^xsd:integer ;
sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ;
sh:path observable:manufacturer ;
sh:severity sh:Warning ;
] ,
[
sh:maxCount "0"^^xsd:integer ;
sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ;
sh:path observable:version ;
sh:severity sh:Warning ;
]
;
sh:targetClass observable:OperatingSystemFacet ;
Expand Down
2 changes: 2 additions & 0 deletions tests/examples/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ all: \
object_status_PASS_validation.ttl \
object_status_XFAIL_validation.ttl \
observable_creation_time_PASS_validation.ttl \
operating_system_PASS_validation.ttl \
owl_axiom_PASS_validation.ttl \
owl_axiom_XFAIL_validation.ttl \
owl_properties_PASS_validation.ttl \
Expand Down Expand Up @@ -121,6 +122,7 @@ check: \
object_status_PASS_validation.ttl \
object_status_XFAIL_validation.ttl \
observable_creation_time_PASS_validation.ttl \
operating_system_PASS_validation.ttl \
owl_axiom_PASS_validation.ttl \
owl_axiom_XFAIL_validation.ttl \
owl_properties_PASS_validation.ttl \
Expand Down
48 changes: 48 additions & 0 deletions tests/examples/operating_system_PASS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"@context": {
"core": "https://ontology.unifiedcyberontology.org/uco/core/",
"identity": "https://ontology.unifiedcyberontology.org/uco/identity/",
"kb": "http://example.org/kb/",
"observable": "https://ontology.unifiedcyberontology.org/uco/observable/",
"rdfs": "http://www.w3.org/2000/01/rdf-schema#",
"xsd": "http://www.w3.org/2001/XMLSchema#"
},
"@graph": [
{
"@id": "kb:Organization-4ea8a5bf-60ea-43ba-9ba6-f852ce8f8b54",
"@type": "identity:Organization",
"core:name": "Example OS Company"
},
{
"@id": "kb:OperatingSystem-427dd103-2553-4ccc-ad57-1df4e88b174d",
"@type": "observable:OperatingSystem",
"core:description": "The Example Operating System instance deployed on workstation B-203-22",
"core:hasFacet": [
{
"@id": "kb:SoftwareFacet-1bde46c5-4648-493c-b9dc-56477191d5c6",
"@type": "observable:SoftwareFacet",
"observable:cpeid": "cpe:2.3:o:exampleosco:exampleos:40:*:*:*:*:*:*:*",
"observable:language": "en-us",
"observable:manufacturer": {
"@id": "kb:Organization-4ea8a5bf-60ea-43ba-9ba6-f852ce8f8b54"
},
"observable:version": "40"
},
{
"@id": "kb:OperatingSystemFacet-35047ef2-ffd6-45e8-8b3c-2e8e4bfe7c2b",
"@type": "observable:OperatingSystemFacet",
"rdfs:comment": "This node will trigger a warning for housing the manufacturer and version properties, meant to be moved to SoftwareFacet.",
"observable:bitness": "64",
"observable:installDate": {
"@type": "xsd:dateTime",
"@value": "2024-09-13T09:00:00-04:00"
},
"observable:manufacturer": {
"@id": "kb:Organization-4ea8a5bf-60ea-43ba-9ba6-f852ce8f8b54"
},
"observable:version": "40"
}
]
}
]
}
58 changes: 58 additions & 0 deletions tests/examples/operating_system_PASS_validation.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
@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 xsd: <http://www.w3.org/2001/XMLSchema#> .

[]
a sh:ValidationReport ;
sh:conforms "true"^^xsd:boolean ;
sh:result
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/OperatingSystem-427dd103-2553-4ccc-ad57-1df4e88b174d> ;
sh:resultMessage "In UCO 2.0.0, uco-observable:OperatingSystem will be a subclass of uco-observable:Software. In preparation for UCO 2.0.0, the additional type uco-observable:Software should be assigned to this node."@en ;
sh:resultSeverity sh:Warning ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
a sh:NodeShape ;
rdfs:comment "This anonymous shape is attached with rdfs:seeAlso in order to associate a warning-severity class constraint, that will only be necessary as an independent shape until UCO 2.0.0."@en ;
sh:class observable:Software ;
sh:message "In UCO 2.0.0, uco-observable:OperatingSystem will be a subclass of uco-observable:Software. In preparation for UCO 2.0.0, the additional type uco-observable:Software should be assigned to this node."@en ;
sh:severity sh:Warning ;
sh:targetClass observable:OperatingSystem ;
] ;
sh:value <http://example.org/kb/OperatingSystem-427dd103-2553-4ccc-ad57-1df4e88b174d> ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/OperatingSystemFacet-35047ef2-ffd6-45e8-8b3c-2e8e4bfe7c2b> ;
sh:resultMessage "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ;
sh:resultPath observable:manufacturer ;
sh:resultSeverity sh:Warning ;
sh:sourceConstraintComponent sh:MaxCountConstraintComponent ;
sh:sourceShape [
sh:maxCount "0"^^xsd:integer ;
sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ;
sh:path observable:manufacturer ;
sh:severity sh:Warning ;
] ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/OperatingSystemFacet-35047ef2-ffd6-45e8-8b3c-2e8e4bfe7c2b> ;
sh:resultMessage "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ;
sh:resultPath observable:version ;
sh:resultSeverity sh:Warning ;
sh:sourceConstraintComponent sh:MaxCountConstraintComponent ;
sh:sourceShape [
sh:maxCount "0"^^xsd:integer ;
sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ;
sh:path observable:version ;
sh:severity sh:Warning ;
] ;
]
;
.

16 changes: 16 additions & 0 deletions tests/examples/test_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,22 @@ def test_observable_creation_time_PASS() -> None:
}
)

def test_operating_system_PASS() -> None:
confirm_validation_results(
"operating_system_PASS_validation.ttl",
True,
expected_focus_node_severities={
(
"http://example.org/kb/OperatingSystem-427dd103-2553-4ccc-ad57-1df4e88b174d",
str(NS_SH.Warning)
),
(
"http://example.org/kb/OperatingSystemFacet-35047ef2-ffd6-45e8-8b3c-2e8e4bfe7c2b",
str(NS_SH.Warning)
),
}
)

def test_owl_axiom_PASS() -> None:
confirm_validation_results(
"owl_axiom_PASS_validation.ttl",
Expand Down
Loading