Update CASE validation to 1.4.0 and add necessary API and example adjustments

A follow-on patch will regenerate Make-managed files.

Signed-off-by: Alex Nelson <[email protected]>

Author: ajnelson-nist

.github/workflows/ci.yml

@@ -41,10 +41,10 @@ jobs:
 
       # Ensure that the example output is a valid CASE JSON-LD graph
       - name: CASE Export Validation
-        uses: kchason/case-validation-action@v2.9.0
+        uses: kchason/case-validation-action@v2.10.0
         with:
           case-path: ./
-          case-version: "case-1.3.0"
+          case-version: "case-1.4.0"
           extension-filter: "jsonld"
 
       - name: Convert example

case_mapping/uco/action.py

@@ -48,10 +48,7 @@ def __init__(
             }
         )
         if action_status:
-            self["uco-action:actionStatus"] = {
-                "@type": "uco-vocabulary:ActionStatusTypeVocab",
-                "@value": action_status,
-            }
+            self["uco-action:actionStatus"] = action_status
         self._datetime_vars(
             **{"uco-action:startTime": start_time, "uco-action:endTime": end_time}
         )

case_mapping/uco/observable.py

@@ -332,21 +332,15 @@ def __init__(
         self._bool_vars(**{"uco-observable:isEncrypted": is_encrypted})
 
         if byte_order:
-            self["uco-observable:byteOrder"] = {
-                "@type": "uco-vocabulary:EndiannessTypeVocab",
-                "@value": byte_order,
-            }
+            self["uco-observable:byteOrder"] = byte_order
 
         if hash_method is not None or hash_value is not None or hash_value != "-":
             data: dict[str, Any] = {
                 "@id": self.prefix_label + ":" + str(local_uuid()),
                 "@type": "uco-types:Hash",
             }
             if hash_method is not None:
-                data["uco-types:hashMethod"] = {
-                    "@type": "uco-vocabulary:HashNameVocab",
-                    "@value": hash_method,
-                }
+                data["uco-types:hashMethod"] = hash_method
             if hash_value is not None:
                 data["uco-types:hashValue"] = {
                     "@type": "xsd:hexBinary",
@@ -1300,17 +1294,39 @@ def __init__(
         )
 
 
+class SoftwareFacet(Facet):
+    def __init__(
+        self,
+        *args: Any,
+        manufacturer: Optional[Identity] = None,
+        version: Optional[str] = None,
+        **kwargs: Any,
+    ) -> None:
+        super().__init__()
+
+        self["@type"] = "uco-observable:SoftwareFacet"
+
+        self._str_vars(
+            **{
+                "uco-observable:version": version,
+            }
+        )
+        self._node_reference_vars(
+            **{
+                "uco-observable:manufacturer": manufacturer,
+            }
+        )
+
+
 class OperatingSystemFacet(Facet):
     def __init__(
         self,
         *args: Any,
         os_advertisingID: Optional[str] = None,
         os_bitness: Optional[str] = None,
+        os_environment_variables: Union[None, Dict, Dictionary] = None,
         os_install_date: Optional[datetime] = None,
         os_isLimitAdTrackingEnabled: Optional[bool] = None,
-        os_manufacturer: Union[None, Identity] = None,
-        os_version: Optional[str] = None,
-        os_environment_variables: Union[None, Dict, Dictionary] = None,
         **kwargs: Any,
     ):
         super().__init__()
@@ -1334,19 +1350,13 @@ def __init__(
             **{
                 "uco-observable:advertisingID": os_advertisingID,
                 "uco-observable:bitness": os_bitness,
-                "uco-observable:version": os_version,
             }
         )
         self._datetime_vars(**{"uco-observable:installDate": os_install_date})
 
         self._bool_vars(
             **{"uco-observable:isLimitAdTrackingEnabled": os_isLimitAdTrackingEnabled}
         )
-        self._node_reference_vars(
-            **{
-                "uco-observable:manufacturer": os_manufacturer,
-            }
-        )
 
 
 class PathRelationFacet(Facet):

example.py

@@ -45,7 +45,7 @@ def _next_timestamp() -> datetime:
     modified_time=bundle_modified_time,
     name="json ld file",
     object_created_time=bundle_created_time,
-    spec_version="UCO/CASE 1.3",
+    spec_version="UCO/CASE 1.4",
     tag="Artifacts extracted from a mobile phone",
 )
 
@@ -67,17 +67,24 @@ def _next_timestamp() -> datetime:
 }
 manufacturer_apple = uco.identity.Organization(name="Apple")
 
+# TODO AJN: Modeling suggestion - The SoftwareFacet and
+# OperatingSystemFacet pertain to an OperatingSystem object, not the
+# Device object.  There needs to be a model of the time-bounded
+# relationship between device and OS, whether a Relationship or a
+# time-bounding on the OperatingSystem object.
+software_facet = uco.observable.SoftwareFacet(
+    manufacturer=manufacturer_apple,
+    version="17.4.1",
+)
 os_facet = uco.observable.OperatingSystemFacet(
-    os_manufacturer=manufacturer_apple,
     os_advertisingID="DX4CDXKN",
     os_bitness="64-bit",
     os_install_date=os_date,
     os_isLimitAdTrackingEnabled=True,
-    os_version="17.4.1",
     os_environment_variables=os_env_vars,
 )
 
-device_camera.append_facets(device1, os_facet)
+device_camera.append_facets(device1, software_facet, os_facet)
 bundle.append_to_uco_object(device_camera)
 
 ##################################
@@ -863,16 +870,18 @@ def _next_timestamp() -> datetime:
 )
 
 os_object = uco.observable.ObservableObject()
+software_facet = uco.observable.SoftwareFacet(
+    manufacturer=manufacturer_apple,
+    version="17.4.1",
+)
 os_facet = uco.observable.OperatingSystemFacet(
-    os_manufacturer=manufacturer_apple,
     os_advertisingID="XX908WN",
     os_bitness="64-bit",
     os_install_date=os_date,
     os_isLimitAdTrackingEnabled=True,
-    os_version="17.4.1",
     os_environment_variables=os_env_vars,
 )
-os_object.append_facets(os_facet)
+os_object.append_facets(software_facet, os_facet)
 bundle.append_to_uco_object(os_object)
 
 app_telegram_facet = uco.observable.ApplicationFacet(