goosebit 0.2.7__py3-none-any.whl → 0.2.9__py3-none-any.whl

goosebit/db/migrations/models/6_20250904081506_add_image_format.py

@@ -0,0 +1,11 @@
+from tortoise import BaseDBAsyncClient
+
+
+async def upgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        ALTER TABLE "software" ADD "image_format" SMALLINT NOT NULL  DEFAULT 0 /* SWU: 0\nRAUC: 1 */;"""
+
+
+async def downgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        ALTER TABLE "software" DROP COLUMN "image_format";"""

goosebit/db/models.py

@@ -123,12 +123,28 @@ class Hardware(Model):
     revision = fields.CharField(max_length=255)
 
 
+class SoftwareImageFormat(IntEnum):
+    SWU = 0
+    RAUC = 1
+
+    def __str__(self):
+        return self.name.upper()
+
+    @classmethod
+    def from_str(cls, name):
+        try:
+            return cls[name.upper()]
+        except KeyError:
+            return cls.SWU
+
+
 class Software(Model):
     id = fields.IntField(primary_key=True)
     uri = fields.CharField(max_length=255)
     size = fields.BigIntField()
     hash = fields.CharField(max_length=255)
     version = fields.CharField(max_length=255)
+    image_format = fields.IntEnumField(SoftwareImageFormat, default=SoftwareImageFormat.SWU)
     compatibility = fields.ManyToManyField(
         "models.Hardware",
         related_name="softwares",

goosebit/ui/templates/software.html.jinja

@@ -42,7 +42,7 @@
                                         <div class="col">
                                             <input class="form-control"
                                                    type="file"
-                                                   accept=".swu"
+                                                   accept=".swu,.raucb"
                                                    id="file-upload"
                                                    name="file" />
                                         </div>

goosebit/updates/__init__.py

@@ -19,25 +19,25 @@ from . import swdesc
 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)
@@ -59,6 +59,7 @@ async def create_software_update(uri: str, temp_file: Path | None) -> Software:
         version=str(update_info["version"]),
         size=update_info["size"],
         hash=update_info["hash"],
+        image_format=update_info["image_format"],
     )
 
     # create compatibility information

goosebit/updates/swdesc/__init__.py

@@ -0,0 +1,45 @@
+import logging
+import random
+import string
+
+import httpx
+from anyio import Path, open_file
+
+from goosebit.db.models import SoftwareImageFormat
+from goosebit.storage import storage
+
+from . import rauc, swu
+
+logger = logging.getLogger(__name__)
+
+
+async def parse_remote(url: str):
+    async with httpx.AsyncClient() as c:
+        file = await c.get(url)
+        temp_dir = Path(storage.get_temp_dir())
+        tmp_file_path = temp_dir.joinpath("".join(random.choices(string.ascii_lowercase, k=12)) + ".tmp")
+        try:
+            async with await open_file(tmp_file_path, "w+b") as f:
+                await f.write(file.content)
+            file_data = await parse_file(tmp_file_path)  # Use anyio.Path for parse_file
+        except Exception:
+            raise
+        finally:
+            await tmp_file_path.unlink(missing_ok=True)
+        return file_data
+
+
+async def parse_file(file: Path):
+    async with await open_file(file, "r+b") as f:
+        magic = await f.read(4)
+    if magic == swu.MAGIC:
+        image_format = SoftwareImageFormat.SWU
+        attributes = await swu.parse_file(file)
+    elif magic == rauc.MAGIC:
+        image_format = SoftwareImageFormat.RAUC
+        attributes = await rauc.parse_file(file)
+    else:
+        logger.warning(f"Unknown file format, magic={magic}")
+        raise ValueError(f"Unknown file format, magic={magic}")
+    attributes["image_format"] = image_format
+    return attributes

goosebit/updates/swdesc/func.py

@@ -0,0 +1,19 @@
+import hashlib
+
+from anyio import AsyncFile
+
+
+async def sha1_hash_file(fileobj: AsyncFile):
+    last = await fileobj.tell()
+    await fileobj.seek(0)
+    sha1_hash = hashlib.sha1()
+    buf = bytearray(2**18)
+    view = memoryview(buf)
+    while True:
+        size = await fileobj.readinto(buf)
+        if size == 0:
+            break
+        sha1_hash.update(view[:size])
+
+    await fileobj.seek(last)
+    return sha1_hash.hexdigest()

