fixup! Add support for RAUC file parsing

Author: easybe

goosebit/updates/__init__.py

@@ -19,25 +19,25 @@
 async def create_software_update(uri: str, temp_file: Path | None) -> Software:
     parsed_uri = urlparse(uri)
 
-    # parse swu header into update_info
+    # parse image header into update_info
     if parsed_uri.scheme == "file":
         if temp_file is None:
             raise HTTPException(500, "Temporary file missing, cannot parse file information")
         try:
             update_info = await swdesc.parse_file(temp_file)
         except Exception:
-            raise HTTPException(422, "Software swu header cannot be parsed")
+            raise HTTPException(422, "Software image header cannot be parsed")
 
     elif parsed_uri.scheme.startswith("http"):
         try:
             update_info = await swdesc.parse_remote(uri)
         except Exception:
-            raise HTTPException(422, "Software swu header cannot be parsed")
+            raise HTTPException(422, "Software image header cannot be parsed")
     else:
         raise HTTPException(422, "Software URI protocol unknown")
 
     if update_info is None:
-        raise HTTPException(422, "Software swu header contains invalid data")
+        raise HTTPException(422, "Software image header contains invalid data")
 
     # check for collisions
     is_colliding = await _is_software_colliding(update_info)

goosebit/updates/swdesc/rauc.py

@@ -1,5 +1,6 @@
 import configparser
 import logging
+import re
 
 import semver
 from anyio import Path, open_file
@@ -32,14 +33,17 @@ async def parse_file(file: Path):
 def parse_descriptor(manifest: configparser.ConfigParser):
     swdesc_attrs = {}
     try:
-        swdesc_attrs["version"] = semver.Version.parse(manifest["system"].get("version"))
-        swdesc_attrs["compatibility"] = [{"hw_model": "default", "hw_revision": manifest["system"]["compatible"]}]
-    except KeyError:
-        try:
-            swdesc_attrs["version"] = semver.Version.parse(manifest["update"].get("version"))
-            swdesc_attrs["compatibility"] = [{"hw_model": "default", "hw_revision": manifest["update"]["compatible"]}]
-        except KeyError as e:
-            logger.warning(f"Parsing RAUC descriptor failed, error={e}")
-            raise ValueError("Parsing RAUC descriptor failed", e)
+        swdesc_attrs["version"] = semver.Version.parse(manifest["update"].get("version"))
+        pattern = re.compile(r"^(?P<hw_model>.+?)[- ]?(?P<hw_revision>\w*[\d.]+\w*)?$")
+        hw_model = "default"
+        hw_revision = "default"
+        m = pattern.match(manifest["update"]["compatible"])
+        if m:
+            hw_model = m.group("hw_model")
+            hw_revision = m.group("hw_revision") or "default"
+        swdesc_attrs["compatibility"] = [{"hw_model": hw_model, "hw_revision": hw_revision}]
+    except KeyError as e:
+        logger.warning(f"Parsing RAUC descriptor failed, error={e}")
+        raise ValueError("Parsing RAUC descriptor failed", e)
 
     return swdesc_attrs

poetry.lock

@@ -26,7 +26,8 @@ dependencies = [
     "pydantic-settings[yaml] (>=2.10.1,<3.0.0)",
     "uvicorn (>=0.35.0,<0.36.0)",
     "boto3 (>=1.40.8,<2.0.0)",
-    "pysquashfsimage (>=0.9.0,<1.0.0)"
+    "pysquashfsimage (>=0.9.0,<1.0.0)",
+    "zstandard (>=0.24.0,<0.25.0)"
 ]
 
 [project.optional-dependencies]