goosebit/updates/swdesc/rauc.py

@@ -0,0 +1,49 @@
+import configparser
+import logging
+import re
+
+import semver
+from anyio import Path, open_file
+from PySquashfsImage import SquashFsImage
+
+from .func import sha1_hash_file
+
+MAGIC = b"hsqs"
+
+logger = logging.getLogger(__name__)
+
+
+async def parse_file(file: Path):
+    async with await open_file(file, "r+b") as f:
+        image_data = await f.read()
+
+        image = SquashFsImage.from_bytes(image_data)
+        manifest = image.select("manifest.raucm")
+        manifest_str = manifest.read_bytes().decode("utf-8")
+        config = configparser.ConfigParser()
+        config.read_string(manifest_str)
+        swdesc_attrs = parse_descriptor(config)
+
+        stat = await file.stat()
+        swdesc_attrs["size"] = stat.st_size
+        swdesc_attrs["hash"] = await sha1_hash_file(f)
+    return swdesc_attrs
+
+
+def parse_descriptor(manifest: configparser.ConfigParser):
+    swdesc_attrs = {}
+    try:
+        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

goosebit/updates/{swdesc.py → swdesc/swu.py}

@@ -1,18 +1,17 @@
-import hashlib
 import logging
-import random
-import string
 from typing import Any
 
-import httpx
 import libconf
-from anyio import AsyncFile, Path, open_file
+from anyio import Path, open_file
 
-from goosebit.storage import storage
 from goosebit.util.version import Version
 
+from .func import sha1_hash_file
+
 logger = logging.getLogger(__name__)
 
+MAGIC = b"0707"
+
 
 def _append_compatibility(boardname, value, compatibility):
     if not isinstance(value, dict):
@@ -43,7 +42,7 @@ def parse_descriptor(swdesc: libconf.AttrDict[Any, Any | None]):
 
         swdesc_attrs["compatibility"] = compatibility
     except KeyError as e:
-        logging.warning(f"Parsing swu descriptor failed, error={e}")
+        logger.warning(f"Parsing swu descriptor failed, error={e}")
         raise ValueError("Parsing swu descriptor failed", e)
 
     return swdesc_attrs
@@ -70,37 +69,6 @@ async def parse_file(file: Path):
         swdesc_attrs = parse_descriptor(swdesc)
         stat = await file.stat()
         swdesc_attrs["size"] = stat.st_size
-        swdesc_attrs["hash"] = await _sha1_hash_file(f)
-        return swdesc_attrs
+        swdesc_attrs["hash"] = await sha1_hash_file(f)
 
-
-async def parse_remote(url: str):
-    async with httpx.AsyncClient() as c:
-        file = await c.get(url)
-        temp_dir = Path(storage.get_temp_dir())
-        tmp_file_path = temp_dir.joinpath("".join(random.choices(string.ascii_lowercase, k=12)) + ".tmp")
-        try:
-            async with await open_file(tmp_file_path, "w+b") as f:
-                await f.write(file.content)
-            file_data = await parse_file(tmp_file_path)  # Use anyio.Path for parse_file
-        except Exception:
-            raise
-        finally:
-            await tmp_file_path.unlink(missing_ok=True)
-        return file_data
-
-
-async def _sha1_hash_file(fileobj: AsyncFile):
-    last = await fileobj.tell()
-    await fileobj.seek(0)
-    sha1_hash = hashlib.sha1()
-    buf = bytearray(2**18)
-    view = memoryview(buf)
-    while True:
-        size = await fileobj.readinto(buf)
-        if size == 0:
-            break
-        sha1_hash.update(view[:size])
-
-    await fileobj.seek(last)
-    return sha1_hash.hexdigest()
+        return swdesc_attrs

{goosebit-0.2.7.dist-info → goosebit-0.2.9.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.3
 Name: goosebit
-Version: 0.2.7
-Summary: 
+Version: 0.2.9
+Summary: A simplistic, opinionated remote update server implementing hawkBit™'s DDI API
 Author: Brett Rowan
 Author-email: 121075405+b-rowan@users.noreply.github.com
 Requires-Python: >=3.11,<4.0
@@ -25,10 +25,12 @@ Requires-Dist: opentelemetry-distro (>=0.57b0,<0.58)
 Requires-Dist: opentelemetry-exporter-prometheus (>=0.57b0,<0.58)
 Requires-Dist: opentelemetry-instrumentation-fastapi (>=0.57b0,<0.58)
 Requires-Dist: pydantic-settings[yaml] (>=2.10.1,<3.0.0)
+Requires-Dist: pysquashfsimage (>=0.9.0,<1.0.0)
 Requires-Dist: python-multipart (>=0.0.20,<0.0.21)
 Requires-Dist: semver (>=3.0.4,<4.0.0)
 Requires-Dist: tortoise-orm (>=0.25.1,<0.26.0)
 Requires-Dist: uvicorn (>=0.35.0,<0.36.0)
+Requires-Dist: zstandard (>=0.24.0,<0.25.0)
 Description-Content-Type: text/markdown
 
 # gooseBit
@@ -96,7 +98,10 @@ The software packages managed by gooseBit are either stored on the local filesys
 
 ## Assumptions
 
-- Devices use [SWUpdate](https://swupdate.org) for managing software updates.
+- Devices use [SWUpdate](https://swupdate.org) or [RAUC](https://github.com/rauc/rauc) + [RAUC hawkBit Updater](https://github.com/rauc/rauc-hawkbit-updater) for managing software updates.
+- Devices send certain attributes (`sw_version`, `hw_model`, `hw_revision`).
+- Semantic versions are used.
+- With RAUC and multiple hardware revisions, `compatible` in `manifest.raucm` is set to something like `my-board-rev4.2` or `Some Board 2b`.
 
 ## Features
 
@@ -111,7 +116,7 @@ The registry tracks each device's status, including the last online timestamp, i
 
 ### Software Repository
 
-Software packages (`*.swu` files) can be hosted directly on the gooseBit server or on an external server. gooseBit parses the software metadata to determine compatibility with specific hardware models and revisions.
+Software packages (`*.swu`/`*.raucb` files) can be hosted directly on the gooseBit server or on an external server. gooseBit parses the software metadata to determine compatibility with specific hardware models and revisions.
 
 ### Device Update Modes
 
@@ -268,7 +273,7 @@ The structure of gooseBit is as follows:
   - `templates`: Jinja2 formatted templates.
   - `nav`: Navbar handler.
 - `updater`: DDI API handler and device update manager.
-- `updates`: SWUpdate file parsing.
+- `updates`: SWUpdate/RAUC file parsing.
 - `auth`: Authentication functions and permission handling.
 - `models`: Database models.
 - `db`: Database config and initialization.

{goosebit-0.2.7.dist-info → goosebit-0.2.9.dist-info}/RECORD

@@ -45,7 +45,8 @@ goosebit/db/migrations/models/3_20241121140210_update.py,sha256=VB_zhZmu7_dw4blQ
 goosebit/db/migrations/models/4_20250324110331_update.py,sha256=GnXlb37X2l2VEHrN6wiNyG0iUd5-KLJmJiOu85rHkDE,425
 goosebit/db/migrations/models/4_20250402085235_rename_uuid_to_id.py,sha256=HnE7MebCxMVPG9JLcSqRGLGiwkL4PVahd6YU0Hklfp0,297
 goosebit/db/migrations/models/5_20250619090242_null_feed.py,sha256=jNU0mjUF4veuQZdjiFBNI5K8O2L7hBoqZF1H4znChuQ,2436
-goosebit/db/models.py,sha256=Vau-LAo14cghXhb4dFhlyThTwVvt3BxavQfB9BgJNqk,5663
+goosebit/db/migrations/models/6_20250904081506_add_image_format.py,sha256=Ywo7PHr65KwUv5H18_Vce0L73HPW02_b1nEYagaPBXo,340
+goosebit/db/models.py,sha256=BQTa-mMiLIMQ6iTfktsqKgNPtJUnMPFjpdutP6XIxdQ,6025
 goosebit/db/pg_ssl_context.py,sha256=OyNJBYPLb_yRpA3AaesYr3bro9R3_20fzcAFUUTl00c,2344
 goosebit/device_manager.py,sha256=UwAslhSk6FEt2cJOMujj6enfmSR-KPrNoAeSCa56Zpg,9284
 goosebit/plugins/__init__.py,sha256=9VLjGc2F72teF9dxGGkwDXTbL0Q1wbjLTheb4hY1qEg,1185
@@ -112,7 +113,7 @@ goosebit/ui/templates/nav.html.jinja,sha256=qgjxA-hxTr6UG600fju-OiPrrRCQV87-K_22
 goosebit/ui/templates/rollouts.html.jinja,sha256=cprN5d8lqpGgUdRVC7WrCY9iNlDICXoQoSJAlp85xpE,3944
 goosebit/ui/templates/settings.html.jinja,sha256=EWGErVNp0Q-0AXb4EhGzaGt_sBPeXpJ3N27M-pFVwf0,4325
 goosebit/ui/templates/setup.html.jinja,sha256=5h-02XXpBltmQ7sK1xu_yF3SO5VhCeepcY13frRcfK8,3908
-goosebit/ui/templates/software.html.jinja,sha256=zFtM-UGq-7jHPgoObD15pl3pwqO5FIAR9kp4Ee-5WmE,7139
+goosebit/ui/templates/software.html.jinja,sha256=fQGZMLbX_g8DU5CUTVqgzKWARieJiVBX_dgA9sv0hzI,7146
 goosebit/updater/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
 goosebit/updater/controller/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
 goosebit/updater/controller/routes.py,sha256=8CnLb-kDuO-yFeWdu4apIyctCf9OzvJ011Az3QDGemU,123
@@ -120,14 +121,17 @@ goosebit/updater/controller/v1/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH
 goosebit/updater/controller/v1/routes.py,sha256=qFD6NqqyEfk4xZqq5JvCLkfiG3laoRJYgPepC2-NveQ,9542
 goosebit/updater/controller/v1/schema.py,sha256=NwSyPx3A38iFabfOfzaVtxPozJQNacikP5WOhxMHqdg,1228
 goosebit/updater/routes.py,sha256=09FVP3vwc5Up926Ll_GzaAQevt3o3ODkSONr7Fupgj4,4271
-goosebit/updates/__init__.py,sha256=ErUsH7eoiM0kVrBgKWNkB1E_p3dRL7F4cNBAiWDW9qg,4207
-goosebit/updates/swdesc.py,sha256=XDKToV9raYe11q9Qws-AvK_fQqq_c0UM9KgPGBiwhAQ,3407
+goosebit/updates/__init__.py,sha256=9neUBUO0pfPHi5qe0WsV0jg7mwrqAElJfHoLgfPvVuQ,4265
+goosebit/updates/swdesc/__init__.py,sha256=-DXcEcBXt_Os2jxOi0UAUBFb0ViofDowxXdTvCzOho4,1432
+goosebit/updates/swdesc/func.py,sha256=Bhs7PFmFdL338HT8hI7elFH3PuAOJUOnDhNKNjyFpDw,435
+goosebit/updates/swdesc/rauc.py,sha256=bsF2--N4AvSSy4sRRx7X01duUxrV-ePwcz_svmtHpTE,1588
+goosebit/updates/swdesc/swu.py,sha256=_bmxKMOMb8ToBLEA1AAqj__5S8wwLXqmM7v2At7zDOc,2343
 goosebit/users/__init__.py,sha256=fmoq3LtDFk0nKUaJyvOFunRMSMiUvEgRQYu56BcGlo8,2187
 goosebit/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 goosebit/util/path.py,sha256=Ir6h3C_kfsVDbzt0icHhH3zDhLnEdW7AeKN0BkjeIJY,1584
 goosebit/util/version.py,sha256=dLBOn8Pb3CeIHhTXYxRfDE3fWGoAl0LPjCTF_xHGFzo,3137
-goosebit-0.2.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-goosebit-0.2.7.dist-info/METADATA,sha256=ZT_HV_lwYX5eE6RrqKeZt4XwfKmQ856UWU_x1lhtYwg,8208
-goosebit-0.2.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-goosebit-0.2.7.dist-info/entry_points.txt,sha256=5p3wNB9_WEljksEBgZmOxO0DrBVhRxP20JD9JJ_lpb4,57
-goosebit-0.2.7.dist-info/RECORD,,
+goosebit-0.2.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+goosebit-0.2.9.dist-info/METADATA,sha256=Y9jzIsB4sOahUb2HV6sCFuTJeBR3uAtLrlcDGXw6PFk,8754
+goosebit-0.2.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+goosebit-0.2.9.dist-info/entry_points.txt,sha256=5p3wNB9_WEljksEBgZmOxO0DrBVhRxP20JD9JJ_lpb4,57
+goosebit-0.2.9.dist-info/RECORD,,