From 7faa6855d81b98221e5cfdceba5ad04680091347 Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Thu, 26 Sep 2024 15:27:33 +0000
Subject: [PATCH 01/23] init sbom html

---
 embark/templates/tracker/sbom.html | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 embark/templates/tracker/sbom.html

diff --git a/embark/templates/tracker/sbom.html b/embark/templates/tracker/sbom.html
new file mode 100644
index 00000000..c3aa4791
--- /dev/null
+++ b/embark/templates/tracker/sbom.html
@@ -0,0 +1,9 @@
+<!--
+This renders a interactive SBOM table for the device -->
+<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-top">
+    <div class="justify-content-between flex-wrap flex-md-nowrap align-items-center mx-auto">
+        <h2>SBOM - PUT VERSION of device here</h2>
+        {% load django_tables2 %}
+        {% render_table table %}
+    </div>
+</div>
\ No newline at end of file

From 6b63ba1ca7a1f12e50062776f4574be9c7fd9e3c Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Fri, 27 Sep 2024 10:35:18 +0000
Subject: [PATCH 02/23] UI part for SBOM

---
 embark/dashboard/models.py           | 10 +++++++++-
 embark/static/scripts/main.js        | 29 +++++++++++++++++++++++++++-
 embark/templates/uploader/start.html | 11 +++++++++++
 embark/uploader/forms.py             |  2 +-
 embark/uploader/models.py            |  3 +++
 5 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/embark/dashboard/models.py b/embark/dashboard/models.py
index 2b2ed67c..2c4b6862 100644
--- a/embark/dashboard/models.py
+++ b/embark/dashboard/models.py
@@ -2,6 +2,7 @@
 __author__ = 'Benedikt Kuehne'
 __license__ = 'MIT'
 
+import uuid
 from django.db import models
 from django.core.validators import MinLengthValidator
 
@@ -13,8 +14,14 @@ class Vulnerability(models.Model):
     Many-to-Many object for CVEs
     """
     cve = models.CharField(max_length=18, validators=[MinLengthValidator(13)], help_text='CVE-XXXX-XXXXXXX')
-    info = models.JSONField(null=True)
+    info = models.JSONField(null=True, editable=True)
 
+class SoftwareBillofMaterial(models.Model):
+    """
+    1-1 object for SBOM
+    """
+    id = models.UUIDField(primary_key=True, default=uuid.uuid4)
+    data = models.JSONField(null=True)
 
 class Result(models.Model):
     """
@@ -71,3 +78,4 @@ class Result(models.Model):
     system_bin = models.TextField(default='{}')
 
     vulnerability = models.ManyToManyField(Vulnerability, help_text='CVE/Vulnerability', related_query_name='CVE', editable=True, blank=True)
+    sbom = models.OneToOneField(SoftwareBillofMaterial, help_text='Software Bill of Material', related_query_name='sbom', editable=True, on_delete=models.CASCADE, null=True)
diff --git a/embark/static/scripts/main.js b/embark/static/scripts/main.js
index 8184bca4..3d8b1567 100644
--- a/embark/static/scripts/main.js
+++ b/embark/static/scripts/main.js
@@ -36,7 +36,7 @@ function navToggle() {
 function expertModeOn() {
     "use strict";
     try {
-        var expertOptions = document.querySelectorAll('div.expertModeOptions');
+        var expertOptions = document.querySelectorAll('div.expertModeOptions:not(.SBOMOption)');
 
         for (var i = 0; i < expertOptions.length; i++) {
             var expertDiv = expertOptions[i];
@@ -67,3 +67,30 @@ function confirmDelete(event) {
         successAlert(`firmware file deleted: ${event.target.elements.firmware.value}`);
     }
 }
+
+/**
+ * To toggle SBOM mode option during analysing the Firmware
+ */
+function SBOMModeToggle() {
+    "use strict";
+    try {
+        var sbomOptions = document.querySelectorAll('div.expertModeOptions.SBOMOption');
+
+        for (var i = 0; i < sbomOptions.length; i++) {
+            var expertDiv = sbomOptions[i];
+            if (expertDiv.getAttribute("value") === "expmode_off") {
+                expertDiv.setAttribute("value","expmode_on");
+            } else {
+                expertDiv.setAttribute("value","expmode_off");
+            }
+        }
+        // turn on too
+        let checkbox = document.getElementById('id_sbom_only_test');
+        checkbox.click();
+
+    } catch (error) {
+        console.log(error.message);
+    }
+    /* we enable the help text automatically in sbom mode */
+    helpTextOn();
+}
\ No newline at end of file
diff --git a/embark/templates/uploader/start.html b/embark/templates/uploader/start.html
index d3f24fb9..74eb2492 100644
--- a/embark/templates/uploader/start.html
+++ b/embark/templates/uploader/start.html
@@ -8,11 +8,18 @@
         <form action="{% url 'embark-uploader-start-analysis' %}" method="post" id="analyze-form">
             {% csrf_token %}
             <div class="innerBlock">
+                <label for="SBOMModeSwitch">SBOM mode</label>
+                <label class="switch">
+                    <input id="SBOMModeSwitch" type="checkbox" onclick="SBOMModeToggle()"/>
+                    <span class="slider round"></span>
+                </label>
+                <br>
                 <label for="expertModeSwitch">Expert mode</label>
                 <label class="switch">
                     <input id="expertModeSwitch" type="checkbox" onclick="expertModeOn()"/>
                     <span class="slider round"></span>
                 </label>
+
                 {% load filters %}
                 <!-- Iterate over all fields and set expmode on fields in expert mode -->
                 {% for field in analysis_form %}
@@ -24,6 +31,10 @@
                     <div class="row expertModeOptions" value="expmode_off">
                             {% bootstrap_field field %}
                     </div>
+                    {% elif field.name == "sbom_only_test" %}
+                    <div class="row expertModeOptions SBOMOption" value="expmode_off">
+                            {% bootstrap_field field %}
+                    </div>
                     {% else %}
                             {% bootstrap_field field %}
                     {% endif %}
diff --git a/embark/uploader/forms.py b/embark/uploader/forms.py
index edced13d..9ee6e103 100644
--- a/embark/uploader/forms.py
+++ b/embark/uploader/forms.py
@@ -91,7 +91,7 @@ class FirmwareAnalysisForm(forms.ModelForm):
     class Meta:
         model = models.FirmwareAnalysis
 
-        fields = ['firmware', 'version', 'device', 'notes', 'firmware_Architecture', 'user_emulation_test', 'system_emulation_test', 'scan_modules']
+        fields = ['firmware', 'version', 'device', 'notes', 'firmware_Architecture', 'user_emulation_test', 'system_emulation_test', 'sbom_only_test', 'scan_modules']
         widgets = {
             "device": forms.CheckboxSelectMultiple,
         }
diff --git a/embark/uploader/models.py b/embark/uploader/models.py
index 50cdae89..1d745459 100644
--- a/embark/uploader/models.py
+++ b/embark/uploader/models.py
@@ -279,6 +279,9 @@ class Firmware
     user_emulation_test = BooleanFieldExpertMode(help_text='Enables automated qemu emulation tests', default=False, expert_mode=True, blank=True)
     system_emulation_test = BooleanFieldExpertMode(help_text='Enables automated qemu system emulation tests', default=False, expert_mode=True, blank=True)
 
+    # SBOM mode option
+    sbom_only_test = models.BooleanField(verbose_name='SBOM only test', help_text='Enables SBOM tests', default=False, blank=True)
+
     # S-modules
     scan_modules = models.JSONField(blank=True, null=True, default=scan_modules_default_value)
 

From 5de2e5e8d536f798234af101860b8999a6317fae Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Mon, 30 Sep 2024 15:30:51 +0000
Subject: [PATCH 03/23] add readin for f21 json and test data

---
 embark/porter/importer.py      |   32 +-
 test/porter/f21_cyclonedx.json | 3710 ++++++++++++++++++++++++++++++++
 2 files changed, 3738 insertions(+), 4 deletions(-)
 create mode 100644 test/porter/f21_cyclonedx.json

diff --git a/embark/porter/importer.py b/embark/porter/importer.py
index dba1ae3b..e65cf036 100644
--- a/embark/porter/importer.py
+++ b/embark/porter/importer.py
@@ -14,7 +14,7 @@
 
 from django.conf import settings
 
-from dashboard.models import Vulnerability, Result
+from dashboard.models import SoftwareBillofMaterial, Vulnerability, Result
 from uploader.models import FirmwareAnalysis
 
 logger = logging.getLogger(__name__)
@@ -27,8 +27,10 @@ def result_read_in(analysis_id):
     """
     logger.debug("starting read-in of %s", analysis_id)
     res = None
-    directory = f"{settings.EMBA_LOG_ROOT}/{analysis_id}/emba_logs/csv_logs/"
-    csv_list = [os.path.join(directory, file_) for file_ in os.listdir(directory)]
+    csv_directory = f"{settings.EMBA_LOG_ROOT}/{analysis_id}/emba_logs/csv_logs/"
+    csv_list = [os.path.join(csv_directory, file_) for file_ in os.listdir(csv_directory)]
+    json_directory = f"{settings.EMBA_LOG_ROOT}/{analysis_id}/emba_logs/json_logs/"
+    json_list = [os.path.join(json_directory, file_) for file_ in os.listdir(json_directory)]
     for file_ in csv_list:
         logger.debug("trying to read: %s", file_)
         if os.path.isfile(file_):      # TODO change check. > if valid EMBA csv file
@@ -41,7 +43,15 @@ def result_read_in(analysis_id):
                 # FIXME f20 in emba is broken!
                 # res = f20_csv(file_, analysis_id)
                 # logger.debug("Result for %s created or updated", analysis_id)
-            # TODO license info etc
+    for file_ in json_list:
+        logger.debug("trying to read: %s", file_)
+        if os.path.isfile(file_):      # TODO change check. > if valid EMBA json file
+            logger.debug("File %s found and attempting to read", file_)
+            if file_.endswith('f21_cyclonedx_sbom_json.json'):
+                logger.info("f21 readin for %s skipped", analysis_id)
+                # f21_cyclonedx_sbom_json.json move into db object
+                res = f21_json(file_, analysis_id)
+        # TODO license info etc
     return res
 
 
@@ -193,6 +203,20 @@ def f10_csv(_file_path, _analysis_id):
     logger.debug("read f10 csv done")
 
 
+def f21_json(_file_path, _analysis_id):
+    """
+    return: result obj/ None
+    SBOM json
+    """
+    logger.debug("starting f21 json import")
+    res, _ = Result.objects.get_or_create(
+        firmware_analysis=FirmwareAnalysis.objects.get(id=_analysis_id)
+    )
+    with open(_file_path, 'r', encoding='utf-8') as f21_json_file:
+        f21_data = json.load(f21_json_file)
+        res.sbom = SoftwareBillofMaterial(data=f21_data)
+    logger.debug("read f21 json done")
+
 if __name__ == "__main__":
     BASE_DIR = Path(__file__).resolve().parent.parent.parent
     TEST_DIR = os.path.join(BASE_DIR, 'test/porter')
diff --git a/test/porter/f21_cyclonedx.json b/test/porter/f21_cyclonedx.json
new file mode 100644
index 00000000..bf329ea4
--- /dev/null
+++ b/test/porter/f21_cyclonedx.json
@@ -0,0 +1,3710 @@
+{
+    "bomFormat": "CycloneDX",
+    "specVersion": "1.5",
+    "version": 1,
+    "components": [
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "br_filter.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "07c954149b2719fd20caf667ac721bc44404b1ef125d7f6f18a863a415372f449b569f9f4e686164a82821eb34d96cd30ed3867b4df10f481eaa41fc0aefd827"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "cdc-acm.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "1c973ea9a44fcfa7c3583b4dbda3479cbe27362df200015f8dd0e455518907e08549fbc20eea13dfe299d1e3bb17e5d683f0205f8eef11c2acff98ffa1760401"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "cdc_enc.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "6db7f0125813409640dc4278989c67fbad7106d238f20baa12c7cdd8012961215596ec959c6e8e4335ce6e4e5b5269a1d7ec0db8131052aa3adddeab480a5d60"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "cdc_ether.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "3736c531122140d30f72372efd0a2cc02ce761b36f1dd3b96781078dd9f27ccf0783c71864f198a344663115f4d4dea5911e15f1eb71b5cb1ded7943686f6281"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "cdc_ncm.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "2806a1a0ec2e32ad960e62a0999cf31c24e42df93c0d52ff4b4edb3f7ddae4ae764dab218a077926ccbada45ed698327fd4151f47afed6a0475fe5c9500b899d"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "DualBSD/GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "cls_basic.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "ca957610abdaccd910395ad72e102da1a302098ab7008d51ba11a3b72585b304508952f72a0a0e5ab559f082f9b054f1cfa129876a9e10526e9bcf2df0ef7cd5"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "cls_fw.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "deae48551f984de3eab53b2a3918d2d604ab82ee73e375cb748c0219d25c74b04710d0b2ac3c1ab730ae851548d2484837aac8c2c2ff6b49ee299c804845b621"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "fat.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "5658bed7b92d04d70d7498567e0de96ba437a8f7669eaebcdf2d6f897d44aefb427598413f6332107b24d58a4e8f59aa613a648beb9d00cd94d3527155854105"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "ip_tables.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "0d05dc648ca0b99f36bd096f0f56c2860a80533e57c5551056ad3fe752a9f98156584ce77069d11a9864f212dc43f58aa03da5298e56bd017121d155e0dfe8f5"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "ipt_masquerade.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "6d69ef8ccd20c635e80fd728ac54905de1df2c64e4d6a198f31be4203726128dc49223a2a2c1c7fb54ac5d433e3a7bce0a77c42545d5832cfc55dcc599ea8ab6"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "ipt_redirect.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "096a7c9b99b8bcb922b4fb2aa666ac798f058169c27efc7a1c9ca2e3ee644a1c1ade15b5bd73a2947fa6d7c87bb4467dcedaf13d100e68ae6a9befda7fd78f88"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "ipt_reject.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "0c4e505fbce2c3fa1817111c11c3901db652ac0bf6d4a7a2a5dcc925e23dc0af1edbf4b23cd7ae3eee8584202b191a9a3c94a826daaf272988c1ea399b28db48"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "ipt_trigger.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "74d144461fd2725a4c68d0ac4b03356cf8466deca023dc3da192482f95d6e506259bf41ecdcb2051227e3bd949886f71e8f902e16dd7aee61bd917df14198531"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "ipt_multiurl.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "5e8e8c441e3611d3bef4e83163f453799858b340d25d61b42175372c9fab6e57c114edddcf4e70257b1cca5aa43216686a012beebe2bc2c3d5f8e99695b061b9"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "iptable_filter.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "2b1107461ac45d44d03b72adeed0ae71bdde4ce57a389d2e52acb786fa1e701a301a7cd7c4a9a04f9f7605216ad5807fe9d557c5d7223815691a3c82358d35bb"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "iptable_nat.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "5a72a246b65dc4ecca97bc234b12c5f98bb58b43f8933ffa33bf2c81bfb275184d23ca5f9f5be61c2501556e03ee3d1dfbe3836ec035f89232e9997752472368"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "kernel_debug.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "707fbd611944d54be277c6abb2379f0dee9f22493545cbdc3d605a9eebf1132b12aa1ff61aadfef1e2bb022090949c519084a28448767a93fe81d00cd15f77ba"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "lg-vl600.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "8ef65259f08a27001c97d4ffb35aedda6808663304c9e2656a5dad006db917611dc0fc8172f3d9328f2079e08ac1086257f7afa1faa88ff45b6d453b0f00c0c9"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_conntrack.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "1b038ddcf30be7ebc1e72f95adf5bfb54e86e9ec4e6b872d02671ca03e30226544a035ea0ea279d81fbe0c0933645d22b85bf9d8ea8d96ea8a3e70c789ebf550"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_conntrack_ftp.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "0539db5ccaeeb6573d24ffd71d78f7db80d0ce955b35e6fd1c6c99552671c36140ba4a3794551107e96f1b78c41224ff7a1547a887344b4262a658cb5848df20"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_conntrack_h323.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "9726569db453dab7ced8108aeb31a1fa9b0073eafa520321682d9f8d1473111ec1eaa3a05c6211040df9a474a13da67fd30559d90c20c6bfdfc762b6c1b87741"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_conntrack_ipv4.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "86dbaf0aa9d3af8ed1d2593cff9295f83e20b5aa9d07f69a03f378a62785bb88a72a95b80ab9b73c59df13ae024533fdcadcd1ab75b4d79884fa1fecaff87343"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_conntrack_pptp.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "96e1dbf939f8ed73817a853c37705b90a2d6fff42997b267f783375f458122897b0c380b96c5b5bfe523244c926eda5cb4726a980cf90193d3313a65b1b9b1b8"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_conntrack_proto_gre.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "eacd61073e1fe69a7f8c517e110691d9d89b48c4f98cef76009ccc6c7175b4a0aab2bbf01a79d54ffe22d9054a3dfe2335415fb156b18785a13570ec69ee2400"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_conntrack_rtsp.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "389d87f7bdf47cb55a592101ce588c7c0cdc5fc929105be8d56bdbfba867e3b4a5fda736ee3b47f8cf5858b26266d0dba5c47c626738e187e154acc975dd20dd"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_conntrack_sip.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "136e6a40e8352c7a88fa37acbd082b48b6ec76bbfe409db28c17f475ac25d409ba4deef12925944e8c8f2286d5a1884e3a36644bcdbd0ded44a515ec6ff1f2dc"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_conntrack_tftp.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "289dccdd04385f1da18c3d20a40eae60c71ae31a7b935dcd505dfb3244a3a554c8925216f871679285597e8cbeb4db5710942b586082d842603c5ab8907ed0df"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_defrag_ipv4.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "79f38a2ead93b37228fd69a13cab138905a6f2041166818dc069f2be29582a76abf9b1c461471e1267bef4ff267ed443944fdbd34ffaae57202c589cf6f9fa1c"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_nat.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "cdfbab0376fc3e9eb0d033aa3184e75d510cebd53205e938f56265a6ab66171072be8abab42e6a71f02adab11ce6bfaff738700d589ca2a1b5c03504015a9a89"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_nat_ftp.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "07ff680374a1a830c44e57b26322e44903cd9f4cd1f113cb2f8ebaad475f5fe4a3f6ad520127f02ce4609fca9511b99f5ff15fb676c08506c25a297c8f73c0ea"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_nat_h323.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "e0e500efc776596da41b630102d00448f0c486cfbfbf92e4929637f96677725efcbd79aba8676939c5f57e0447440e897a79b38e8125f6e2684313c82cf1c34f"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_nat_pptp.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "2ae043d22a40a20ded2c568d7e5bb3d1a44779013268bb9b3257c14dc7ef33f30c72f46f57b1eea6ec0eaf44218466c637809fd35bf98634f7cf1aba9aa94240"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_nat_proto_gre.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "751fca79590650e2e768ed884e0033e3399ba1651e9c705c37e7270e82cbd7464e66263f6a5794d5bfb5d9418f3a066ec510dd79d9a028b7c6f5886d4326e9cf"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_nat_rtsp.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "94d0567ebaddc26ca455e7f995b57a8312571901b1c07a3c6df171a73fe8b95d32c057ad2c9f6fe4d97bc9d63cd13412fc6e82f2665118b0d0c8c296f73bc424"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_nat_sip.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "e0fe61e06931250cf464df2563990960f0aadd4d0e9a0e11e1807e53acb5971a4b8f021a6d7a735857f1f642359cf4652e2462ebb3ee433ca79663acd487e3fa"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nf_nat_tftp.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "fa2a6ac46607a0b3ecbc58c5ca6ac3061343b15bf85a006d18fa07e07aa270b6bf0a5e48b7458c78ec756d4af246c0ab951730d63aab246826cf89dcfbe03eb9"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nls_cp850.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "6bd73a893647091e62180ac60485c73d77dae54cca351db8aadb86f88ec2000b61c346183609e842301236bf44644d27ba0b5626ad33de838eb1529e0a854572"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "DualBSD/GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "nls_utf8.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "781ef94d57107922898316841d93c2aacc1eaddb1e9099efdc295381ee7f221c20939e74b2c1ffba0245ae314b9fdb3fcedcc9290c29cd6f751962882c5d8e38"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "DualBSD/GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "option.ko",
+        "version": "v0.7.2",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version v0.7.2",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "11b4e7170c04fe592630ec39b5493e850e469492f8f58131b32b6e7c6fda42a19355e1e67faec9b90afdb99cc1b20c9e83cbb75beae8a372a5a45207f2f34492"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "pppol2tp.ko",
+        "version": "V1.0",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version V1.0",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "d2956488023cddbfd7451540c4fa80d92eef01e1648d0a7c9850075aa5cc17c371ce63b718cfe8ad3eb7fb49fb01ca665a6378d71276dddccd8003f962429e57"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "pptp.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "ae9414d573d1a226184a70a21859f135fa20d9e21093ce6f6ba73b0b99b4452deca4eefb0cb91bd801bf7af63a5c0182fe9e719e4b5b0629beadff20990d9b28"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "qmi_wwan.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "442d182673edb0e067d19baf27a8b2efae7a4eb7466c847244c86d36a0d734b8153f91c86de080bcd364316b1b2f76212f60ad13fb1951227392126d2f88bc22"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "rndis_host.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "f6643756d2a81a17a9c2995245ba4404c65a22af2bc6704d492255b97cbeaa38f82fecbb02761fb2a3c87734726260739216fe2f6f45cebc856314a79b05b64d"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "sch_htb.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "593b987eaf44a4561164825861e66c65b0123b7ddd1c25f4c246e7df63a2003a492ca11a2e927e81f940f60326420c9ed53702e590e8232490d0e7fadffe1b5b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "sch_prio.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "d4405bb613ba4cc3d89023fdab005edc4c93094a6ced2ec82e5a4fc888a1d0786fbba65184a16b44156bdd78a53cdeaccf8ca6b38a22f2d7b5a75c4872803388"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "sch_sfq.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "d63592b52f47f54a27b2e3fa10a33577acd786173bd505cb1fdc330fd56c54146f9cf5a0e46ac4ae7d397a7b22eaf2ae0b66f26d9f302c0a47089c763b693d0b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "statistics.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "6dbd0c7fc020549f63e0dd79c5829f4395e06814bcfc0ca83a463e2d4f8f8e6ba71d1179845fd192a459a1c94201767929f638a9044ba081dfb3b9a7820b0c33"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "DualBSD/GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "tp_domain.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "bfd7849e0bde93007773c082a42b5eb0793c41ac5c5196d4f2723adbfc17ee3c432f3ce4588b29954d6ae5a3a94544f1300c1cea1885fa5275d64911036cd23b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "BSD"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "ts_kmp.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "c6a99a74c0fdcf29d439bee685636e038fd6a4bf66148e3923cd4c239516cd43e6de3279ed91baa5c65318e7bee9985cdccce1960f484575565fd9e61b95e508"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "usb-storage.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "2f67cbdb2d5f8a13e53c5d39d4305ee321dcc81a1b375b20bf47aa5be933dbd89246bd582858d996a1ff17d21df07c80bcacf47dbc29add430f2dd601b25183b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "usbnet.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "aface84d8448e0be017ffe926c630e37aa5d357e53fdddf8c2971ce36551849a17367682da52dd8a341c472becc38599327dfa47ac6805832843c37825c97b4d"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "usbserial.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "b812a87a003d8a7198990431c91dae6fe9837e77e3749c31488bed9c6946554f16aa6bbe93df09f701b14126850eb66281e5b4452b40dd7ce5646ce3e38cf790"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "vfat.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "55ca9dd378d23362cb53eda98291a05e905d1c171e628e35981cd8c8bbaaddb65a9b2e1e8318f232a612ee3918618967d80ea4dcaa9ae9680315cf4c724b24d5"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "wlan_warn.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "2f7308a0bb17975dd1387a6424d35ad1f95fa8bedc872c7dd2d2615922a5001963a0fbb871848ca77a086453c7a822e9849cbc7bb4a849c532da6e409e711250"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "x_tables.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "7f64775c7c0f6866b832261512f7f61017ed8ce0102b2338135cbbe15afc4d3d3bb550fe5bc24560d1bae28e42296b2b22640bd32f0cfddb484d2a803c4ec04b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "xt_mark.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "587a8462a4521273660bd5b62132590a11cc37dd99bf4e12cfa55b534f441b568d7e1ea043400e4baf621f1a11836c3f43df5f3b4d60ba3db91bd7bb0cfa2543"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "xt_tcpmss.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "f815d0b2fba38c9d852c7a33c6e993e0164ec4cd530d6c58bbbdb7dfb615b3f61518733b9c277db9801947241d8aa8b8475ca092c6aecb288e776622390bdfd7"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "xt_comment.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "33614b18b47aa6c98a57ac0967ac14185c520d096d98f686b5413c9bcf81aad64b51f43f2aa214c361a35a9052f89b16511139f8ef5fb311866b06f70094ae3b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "xt_conntrack.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "b532cd6f7c644ee2dbe18aaa1da0cf5746c6b0635376569e64a27d9de5997a3fef57658a778a8529617faaac5ea819aa59107cedef9e1238c1474c9e44a6dd2d"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "xt_iprange.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "514cd27abcf27902016f3bdc915350bb56eaaa4b8fde3f030140ddc780e6fc58d6d1282a9a45c5eb2bccaa7d00cb85fc23f2b92c02c2a1cf87f298df5682aa4d"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "xt_mac.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "2acf52bbe52e50fd42c6bebd657edcff2eebe77d72990528979ecb892e2ab032813eccd464f8c06113be6dc8edd7f99dfd3ed370a6e246a00267f54c0aecc87b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "xt_multiport.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "5dd5b17747009618206043ae4e93c779c2b991fe40738d6364923845615ebbdb6d53d4431dd40c0f8aa54ad555c907f778512a5bc0aa39f4de725e6c85639a47"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "xt_state.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "b13d59c5497784db7334eff1a5fd18b6e080579a06bad2d43f088c08343547766aee7d53832ec895c3e178de2899cc13df8eac71618768e1a63bef514aca1f69"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "xt_statistic.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "65f2344493f4865c54b5f38f0e3aad1098e4c12916c5703109050cd74e2d077413332383df38ba1bd293c4ce960f1c0fdb873ea9dd53709fa568ebab891c8980"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "xt_string.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "4cf2f07e4dc3a5ea44cd752b91b0a523a489c5cd62a07b84bea37cfcbff51c9ccb778a9df6acbc0e0875016358eea13cd928afddd7321d8ae51888ab98843c15"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "xt_tcpudp.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "90da6db3a45b650fa9574e42681a9253baecb44a27db343ccf1587ea4c0f4bab28ba8bc9f1e0fa5c1aa09e5c7a5cb741dddd0c9287c257146e7ab4ffd488c1e1"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "xt_time.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "a722887f4f69327a85cf21fe23b04c88a452c061357ec2d231ab0f72e8f414975a22d14a717e5c8d02630fb4011793bc531bf8a734058b69adcc26028e1a459a"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "adf.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "70ba1baab7036c22ac25c0b52889b8a7d08bedda2ee7caeab138302b7a022d093cbc8e23ea921996b42e549fca395a8c5ab17e619cd607afcb2449d0dff1a9ca"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "DualBSD/GPLlicense:Proprietary"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "ag7240_mod.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "643f66be7735001363507abf40cc922b9f1c9fd09c526e8bb1488bc90d479bbb9ebb5c74c337995372b77bb16c1f68905215fa80aa6afa97ab40c34b66be067f"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "DualBSD/GPLlicense:DualBSD/GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "art.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "19002db7d8a2c073a7699b9df400a1144a041978cabddd0d53be0d5c8abf440a8e608a77650e83024616c9e48fae1e08df71362403684b7a188807ddead4a41f"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "asf.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "301ea864868d8e2e430902dfabec98f9114b73079beb2e59a2304912001cd47df240afc4cd1b6bc14450942cfb1f35adf480359d5be100c37f078462375b571d"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "Proprietary"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "ath_dev.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "a34ebc5bf37ef4722517195b4d50a3133439f8ecf5cfd81804f3a8c38f715c49e612887f88b86e8ec244dd1e4395c5f065bf82a09a59db57fd663be5f1c200f4"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "Proprietary"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "ath_hal.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "86876d701db0fb353a70eb00692f08698b11323ac5bd1dbc41614e7b586f038fe6eb6aa4df5b6528615ab034030dafeb3977b181616cfb8281592dd08e967ef5"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "Proprietary"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "ath_pktlog.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "a74553010dba01cd5189337091e292714321a2596a4508a04fea83de82b8784d48d5b29eb65d0bc76281152503b8693b7f99307793a9e19610961762d5037e8e"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "NA"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "ath_rate_atheros.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "5566dade6f7e1af852c1b3183a7c9845b752d727827d0d1acb874d31782b59931441564a8d8ea872e5ac68361f201dfd5ae202983f5a62ec327c1b87b8d277e8"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "Proprietary"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "umac.ko",
+        "version": "NA",
+        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "c04bf5ab398053e27b037e3ce0e317f00bb33129c568b7db57c1fe4321411d59e631dad75684c702475ac7c71967c28ce5d5488cccbe3965ad7cb2f517e37a2b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "DualBSD/GPL"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:br_filter.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "07c954149b2719fd20caf667ac721bc44404b1ef125d7f6f18a863a415372f449b569f9f4e686164a82821eb34d96cd30ed3867b4df10f481eaa41fc0aefd827"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:cdc-acm.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "1c973ea9a44fcfa7c3583b4dbda3479cbe27362df200015f8dd0e455518907e08549fbc20eea13dfe299d1e3bb17e5d683f0205f8eef11c2acff98ffa1760401"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:cdc_enc.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "6db7f0125813409640dc4278989c67fbad7106d238f20baa12c7cdd8012961215596ec959c6e8e4335ce6e4e5b5269a1d7ec0db8131052aa3adddeab480a5d60"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:cdc_ether.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "3736c531122140d30f72372efd0a2cc02ce761b36f1dd3b96781078dd9f27ccf0783c71864f198a344663115f4d4dea5911e15f1eb71b5cb1ded7943686f6281"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:cdc_ncm.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "2806a1a0ec2e32ad960e62a0999cf31c24e42df93c0d52ff4b4edb3f7ddae4ae764dab218a077926ccbada45ed698327fd4151f47afed6a0475fe5c9500b899d"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:cls_basic.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "ca957610abdaccd910395ad72e102da1a302098ab7008d51ba11a3b72585b304508952f72a0a0e5ab559f082f9b054f1cfa129876a9e10526e9bcf2df0ef7cd5"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:cls_fw.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "deae48551f984de3eab53b2a3918d2d604ab82ee73e375cb748c0219d25c74b04710d0b2ac3c1ab730ae851548d2484837aac8c2c2ff6b49ee299c804845b621"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:fat.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "5658bed7b92d04d70d7498567e0de96ba437a8f7669eaebcdf2d6f897d44aefb427598413f6332107b24d58a4e8f59aa613a648beb9d00cd94d3527155854105"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:ip_tables.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "0d05dc648ca0b99f36bd096f0f56c2860a80533e57c5551056ad3fe752a9f98156584ce77069d11a9864f212dc43f58aa03da5298e56bd017121d155e0dfe8f5"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:ipt_masquerade.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "6d69ef8ccd20c635e80fd728ac54905de1df2c64e4d6a198f31be4203726128dc49223a2a2c1c7fb54ac5d433e3a7bce0a77c42545d5832cfc55dcc599ea8ab6"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:ipt_redirect.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "096a7c9b99b8bcb922b4fb2aa666ac798f058169c27efc7a1c9ca2e3ee644a1c1ade15b5bd73a2947fa6d7c87bb4467dcedaf13d100e68ae6a9befda7fd78f88"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:ipt_reject.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "0c4e505fbce2c3fa1817111c11c3901db652ac0bf6d4a7a2a5dcc925e23dc0af1edbf4b23cd7ae3eee8584202b191a9a3c94a826daaf272988c1ea399b28db48"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:ipt_trigger.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "74d144461fd2725a4c68d0ac4b03356cf8466deca023dc3da192482f95d6e506259bf41ecdcb2051227e3bd949886f71e8f902e16dd7aee61bd917df14198531"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:ipt_multiurl.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "5e8e8c441e3611d3bef4e83163f453799858b340d25d61b42175372c9fab6e57c114edddcf4e70257b1cca5aa43216686a012beebe2bc2c3d5f8e99695b061b9"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:iptable_filter.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "2b1107461ac45d44d03b72adeed0ae71bdde4ce57a389d2e52acb786fa1e701a301a7cd7c4a9a04f9f7605216ad5807fe9d557c5d7223815691a3c82358d35bb"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:iptable_nat.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "5a72a246b65dc4ecca97bc234b12c5f98bb58b43f8933ffa33bf2c81bfb275184d23ca5f9f5be61c2501556e03ee3d1dfbe3836ec035f89232e9997752472368"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:kernel_debug.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "707fbd611944d54be277c6abb2379f0dee9f22493545cbdc3d605a9eebf1132b12aa1ff61aadfef1e2bb022090949c519084a28448767a93fe81d00cd15f77ba"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:lg-vl600.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "8ef65259f08a27001c97d4ffb35aedda6808663304c9e2656a5dad006db917611dc0fc8172f3d9328f2079e08ac1086257f7afa1faa88ff45b6d453b0f00c0c9"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_conntrack.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "1b038ddcf30be7ebc1e72f95adf5bfb54e86e9ec4e6b872d02671ca03e30226544a035ea0ea279d81fbe0c0933645d22b85bf9d8ea8d96ea8a3e70c789ebf550"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_conntrack_ftp.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "0539db5ccaeeb6573d24ffd71d78f7db80d0ce955b35e6fd1c6c99552671c36140ba4a3794551107e96f1b78c41224ff7a1547a887344b4262a658cb5848df20"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_conntrack_h323.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "9726569db453dab7ced8108aeb31a1fa9b0073eafa520321682d9f8d1473111ec1eaa3a05c6211040df9a474a13da67fd30559d90c20c6bfdfc762b6c1b87741"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_conntrack_ipv4.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "86dbaf0aa9d3af8ed1d2593cff9295f83e20b5aa9d07f69a03f378a62785bb88a72a95b80ab9b73c59df13ae024533fdcadcd1ab75b4d79884fa1fecaff87343"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_conntrack_pptp.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "96e1dbf939f8ed73817a853c37705b90a2d6fff42997b267f783375f458122897b0c380b96c5b5bfe523244c926eda5cb4726a980cf90193d3313a65b1b9b1b8"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_conntrack_proto_gre.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "eacd61073e1fe69a7f8c517e110691d9d89b48c4f98cef76009ccc6c7175b4a0aab2bbf01a79d54ffe22d9054a3dfe2335415fb156b18785a13570ec69ee2400"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_conntrack_rtsp.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "389d87f7bdf47cb55a592101ce588c7c0cdc5fc929105be8d56bdbfba867e3b4a5fda736ee3b47f8cf5858b26266d0dba5c47c626738e187e154acc975dd20dd"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_conntrack_sip.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "136e6a40e8352c7a88fa37acbd082b48b6ec76bbfe409db28c17f475ac25d409ba4deef12925944e8c8f2286d5a1884e3a36644bcdbd0ded44a515ec6ff1f2dc"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_conntrack_tftp.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "289dccdd04385f1da18c3d20a40eae60c71ae31a7b935dcd505dfb3244a3a554c8925216f871679285597e8cbeb4db5710942b586082d842603c5ab8907ed0df"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_defrag_ipv4.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "79f38a2ead93b37228fd69a13cab138905a6f2041166818dc069f2be29582a76abf9b1c461471e1267bef4ff267ed443944fdbd34ffaae57202c589cf6f9fa1c"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_nat.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "cdfbab0376fc3e9eb0d033aa3184e75d510cebd53205e938f56265a6ab66171072be8abab42e6a71f02adab11ce6bfaff738700d589ca2a1b5c03504015a9a89"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_nat_ftp.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "07ff680374a1a830c44e57b26322e44903cd9f4cd1f113cb2f8ebaad475f5fe4a3f6ad520127f02ce4609fca9511b99f5ff15fb676c08506c25a297c8f73c0ea"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_nat_h323.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "e0e500efc776596da41b630102d00448f0c486cfbfbf92e4929637f96677725efcbd79aba8676939c5f57e0447440e897a79b38e8125f6e2684313c82cf1c34f"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_nat_pptp.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "2ae043d22a40a20ded2c568d7e5bb3d1a44779013268bb9b3257c14dc7ef33f30c72f46f57b1eea6ec0eaf44218466c637809fd35bf98634f7cf1aba9aa94240"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_nat_proto_gre.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "751fca79590650e2e768ed884e0033e3399ba1651e9c705c37e7270e82cbd7464e66263f6a5794d5bfb5d9418f3a066ec510dd79d9a028b7c6f5886d4326e9cf"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_nat_rtsp.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "94d0567ebaddc26ca455e7f995b57a8312571901b1c07a3c6df171a73fe8b95d32c057ad2c9f6fe4d97bc9d63cd13412fc6e82f2665118b0d0c8c296f73bc424"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_nat_sip.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "e0fe61e06931250cf464df2563990960f0aadd4d0e9a0e11e1807e53acb5971a4b8f021a6d7a735857f1f642359cf4652e2462ebb3ee433ca79663acd487e3fa"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nf_nat_tftp.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "fa2a6ac46607a0b3ecbc58c5ca6ac3061343b15bf85a006d18fa07e07aa270b6bf0a5e48b7458c78ec756d4af246c0ab951730d63aab246826cf89dcfbe03eb9"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nls_cp850.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "6bd73a893647091e62180ac60485c73d77dae54cca351db8aadb86f88ec2000b61c346183609e842301236bf44644d27ba0b5626ad33de838eb1529e0a854572"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:nls_utf8.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "781ef94d57107922898316841d93c2aacc1eaddb1e9099efdc295381ee7f221c20939e74b2c1ffba0245ae314b9fdb3fcedcc9290c29cd6f751962882c5d8e38"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:option.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "11b4e7170c04fe592630ec39b5493e850e469492f8f58131b32b6e7c6fda42a19355e1e67faec9b90afdb99cc1b20c9e83cbb75beae8a372a5a45207f2f34492"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:pppol2tp.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "d2956488023cddbfd7451540c4fa80d92eef01e1648d0a7c9850075aa5cc17c371ce63b718cfe8ad3eb7fb49fb01ca665a6378d71276dddccd8003f962429e57"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:pptp.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "ae9414d573d1a226184a70a21859f135fa20d9e21093ce6f6ba73b0b99b4452deca4eefb0cb91bd801bf7af63a5c0182fe9e719e4b5b0629beadff20990d9b28"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:qmi_wwan.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "442d182673edb0e067d19baf27a8b2efae7a4eb7466c847244c86d36a0d734b8153f91c86de080bcd364316b1b2f76212f60ad13fb1951227392126d2f88bc22"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:rndis_host.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "f6643756d2a81a17a9c2995245ba4404c65a22af2bc6704d492255b97cbeaa38f82fecbb02761fb2a3c87734726260739216fe2f6f45cebc856314a79b05b64d"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:sch_htb.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "593b987eaf44a4561164825861e66c65b0123b7ddd1c25f4c246e7df63a2003a492ca11a2e927e81f940f60326420c9ed53702e590e8232490d0e7fadffe1b5b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:sch_prio.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "d4405bb613ba4cc3d89023fdab005edc4c93094a6ced2ec82e5a4fc888a1d0786fbba65184a16b44156bdd78a53cdeaccf8ca6b38a22f2d7b5a75c4872803388"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:sch_sfq.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "d63592b52f47f54a27b2e3fa10a33577acd786173bd505cb1fdc330fd56c54146f9cf5a0e46ac4ae7d397a7b22eaf2ae0b66f26d9f302c0a47089c763b693d0b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:statistics.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "6dbd0c7fc020549f63e0dd79c5829f4395e06814bcfc0ca83a463e2d4f8f8e6ba71d1179845fd192a459a1c94201767929f638a9044ba081dfb3b9a7820b0c33"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:tp_domain.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "bfd7849e0bde93007773c082a42b5eb0793c41ac5c5196d4f2723adbfc17ee3c432f3ce4588b29954d6ae5a3a94544f1300c1cea1885fa5275d64911036cd23b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:ts_kmp.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "c6a99a74c0fdcf29d439bee685636e038fd6a4bf66148e3923cd4c239516cd43e6de3279ed91baa5c65318e7bee9985cdccce1960f484575565fd9e61b95e508"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:usb-storage.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "2f67cbdb2d5f8a13e53c5d39d4305ee321dcc81a1b375b20bf47aa5be933dbd89246bd582858d996a1ff17d21df07c80bcacf47dbc29add430f2dd601b25183b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:usbnet.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "aface84d8448e0be017ffe926c630e37aa5d357e53fdddf8c2971ce36551849a17367682da52dd8a341c472becc38599327dfa47ac6805832843c37825c97b4d"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:usbserial.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "b812a87a003d8a7198990431c91dae6fe9837e77e3749c31488bed9c6946554f16aa6bbe93df09f701b14126850eb66281e5b4452b40dd7ce5646ce3e38cf790"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:vfat.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "55ca9dd378d23362cb53eda98291a05e905d1c171e628e35981cd8c8bbaaddb65a9b2e1e8318f232a612ee3918618967d80ea4dcaa9ae9680315cf4c724b24d5"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:wlan_warn.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "2f7308a0bb17975dd1387a6424d35ad1f95fa8bedc872c7dd2d2615922a5001963a0fbb871848ca77a086453c7a822e9849cbc7bb4a849c532da6e409e711250"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:x_tables.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "7f64775c7c0f6866b832261512f7f61017ed8ce0102b2338135cbbe15afc4d3d3bb550fe5bc24560d1bae28e42296b2b22640bd32f0cfddb484d2a803c4ec04b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:xt_mark.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "587a8462a4521273660bd5b62132590a11cc37dd99bf4e12cfa55b534f441b568d7e1ea043400e4baf621f1a11836c3f43df5f3b4d60ba3db91bd7bb0cfa2543"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:xt_tcpmss.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "f815d0b2fba38c9d852c7a33c6e993e0164ec4cd530d6c58bbbdb7dfb615b3f61518733b9c277db9801947241d8aa8b8475ca092c6aecb288e776622390bdfd7"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:xt_comment.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "33614b18b47aa6c98a57ac0967ac14185c520d096d98f686b5413c9bcf81aad64b51f43f2aa214c361a35a9052f89b16511139f8ef5fb311866b06f70094ae3b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:xt_conntrack.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "b532cd6f7c644ee2dbe18aaa1da0cf5746c6b0635376569e64a27d9de5997a3fef57658a778a8529617faaac5ea819aa59107cedef9e1238c1474c9e44a6dd2d"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:xt_iprange.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "514cd27abcf27902016f3bdc915350bb56eaaa4b8fde3f030140ddc780e6fc58d6d1282a9a45c5eb2bccaa7d00cb85fc23f2b92c02c2a1cf87f298df5682aa4d"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:xt_mac.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "2acf52bbe52e50fd42c6bebd657edcff2eebe77d72990528979ecb892e2ab032813eccd464f8c06113be6dc8edd7f99dfd3ed370a6e246a00267f54c0aecc87b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:xt_multiport.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "5dd5b17747009618206043ae4e93c779c2b991fe40738d6364923845615ebbdb6d53d4431dd40c0f8aa54ad555c907f778512a5bc0aa39f4de725e6c85639a47"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:xt_state.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "b13d59c5497784db7334eff1a5fd18b6e080579a06bad2d43f088c08343547766aee7d53832ec895c3e178de2899cc13df8eac71618768e1a63bef514aca1f69"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:xt_statistic.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "65f2344493f4865c54b5f38f0e3aad1098e4c12916c5703109050cd74e2d077413332383df38ba1bd293c4ce960f1c0fdb873ea9dd53709fa568ebab891c8980"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:xt_string.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "4cf2f07e4dc3a5ea44cd752b91b0a523a489c5cd62a07b84bea37cfcbff51c9ccb778a9df6acbc0e0875016358eea13cd928afddd7321d8ae51888ab98843c15"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:xt_tcpudp.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "90da6db3a45b650fa9574e42681a9253baecb44a27db343ccf1587ea4c0f4bab28ba8bc9f1e0fa5c1aa09e5c7a5cb741dddd0c9287c257146e7ab4ffd488c1e1"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:xt_time.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "a722887f4f69327a85cf21fe23b04c88a452c061357ec2d231ab0f72e8f414975a22d14a717e5c8d02630fb4011793bc531bf8a734058b69adcc26028e1a459a"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:adf.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "70ba1baab7036c22ac25c0b52889b8a7d08bedda2ee7caeab138302b7a022d093cbc8e23ea921996b42e549fca395a8c5ab17e619cd607afcb2449d0dff1a9ca"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:ag7240_mod.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "643f66be7735001363507abf40cc922b9f1c9fd09c526e8bb1488bc90d479bbb9ebb5c74c337995372b77bb16c1f68905215fa80aa6afa97ab40c34b66be067f"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:art.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "19002db7d8a2c073a7699b9df400a1144a041978cabddd0d53be0d5c8abf440a8e608a77650e83024616c9e48fae1e08df71362403684b7a188807ddead4a41f"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:asf.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "301ea864868d8e2e430902dfabec98f9114b73079beb2e59a2304912001cd47df240afc4cd1b6bc14450942cfb1f35adf480359d5be100c37f078462375b571d"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:ath_dev.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "a34ebc5bf37ef4722517195b4d50a3133439f8ecf5cfd81804f3a8c38f715c49e612887f88b86e8ec244dd1e4395c5f065bf82a09a59db57fd663be5f1c200f4"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:ath_hal.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "86876d701db0fb353a70eb00692f08698b11323ac5bd1dbc41614e7b586f038fe6eb6aa4df5b6528615ab034030dafeb3977b181616cfb8281592dd08e967ef5"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:ath_pktlog.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "a74553010dba01cd5189337091e292714321a2596a4508a04fea83de82b8784d48d5b29eb65d0bc76281152503b8693b7f99307793a9e19610961762d5037e8e"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:ath_rate_atheros.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "5566dade6f7e1af852c1b3183a7c9845b752d727827d0d1acb874d31782b59931441564a8d8ea872e5ac68361f201dfd5ae202983f5a62ec327c1b87b8d277e8"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "linux_kernel:umac.ko",
+        "version": "linux_kernel:2.6.31:",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "c04bf5ab398053e27b037e3ce0e317f00bb33129c568b7db57c1fe4321411d59e631dad75684c702475ac7c71967c28ce5d5488cccbe3965ad7cb2f517e37a2b"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "Linux Kernel lzma.uncompressed.elf",
+        "version": "Linux version 2.6.31--LSDK-9.2.0.312 (jenkins@git-server) (gcc version 4.3.3 (GCC) ) #1 Tue Apr 8 08:53:54 CST 2014",
+        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version Linux version 2.6.31--LSDK-9.2.0.312 (jenkins@git-server) (gcc version 4.3.3 (GCC) ) #1 Tue Apr 8 08:53:54 CST 2014",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "6ef3d753ad34eda688568b5b56d55ace0b2b8036843099d7b23f3b42d8ca069d01d7eb46ac23834ed2f70463489fe6423c9a34487814b85168ebd74730f69811"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "busybox",
+        "version": "busybox:1.01",
+        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version BusyBox v1.01 (2014.04.08-00:56\u002B0000) multi-call binary",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "0aceb296155828842afa7baafe6b8676572f17f5b91935ea9a700609193942415a91b22a62e053aa1e4882e4e52e680e3cdf7c12a52212a96b02c20ede33cf3e"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "busybox",
+        "version": "busybox:1.01",
+        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version BusyBox v1.01 ",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "0aceb296155828842afa7baafe6b8676572f17f5b91935ea9a700609193942415a91b22a62e053aa1e4882e4e52e680e3cdf7c12a52212a96b02c20ede33cf3e"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "hostapd",
+        "version": "hostapd:0.5.9",
+        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version hostapd v0.5.9",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "122eeb2888ef5642344148426bc88f261e77112b86e3c4c8d538faa46a4ab1e5474c0a37243913342d1a8ad50e4e10fecb31ba1857bb165a377364e53bb400f0"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "iptables",
+        "version": "iptables:1.4.5",
+        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version 1.4.5",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "d084963e1ba9f0e075d05b8c8c3466319aa5a0ec76776f979412f75db88fef1271031ab8d0fac0be65ce38ff3e04e55df27126a3eb995a2bda39fe8b96a9e17f"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "wpa_supplicant",
+        "version": "wpa_supplicant:0.5.9",
+        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version wpa_supplicant v0.5.9",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "e232d8befdb754d8ee704418482cdb0ac902f8f3d6cd85444f576ffa38f932607a452662b233cfabf2a89ce57dc03d4050f712d1eec604a33263f18bddfc063d"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "BSD-3-Clause"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "zlib",
+        "version": "zlib:1.1.4",
+        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version inflate 1.1.4 Copyright 1995-2002 Mark Adler",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "6a2089038744f8551b291a3374b168e9bf982f1bc9100358ae44483fa991199220803fa5ca6a61616d4b7e69f95cd5468bc54cba45f6c1b5394638b910a80506"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "Zlib"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "bpalogin",
+        "version": "bpalogin:2.0.2",
+        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version BPALogin v2.0.2 - portable BigPond Broadband login client",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "332ed7a1dbd2960505cdd8baefa9738ca3120c47b19245a5dc23b3998c0b25c8f8ed4662119cb27a821081b7854ea12cac59be74e0b138e96b85826970cf9ddb"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "GPL-2.0-only"
+            }
+          }
+        ]
+      },
+      {
+        "type": "library",
+        "mime-type": "executable",
+        "supplier": {
+          "name": "unknown"
+        },
+        "name": "xl2tpd",
+        "version": "xl2tpd:1.1.12",
+        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version xl2tpd version xl2tpd-1.1.12 started",
+        "hashes": [
+          {
+            "alg": "SHA-512",
+            "content": "4d92fd128c5ec5ee56ce35d3efe40a50c8e30101fd849c8ba3a1cece44107617bec928d5fcd23327f9dc312ffb8f2303f20b6333fd9e7a46b40e6eb1090d4877"
+          }
+        ],
+        "licenses": [
+          {
+            "license": {
+              "name": "unknown"
+            }
+          }
+        ]
+      }
+    ]
+  }
\ No newline at end of file

From 2c6ccd84c66bcecc42fcd48b3f25e8ee2e44c8bd Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Mon, 21 Oct 2024 15:31:27 +0000
Subject: [PATCH 04/23] module name changed

---
 embark/dashboard/models.py         |   16 +-
 embark/porter/importer.py          |   42 +-
 embark/tracker/tables.py           |   13 +-
 embark/tracker/views.py            |    7 +-
 embark/uploader/boundedexecutor.py |    6 +-
 test/porter/f15_test.json          |  112 +
 test/porter/f21_cyclonedx.json     | 3710 ----------------------------
 7 files changed, 176 insertions(+), 3730 deletions(-)
 create mode 100644 test/porter/f15_test.json
 delete mode 100644 test/porter/f21_cyclonedx.json

diff --git a/embark/dashboard/models.py b/embark/dashboard/models.py
index 2c4b6862..b89a4957 100644
--- a/embark/dashboard/models.py
+++ b/embark/dashboard/models.py
@@ -16,12 +16,20 @@ class Vulnerability(models.Model):
     cve = models.CharField(max_length=18, validators=[MinLengthValidator(13)], help_text='CVE-XXXX-XXXXXXX')
     info = models.JSONField(null=True, editable=True)
 
-class SoftwareBillofMaterial(models.Model):
+
+class SoftwareInfo(models.Model):
     """
-    1-1 object for SBOM
+    Many-to-many object for SBOM
     """
     id = models.UUIDField(primary_key=True, default=uuid.uuid4)
-    data = models.JSONField(null=True)
+    name = models.CharField(verbose_name="software name", blank=False, editable=True, max_length=256)
+    version = models.CharField(verbose_name="software version", blank=False, editable=True, default="1.0", max_length=32)
+    hashes = models.JSONField(null=True, unique=True)
+    cpe = models.CharField(verbose_name="CPE identifier", blank=False, editable=True, max_length=256)
+    type = models.CharField(verbose_name="software type", blank=False, editable=True, default="data", max_length=50)
+    purl = models.CharField(verbose_name="PUrl identifier", blank=False, editable=True, max_length=256)
+    details = models.JSONField(null=True)
+
 
 class Result(models.Model):
     """
@@ -78,4 +86,4 @@ class Result(models.Model):
     system_bin = models.TextField(default='{}')
 
     vulnerability = models.ManyToManyField(Vulnerability, help_text='CVE/Vulnerability', related_query_name='CVE', editable=True, blank=True)
-    sbom = models.OneToOneField(SoftwareBillofMaterial, help_text='Software Bill of Material', related_query_name='sbom', editable=True, on_delete=models.CASCADE, null=True)
+    sbom = models.ManyToManyField(SoftwareInfo, help_text='Software Bill of Material', related_query_name='sbom', editable=True, null=True)
diff --git a/embark/porter/importer.py b/embark/porter/importer.py
index e65cf036..7b58ea08 100644
--- a/embark/porter/importer.py
+++ b/embark/porter/importer.py
@@ -14,7 +14,7 @@
 
 from django.conf import settings
 
-from dashboard.models import SoftwareBillofMaterial, Vulnerability, Result
+from dashboard.models import SoftwareInfo, Vulnerability, Result
 from uploader.models import FirmwareAnalysis
 
 logger = logging.getLogger(__name__)
@@ -47,10 +47,10 @@ def result_read_in(analysis_id):
         logger.debug("trying to read: %s", file_)
         if os.path.isfile(file_):      # TODO change check. > if valid EMBA json file
             logger.debug("File %s found and attempting to read", file_)
-            if file_.endswith('f21_cyclonedx_sbom_json.json'):
-                logger.info("f21 readin for %s skipped", analysis_id)
+            if file_.endswith('f15_cyclonedx_sbom.json'):
+                logger.info("f15 readin for %s skipped", analysis_id)
                 # f21_cyclonedx_sbom_json.json move into db object
-                res = f21_json(file_, analysis_id)
+                res = f15_json(file_, analysis_id)
         # TODO license info etc
     return res
 
@@ -203,27 +203,45 @@ def f10_csv(_file_path, _analysis_id):
     logger.debug("read f10 csv done")
 
 
-def f21_json(_file_path, _analysis_id):
+def f15_json(_file_path, _analysis_id):
     """
     return: result obj/ None
     SBOM json
     """
-    logger.debug("starting f21 json import")
+    logger.debug("starting f15 json import")
     res, _ = Result.objects.get_or_create(
         firmware_analysis=FirmwareAnalysis.objects.get(id=_analysis_id)
     )
-    with open(_file_path, 'r', encoding='utf-8') as f21_json_file:
-        f21_data = json.load(f21_json_file)
-        res.sbom = SoftwareBillofMaterial(data=f21_data)
-    logger.debug("read f21 json done")
+    with open(_file_path, 'r', encoding='utf-8') as f15_json_file:
+        f15_data = json.load(f15_json_file)
+        for component_ in f15_data.components:
+            try:
+                new_sbom, add_ = SoftwareInfo.objects.update_or_create(
+                    name=component_.name,
+                    version=component_.version,
+                    hashes=component_.hashes,
+                    cpe=component_.cpe,
+                    type=component_.type,
+                    purl=component_.purl,
+                    details=component_
+                )
+                logger.debug("Adding SBOM item: %s to res %s", new_sbom, res)
+                if add_:
+                    res.sbom.add(new_sbom)
+            except builtins.Exception as error_:
+                logger.error("Error in f15 readin: %s", error_)
+                logger.error("Component is %s ; Was new? %s", component_, add_)
+    logger.debug("read f15 json done")
+    return res
+
 
 if __name__ == "__main__":
     BASE_DIR = Path(__file__).resolve().parent.parent.parent
     TEST_DIR = os.path.join(BASE_DIR, 'test/porter')
 
     # test print f50
-    with open(os.path.join(TEST_DIR, 'f50_test.json'), 'w', encoding='utf-8') as json_file:
-        json_file.write(json.dumps(read_csv(os.path.join(TEST_DIR, 'f50_test.csv')), indent=4))
+    # with open(os.path.join(TEST_DIR, 'f50_test.json'), 'w', encoding='utf-8') as json_file:
+    #     json_file.write(json.dumps(read_csv(os.path.join(TEST_DIR, 'f50_test.csv')), indent=4))
 
     # with open(os.path.join(TEST_DIR, 'f20_test.json'), 'w', encoding='utf-8') as json_file:
     #     json_file.write(json.dumps(
diff --git a/embark/tracker/tables.py b/embark/tracker/tables.py
index ce9088f6..55dda9d8 100644
--- a/embark/tracker/tables.py
+++ b/embark/tracker/tables.py
@@ -7,6 +7,7 @@
 from django.utils.html import format_html
 from django.urls import reverse
 
+from dashboard.models import SoftwareInfo
 from uploader.models import Device
 
 
@@ -17,4 +18,14 @@ class Meta:
         orderable = True
 
     def render_id(self, value):
-        return format_html(f"<a href=\"{reverse(viewname='embark-tracker-device', args=[value])}\">{value}</a>")
+        return format_html(f"<a href=\"{reverse(viewname='embark-tracker-sbom', args=[value])}\">{value}</a>")
+
+
+class SimpleSBOMTable(tables.Table):
+
+    class Meta:
+        model = SoftwareInfo
+        orderable = True
+
+    #  def render_id(self, value):
+    #      return format_html(f"<a href=\"{reverse(viewname='embark-tracker-device', args=[value])}\">{value}</a>")
diff --git a/embark/tracker/views.py b/embark/tracker/views.py
index 318ad0ff..016b7175 100644
--- a/embark/tracker/views.py
+++ b/embark/tracker/views.py
@@ -15,10 +15,10 @@
 
 from django_tables2 import RequestConfig
 
-from dashboard.models import Result
+from dashboard.models import Result, SoftwareInfo
 from embark.helper import rnd_rgb_color, rnd_rgb_full
 from uploader.models import FirmwareAnalysis, Device, Vendor
-from tracker.tables import SimpleDeviceTable
+from tracker.tables import SimpleDeviceTable, SimpleSBOMTable
 from tracker.forms import AssociateForm, TimeForm
 
 logger = logging.getLogger(__name__)
@@ -118,6 +118,9 @@ def get_report_for_device(request, device_id):
             dataset['pointHoverBackgroundColor'] = '#fff'
             dataset['pointHoverBorderColor'] = rnd_rgb_color()
             data.append(dataset)
+        # sbom table
+        sbom_table = SimpleSBOMTable(data=result_queryset.sbom, template_name="django_tables2/bootstrap-responsive.html")
+        RequestConfig(request).configure(sbom_table)
         logger.debug("tracker/device data: %s", str(data))
         return render(request=request, template_name='tracker/device.html', context={'username': request.user.username, 'device_id': device_id, 'device': device, 'labels': label_list, 'data': data})
     logger.error("device id nonexistent: %s", device_id)
diff --git a/embark/uploader/boundedexecutor.py b/embark/uploader/boundedexecutor.py
index d80f0764..5011bea6 100644
--- a/embark/uploader/boundedexecutor.py
+++ b/embark/uploader/boundedexecutor.py
@@ -206,7 +206,11 @@ def submit_firmware(cls, firmware_flags, firmware_file):
         firmware_flags.status["firmware_name"] = firmware_flags.firmware_name
         firmware_flags.save(update_fields=["status", "path_to_logs"])
 
-        emba_cmd = f"{EMBA_SCRIPT_LOCATION} -p ./scan-profiles/default-scan-no-notify.emba -f {image_file_location} -l {emba_log_location} {emba_flags}"
+        if firmware_flags.sbom_only_test is True:
+            scan_profile = "./scan-profiles/sbom-default.emba"
+        else:
+            scan_profile = "./scan-profiles/default-scan-no-notify.emba"
+        emba_cmd = f"{EMBA_SCRIPT_LOCATION} -p {scan_profile} -f {image_file_location} -l {emba_log_location} {emba_flags}"
 
         # submit command to executor threadpool
         emba_fut = BoundedExecutor.submit(cls.run_emba_cmd, emba_cmd, firmware_flags.id, active_analyzer_dir)
diff --git a/test/porter/f15_test.json b/test/porter/f15_test.json
new file mode 100644
index 00000000..8c0812f0
--- /dev/null
+++ b/test/porter/f15_test.json
@@ -0,0 +1,112 @@
+{
+  "bomFormat": "CycloneDX",
+  "specVersion": "1.5",
+  "version": 1,
+  "components": [
+    {
+      "type": "library",
+      "mime-type": "executable",
+      "supplier": {
+        "name": "unknown"
+      },
+      "author": "debian adduser developers <adduser@packages.debian.org>",
+      "group": "debian_pkg_mgmt",
+      "name": "adduser",
+      "version": "3.134",
+      "description": "SBOM entry generated by EMBA - type debian_pkg_mgmt - originally identified version 3.134. Further description: add and remove users and groups",
+      "hashes": [
+        {
+          "alg": "MD5",
+          "content": "1d24993a8a9fe3440be96b4ec74430f3"
+        },
+        {
+          "alg": "SHA-256",
+          "content": "cd0134c0c4c2a72820d061c7cc49cc195b3b3db8f00748f1b0a5318e50c1e27e"
+        },
+        {
+          "alg": "SHA-512",
+          "content": "6981fd2f437182499e77d240e8861a7ce7733de5a23628c34bd5e10dc9f1d7f5480d50def54602f7fef0f4330892af0a77777668ed8d1b169a3fab5618af0491"
+        }
+      ],
+      "licenses": [
+        {
+          "license": {
+            "name": "NA"
+          }
+        }
+      ],
+      "cpe": "cpe:2.3:a:adduser:adduser:3.134:*:*:*:*:*:*",
+      "purl": "pkg:deb/debian/adduser@3.134?arch=all&distro=debian-12"
+    },
+	{
+      "type": "library",
+      "mime-type": "executable",
+      "supplier": {
+        "name": "unknown"
+      },
+      "author": "MAINT_TODO",
+      "group": "static_bin_analysis",
+      "name": "util-linux",
+      "version": "::util-linux:2.38.1",
+      "description": "SBOM entry generated by EMBA - type static_bin_analysis - originally identified version util-linux 2.38.1. Further description: DESC",
+      "hashes": [
+        {
+          "alg": "MD5",
+          "content": "155f12fbd8057230746185776df27d35"
+        },
+        {
+          "alg": "SHA-256",
+          "content": "506c60c97d893a3932877e003dcafa9acf5f24a48da2265aecbfad232ca6edcb"
+        },
+        {
+          "alg": "SHA-512",
+          "content": "f12e73a127196aeacaaed9be3d9973c4f9260b0ab56996cf15cb1cf55c697dd7571dea39608a7c432a1ef885009496158dfd3d3fc05d3e6bab643d4a85c2dfec"
+        }
+      ],
+      "licenses": [
+        {
+          "license": {
+            "name": "GPL-2.0-or-later"
+          }
+        }
+      ],
+      "cpe": "todo",
+      "purl": "NA"
+    },
+    {
+      "type": "library",
+      "mime-type": "executable",
+      "supplier": {
+        "name": "unknown"
+      },
+      "author": "maintainer unknown",
+      "group": "static_distri_analysis",
+      "name": "os-release",
+      "version": "debian:gnu/linux:12:(bookworm)",
+      "description": "SBOM entry generated by EMBA - type static_distri_analysis - originally identified version Debian GNU/Linux 12 (bookworm). Further description: Linux distribution identification module",
+      "hashes": [
+        {
+          "alg": "MD5",
+          "content": "07d31e7e63800ab1b7966980709c51eb"
+        },
+        {
+          "alg": "SHA-256",
+          "content": "59a77b5f2666d9c85c489bd1911a6eebbd91ef22fe48b90a3b75f1b21f3844d4"
+        },
+        {
+          "alg": "SHA-512",
+          "content": "8e22b62fb126f29c6ffab96acde5f5ae861e133c6e6737020c5d57f3fef74fceb93d813b093a7f95d31cdb4cf752dd5f1f1d9a7de34f2711cc436b6569608f03"
+        }
+      ],
+      "licenses": [
+        {
+          "license": {
+            "name": "NA"
+          }
+        }
+      ],
+      "cpe": "cpe:2.3:debian:gnu/linux:12:(bookworm):*:*:*:*:*:*",
+      "purl": "PURL"
+    }
+  ]
+}
diff --git a/test/porter/f21_cyclonedx.json b/test/porter/f21_cyclonedx.json
deleted file mode 100644
index bf329ea4..00000000
--- a/test/porter/f21_cyclonedx.json
+++ /dev/null
@@ -1,3710 +0,0 @@
-{
-    "bomFormat": "CycloneDX",
-    "specVersion": "1.5",
-    "version": 1,
-    "components": [
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "br_filter.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "07c954149b2719fd20caf667ac721bc44404b1ef125d7f6f18a863a415372f449b569f9f4e686164a82821eb34d96cd30ed3867b4df10f481eaa41fc0aefd827"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "cdc-acm.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "1c973ea9a44fcfa7c3583b4dbda3479cbe27362df200015f8dd0e455518907e08549fbc20eea13dfe299d1e3bb17e5d683f0205f8eef11c2acff98ffa1760401"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "cdc_enc.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "6db7f0125813409640dc4278989c67fbad7106d238f20baa12c7cdd8012961215596ec959c6e8e4335ce6e4e5b5269a1d7ec0db8131052aa3adddeab480a5d60"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "cdc_ether.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "3736c531122140d30f72372efd0a2cc02ce761b36f1dd3b96781078dd9f27ccf0783c71864f198a344663115f4d4dea5911e15f1eb71b5cb1ded7943686f6281"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "cdc_ncm.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "2806a1a0ec2e32ad960e62a0999cf31c24e42df93c0d52ff4b4edb3f7ddae4ae764dab218a077926ccbada45ed698327fd4151f47afed6a0475fe5c9500b899d"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "DualBSD/GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "cls_basic.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "ca957610abdaccd910395ad72e102da1a302098ab7008d51ba11a3b72585b304508952f72a0a0e5ab559f082f9b054f1cfa129876a9e10526e9bcf2df0ef7cd5"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "cls_fw.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "deae48551f984de3eab53b2a3918d2d604ab82ee73e375cb748c0219d25c74b04710d0b2ac3c1ab730ae851548d2484837aac8c2c2ff6b49ee299c804845b621"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "fat.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "5658bed7b92d04d70d7498567e0de96ba437a8f7669eaebcdf2d6f897d44aefb427598413f6332107b24d58a4e8f59aa613a648beb9d00cd94d3527155854105"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "ip_tables.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "0d05dc648ca0b99f36bd096f0f56c2860a80533e57c5551056ad3fe752a9f98156584ce77069d11a9864f212dc43f58aa03da5298e56bd017121d155e0dfe8f5"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "ipt_masquerade.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "6d69ef8ccd20c635e80fd728ac54905de1df2c64e4d6a198f31be4203726128dc49223a2a2c1c7fb54ac5d433e3a7bce0a77c42545d5832cfc55dcc599ea8ab6"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "ipt_redirect.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "096a7c9b99b8bcb922b4fb2aa666ac798f058169c27efc7a1c9ca2e3ee644a1c1ade15b5bd73a2947fa6d7c87bb4467dcedaf13d100e68ae6a9befda7fd78f88"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "ipt_reject.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "0c4e505fbce2c3fa1817111c11c3901db652ac0bf6d4a7a2a5dcc925e23dc0af1edbf4b23cd7ae3eee8584202b191a9a3c94a826daaf272988c1ea399b28db48"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "ipt_trigger.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "74d144461fd2725a4c68d0ac4b03356cf8466deca023dc3da192482f95d6e506259bf41ecdcb2051227e3bd949886f71e8f902e16dd7aee61bd917df14198531"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "ipt_multiurl.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "5e8e8c441e3611d3bef4e83163f453799858b340d25d61b42175372c9fab6e57c114edddcf4e70257b1cca5aa43216686a012beebe2bc2c3d5f8e99695b061b9"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "iptable_filter.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "2b1107461ac45d44d03b72adeed0ae71bdde4ce57a389d2e52acb786fa1e701a301a7cd7c4a9a04f9f7605216ad5807fe9d557c5d7223815691a3c82358d35bb"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "iptable_nat.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "5a72a246b65dc4ecca97bc234b12c5f98bb58b43f8933ffa33bf2c81bfb275184d23ca5f9f5be61c2501556e03ee3d1dfbe3836ec035f89232e9997752472368"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "kernel_debug.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "707fbd611944d54be277c6abb2379f0dee9f22493545cbdc3d605a9eebf1132b12aa1ff61aadfef1e2bb022090949c519084a28448767a93fe81d00cd15f77ba"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "lg-vl600.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "8ef65259f08a27001c97d4ffb35aedda6808663304c9e2656a5dad006db917611dc0fc8172f3d9328f2079e08ac1086257f7afa1faa88ff45b6d453b0f00c0c9"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_conntrack.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "1b038ddcf30be7ebc1e72f95adf5bfb54e86e9ec4e6b872d02671ca03e30226544a035ea0ea279d81fbe0c0933645d22b85bf9d8ea8d96ea8a3e70c789ebf550"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_conntrack_ftp.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "0539db5ccaeeb6573d24ffd71d78f7db80d0ce955b35e6fd1c6c99552671c36140ba4a3794551107e96f1b78c41224ff7a1547a887344b4262a658cb5848df20"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_conntrack_h323.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "9726569db453dab7ced8108aeb31a1fa9b0073eafa520321682d9f8d1473111ec1eaa3a05c6211040df9a474a13da67fd30559d90c20c6bfdfc762b6c1b87741"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_conntrack_ipv4.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "86dbaf0aa9d3af8ed1d2593cff9295f83e20b5aa9d07f69a03f378a62785bb88a72a95b80ab9b73c59df13ae024533fdcadcd1ab75b4d79884fa1fecaff87343"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_conntrack_pptp.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "96e1dbf939f8ed73817a853c37705b90a2d6fff42997b267f783375f458122897b0c380b96c5b5bfe523244c926eda5cb4726a980cf90193d3313a65b1b9b1b8"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_conntrack_proto_gre.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "eacd61073e1fe69a7f8c517e110691d9d89b48c4f98cef76009ccc6c7175b4a0aab2bbf01a79d54ffe22d9054a3dfe2335415fb156b18785a13570ec69ee2400"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_conntrack_rtsp.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "389d87f7bdf47cb55a592101ce588c7c0cdc5fc929105be8d56bdbfba867e3b4a5fda736ee3b47f8cf5858b26266d0dba5c47c626738e187e154acc975dd20dd"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_conntrack_sip.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "136e6a40e8352c7a88fa37acbd082b48b6ec76bbfe409db28c17f475ac25d409ba4deef12925944e8c8f2286d5a1884e3a36644bcdbd0ded44a515ec6ff1f2dc"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_conntrack_tftp.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "289dccdd04385f1da18c3d20a40eae60c71ae31a7b935dcd505dfb3244a3a554c8925216f871679285597e8cbeb4db5710942b586082d842603c5ab8907ed0df"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_defrag_ipv4.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "79f38a2ead93b37228fd69a13cab138905a6f2041166818dc069f2be29582a76abf9b1c461471e1267bef4ff267ed443944fdbd34ffaae57202c589cf6f9fa1c"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_nat.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "cdfbab0376fc3e9eb0d033aa3184e75d510cebd53205e938f56265a6ab66171072be8abab42e6a71f02adab11ce6bfaff738700d589ca2a1b5c03504015a9a89"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_nat_ftp.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "07ff680374a1a830c44e57b26322e44903cd9f4cd1f113cb2f8ebaad475f5fe4a3f6ad520127f02ce4609fca9511b99f5ff15fb676c08506c25a297c8f73c0ea"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_nat_h323.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "e0e500efc776596da41b630102d00448f0c486cfbfbf92e4929637f96677725efcbd79aba8676939c5f57e0447440e897a79b38e8125f6e2684313c82cf1c34f"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_nat_pptp.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "2ae043d22a40a20ded2c568d7e5bb3d1a44779013268bb9b3257c14dc7ef33f30c72f46f57b1eea6ec0eaf44218466c637809fd35bf98634f7cf1aba9aa94240"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_nat_proto_gre.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "751fca79590650e2e768ed884e0033e3399ba1651e9c705c37e7270e82cbd7464e66263f6a5794d5bfb5d9418f3a066ec510dd79d9a028b7c6f5886d4326e9cf"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_nat_rtsp.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "94d0567ebaddc26ca455e7f995b57a8312571901b1c07a3c6df171a73fe8b95d32c057ad2c9f6fe4d97bc9d63cd13412fc6e82f2665118b0d0c8c296f73bc424"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_nat_sip.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "e0fe61e06931250cf464df2563990960f0aadd4d0e9a0e11e1807e53acb5971a4b8f021a6d7a735857f1f642359cf4652e2462ebb3ee433ca79663acd487e3fa"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nf_nat_tftp.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "fa2a6ac46607a0b3ecbc58c5ca6ac3061343b15bf85a006d18fa07e07aa270b6bf0a5e48b7458c78ec756d4af246c0ab951730d63aab246826cf89dcfbe03eb9"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nls_cp850.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "6bd73a893647091e62180ac60485c73d77dae54cca351db8aadb86f88ec2000b61c346183609e842301236bf44644d27ba0b5626ad33de838eb1529e0a854572"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "DualBSD/GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "nls_utf8.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "781ef94d57107922898316841d93c2aacc1eaddb1e9099efdc295381ee7f221c20939e74b2c1ffba0245ae314b9fdb3fcedcc9290c29cd6f751962882c5d8e38"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "DualBSD/GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "option.ko",
-        "version": "v0.7.2",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version v0.7.2",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "11b4e7170c04fe592630ec39b5493e850e469492f8f58131b32b6e7c6fda42a19355e1e67faec9b90afdb99cc1b20c9e83cbb75beae8a372a5a45207f2f34492"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "pppol2tp.ko",
-        "version": "V1.0",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version V1.0",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "d2956488023cddbfd7451540c4fa80d92eef01e1648d0a7c9850075aa5cc17c371ce63b718cfe8ad3eb7fb49fb01ca665a6378d71276dddccd8003f962429e57"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "pptp.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "ae9414d573d1a226184a70a21859f135fa20d9e21093ce6f6ba73b0b99b4452deca4eefb0cb91bd801bf7af63a5c0182fe9e719e4b5b0629beadff20990d9b28"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "qmi_wwan.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "442d182673edb0e067d19baf27a8b2efae7a4eb7466c847244c86d36a0d734b8153f91c86de080bcd364316b1b2f76212f60ad13fb1951227392126d2f88bc22"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "rndis_host.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "f6643756d2a81a17a9c2995245ba4404c65a22af2bc6704d492255b97cbeaa38f82fecbb02761fb2a3c87734726260739216fe2f6f45cebc856314a79b05b64d"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "sch_htb.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "593b987eaf44a4561164825861e66c65b0123b7ddd1c25f4c246e7df63a2003a492ca11a2e927e81f940f60326420c9ed53702e590e8232490d0e7fadffe1b5b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "sch_prio.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "d4405bb613ba4cc3d89023fdab005edc4c93094a6ced2ec82e5a4fc888a1d0786fbba65184a16b44156bdd78a53cdeaccf8ca6b38a22f2d7b5a75c4872803388"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "sch_sfq.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "d63592b52f47f54a27b2e3fa10a33577acd786173bd505cb1fdc330fd56c54146f9cf5a0e46ac4ae7d397a7b22eaf2ae0b66f26d9f302c0a47089c763b693d0b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "statistics.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "6dbd0c7fc020549f63e0dd79c5829f4395e06814bcfc0ca83a463e2d4f8f8e6ba71d1179845fd192a459a1c94201767929f638a9044ba081dfb3b9a7820b0c33"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "DualBSD/GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "tp_domain.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "bfd7849e0bde93007773c082a42b5eb0793c41ac5c5196d4f2723adbfc17ee3c432f3ce4588b29954d6ae5a3a94544f1300c1cea1885fa5275d64911036cd23b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "BSD"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "ts_kmp.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "c6a99a74c0fdcf29d439bee685636e038fd6a4bf66148e3923cd4c239516cd43e6de3279ed91baa5c65318e7bee9985cdccce1960f484575565fd9e61b95e508"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "usb-storage.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "2f67cbdb2d5f8a13e53c5d39d4305ee321dcc81a1b375b20bf47aa5be933dbd89246bd582858d996a1ff17d21df07c80bcacf47dbc29add430f2dd601b25183b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "usbnet.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "aface84d8448e0be017ffe926c630e37aa5d357e53fdddf8c2971ce36551849a17367682da52dd8a341c472becc38599327dfa47ac6805832843c37825c97b4d"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "usbserial.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "b812a87a003d8a7198990431c91dae6fe9837e77e3749c31488bed9c6946554f16aa6bbe93df09f701b14126850eb66281e5b4452b40dd7ce5646ce3e38cf790"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "vfat.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "55ca9dd378d23362cb53eda98291a05e905d1c171e628e35981cd8c8bbaaddb65a9b2e1e8318f232a612ee3918618967d80ea4dcaa9ae9680315cf4c724b24d5"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "wlan_warn.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "2f7308a0bb17975dd1387a6424d35ad1f95fa8bedc872c7dd2d2615922a5001963a0fbb871848ca77a086453c7a822e9849cbc7bb4a849c532da6e409e711250"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "x_tables.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "7f64775c7c0f6866b832261512f7f61017ed8ce0102b2338135cbbe15afc4d3d3bb550fe5bc24560d1bae28e42296b2b22640bd32f0cfddb484d2a803c4ec04b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "xt_mark.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "587a8462a4521273660bd5b62132590a11cc37dd99bf4e12cfa55b534f441b568d7e1ea043400e4baf621f1a11836c3f43df5f3b4d60ba3db91bd7bb0cfa2543"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "xt_tcpmss.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "f815d0b2fba38c9d852c7a33c6e993e0164ec4cd530d6c58bbbdb7dfb615b3f61518733b9c277db9801947241d8aa8b8475ca092c6aecb288e776622390bdfd7"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "xt_comment.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "33614b18b47aa6c98a57ac0967ac14185c520d096d98f686b5413c9bcf81aad64b51f43f2aa214c361a35a9052f89b16511139f8ef5fb311866b06f70094ae3b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "xt_conntrack.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "b532cd6f7c644ee2dbe18aaa1da0cf5746c6b0635376569e64a27d9de5997a3fef57658a778a8529617faaac5ea819aa59107cedef9e1238c1474c9e44a6dd2d"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "xt_iprange.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "514cd27abcf27902016f3bdc915350bb56eaaa4b8fde3f030140ddc780e6fc58d6d1282a9a45c5eb2bccaa7d00cb85fc23f2b92c02c2a1cf87f298df5682aa4d"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "xt_mac.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "2acf52bbe52e50fd42c6bebd657edcff2eebe77d72990528979ecb892e2ab032813eccd464f8c06113be6dc8edd7f99dfd3ed370a6e246a00267f54c0aecc87b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "xt_multiport.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "5dd5b17747009618206043ae4e93c779c2b991fe40738d6364923845615ebbdb6d53d4431dd40c0f8aa54ad555c907f778512a5bc0aa39f4de725e6c85639a47"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "xt_state.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "b13d59c5497784db7334eff1a5fd18b6e080579a06bad2d43f088c08343547766aee7d53832ec895c3e178de2899cc13df8eac71618768e1a63bef514aca1f69"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "xt_statistic.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "65f2344493f4865c54b5f38f0e3aad1098e4c12916c5703109050cd74e2d077413332383df38ba1bd293c4ce960f1c0fdb873ea9dd53709fa568ebab891c8980"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "xt_string.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "4cf2f07e4dc3a5ea44cd752b91b0a523a489c5cd62a07b84bea37cfcbff51c9ccb778a9df6acbc0e0875016358eea13cd928afddd7321d8ae51888ab98843c15"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "xt_tcpudp.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "90da6db3a45b650fa9574e42681a9253baecb44a27db343ccf1587ea4c0f4bab28ba8bc9f1e0fa5c1aa09e5c7a5cb741dddd0c9287c257146e7ab4ffd488c1e1"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "xt_time.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "a722887f4f69327a85cf21fe23b04c88a452c061357ec2d231ab0f72e8f414975a22d14a717e5c8d02630fb4011793bc531bf8a734058b69adcc26028e1a459a"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "adf.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "70ba1baab7036c22ac25c0b52889b8a7d08bedda2ee7caeab138302b7a022d093cbc8e23ea921996b42e549fca395a8c5ab17e619cd607afcb2449d0dff1a9ca"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "DualBSD/GPLlicense:Proprietary"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "ag7240_mod.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "643f66be7735001363507abf40cc922b9f1c9fd09c526e8bb1488bc90d479bbb9ebb5c74c337995372b77bb16c1f68905215fa80aa6afa97ab40c34b66be067f"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "DualBSD/GPLlicense:DualBSD/GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "art.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "19002db7d8a2c073a7699b9df400a1144a041978cabddd0d53be0d5c8abf440a8e608a77650e83024616c9e48fae1e08df71362403684b7a188807ddead4a41f"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "asf.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "301ea864868d8e2e430902dfabec98f9114b73079beb2e59a2304912001cd47df240afc4cd1b6bc14450942cfb1f35adf480359d5be100c37f078462375b571d"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "Proprietary"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "ath_dev.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "a34ebc5bf37ef4722517195b4d50a3133439f8ecf5cfd81804f3a8c38f715c49e612887f88b86e8ec244dd1e4395c5f065bf82a09a59db57fd663be5f1c200f4"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "Proprietary"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "ath_hal.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "86876d701db0fb353a70eb00692f08698b11323ac5bd1dbc41614e7b586f038fe6eb6aa4df5b6528615ab034030dafeb3977b181616cfb8281592dd08e967ef5"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "Proprietary"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "ath_pktlog.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "a74553010dba01cd5189337091e292714321a2596a4508a04fea83de82b8784d48d5b29eb65d0bc76281152503b8693b7f99307793a9e19610961762d5037e8e"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "NA"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "ath_rate_atheros.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "5566dade6f7e1af852c1b3183a7c9845b752d727827d0d1acb874d31782b59931441564a8d8ea872e5ac68361f201dfd5ae202983f5a62ec327c1b87b8d277e8"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "Proprietary"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "umac.ko",
-        "version": "NA",
-        "description": "SBOM generated by EMBA - type kernel_module - originally identified version NA",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "c04bf5ab398053e27b037e3ce0e317f00bb33129c568b7db57c1fe4321411d59e631dad75684c702475ac7c71967c28ce5d5488cccbe3965ad7cb2f517e37a2b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "DualBSD/GPL"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:br_filter.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "07c954149b2719fd20caf667ac721bc44404b1ef125d7f6f18a863a415372f449b569f9f4e686164a82821eb34d96cd30ed3867b4df10f481eaa41fc0aefd827"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:cdc-acm.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "1c973ea9a44fcfa7c3583b4dbda3479cbe27362df200015f8dd0e455518907e08549fbc20eea13dfe299d1e3bb17e5d683f0205f8eef11c2acff98ffa1760401"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:cdc_enc.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "6db7f0125813409640dc4278989c67fbad7106d238f20baa12c7cdd8012961215596ec959c6e8e4335ce6e4e5b5269a1d7ec0db8131052aa3adddeab480a5d60"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:cdc_ether.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "3736c531122140d30f72372efd0a2cc02ce761b36f1dd3b96781078dd9f27ccf0783c71864f198a344663115f4d4dea5911e15f1eb71b5cb1ded7943686f6281"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:cdc_ncm.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "2806a1a0ec2e32ad960e62a0999cf31c24e42df93c0d52ff4b4edb3f7ddae4ae764dab218a077926ccbada45ed698327fd4151f47afed6a0475fe5c9500b899d"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:cls_basic.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "ca957610abdaccd910395ad72e102da1a302098ab7008d51ba11a3b72585b304508952f72a0a0e5ab559f082f9b054f1cfa129876a9e10526e9bcf2df0ef7cd5"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:cls_fw.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "deae48551f984de3eab53b2a3918d2d604ab82ee73e375cb748c0219d25c74b04710d0b2ac3c1ab730ae851548d2484837aac8c2c2ff6b49ee299c804845b621"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:fat.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "5658bed7b92d04d70d7498567e0de96ba437a8f7669eaebcdf2d6f897d44aefb427598413f6332107b24d58a4e8f59aa613a648beb9d00cd94d3527155854105"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:ip_tables.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "0d05dc648ca0b99f36bd096f0f56c2860a80533e57c5551056ad3fe752a9f98156584ce77069d11a9864f212dc43f58aa03da5298e56bd017121d155e0dfe8f5"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:ipt_masquerade.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "6d69ef8ccd20c635e80fd728ac54905de1df2c64e4d6a198f31be4203726128dc49223a2a2c1c7fb54ac5d433e3a7bce0a77c42545d5832cfc55dcc599ea8ab6"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:ipt_redirect.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "096a7c9b99b8bcb922b4fb2aa666ac798f058169c27efc7a1c9ca2e3ee644a1c1ade15b5bd73a2947fa6d7c87bb4467dcedaf13d100e68ae6a9befda7fd78f88"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:ipt_reject.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "0c4e505fbce2c3fa1817111c11c3901db652ac0bf6d4a7a2a5dcc925e23dc0af1edbf4b23cd7ae3eee8584202b191a9a3c94a826daaf272988c1ea399b28db48"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:ipt_trigger.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "74d144461fd2725a4c68d0ac4b03356cf8466deca023dc3da192482f95d6e506259bf41ecdcb2051227e3bd949886f71e8f902e16dd7aee61bd917df14198531"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:ipt_multiurl.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "5e8e8c441e3611d3bef4e83163f453799858b340d25d61b42175372c9fab6e57c114edddcf4e70257b1cca5aa43216686a012beebe2bc2c3d5f8e99695b061b9"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:iptable_filter.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "2b1107461ac45d44d03b72adeed0ae71bdde4ce57a389d2e52acb786fa1e701a301a7cd7c4a9a04f9f7605216ad5807fe9d557c5d7223815691a3c82358d35bb"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:iptable_nat.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "5a72a246b65dc4ecca97bc234b12c5f98bb58b43f8933ffa33bf2c81bfb275184d23ca5f9f5be61c2501556e03ee3d1dfbe3836ec035f89232e9997752472368"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:kernel_debug.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "707fbd611944d54be277c6abb2379f0dee9f22493545cbdc3d605a9eebf1132b12aa1ff61aadfef1e2bb022090949c519084a28448767a93fe81d00cd15f77ba"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:lg-vl600.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "8ef65259f08a27001c97d4ffb35aedda6808663304c9e2656a5dad006db917611dc0fc8172f3d9328f2079e08ac1086257f7afa1faa88ff45b6d453b0f00c0c9"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_conntrack.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "1b038ddcf30be7ebc1e72f95adf5bfb54e86e9ec4e6b872d02671ca03e30226544a035ea0ea279d81fbe0c0933645d22b85bf9d8ea8d96ea8a3e70c789ebf550"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_conntrack_ftp.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "0539db5ccaeeb6573d24ffd71d78f7db80d0ce955b35e6fd1c6c99552671c36140ba4a3794551107e96f1b78c41224ff7a1547a887344b4262a658cb5848df20"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_conntrack_h323.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "9726569db453dab7ced8108aeb31a1fa9b0073eafa520321682d9f8d1473111ec1eaa3a05c6211040df9a474a13da67fd30559d90c20c6bfdfc762b6c1b87741"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_conntrack_ipv4.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "86dbaf0aa9d3af8ed1d2593cff9295f83e20b5aa9d07f69a03f378a62785bb88a72a95b80ab9b73c59df13ae024533fdcadcd1ab75b4d79884fa1fecaff87343"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_conntrack_pptp.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "96e1dbf939f8ed73817a853c37705b90a2d6fff42997b267f783375f458122897b0c380b96c5b5bfe523244c926eda5cb4726a980cf90193d3313a65b1b9b1b8"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_conntrack_proto_gre.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "eacd61073e1fe69a7f8c517e110691d9d89b48c4f98cef76009ccc6c7175b4a0aab2bbf01a79d54ffe22d9054a3dfe2335415fb156b18785a13570ec69ee2400"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_conntrack_rtsp.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "389d87f7bdf47cb55a592101ce588c7c0cdc5fc929105be8d56bdbfba867e3b4a5fda736ee3b47f8cf5858b26266d0dba5c47c626738e187e154acc975dd20dd"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_conntrack_sip.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "136e6a40e8352c7a88fa37acbd082b48b6ec76bbfe409db28c17f475ac25d409ba4deef12925944e8c8f2286d5a1884e3a36644bcdbd0ded44a515ec6ff1f2dc"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_conntrack_tftp.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "289dccdd04385f1da18c3d20a40eae60c71ae31a7b935dcd505dfb3244a3a554c8925216f871679285597e8cbeb4db5710942b586082d842603c5ab8907ed0df"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_defrag_ipv4.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "79f38a2ead93b37228fd69a13cab138905a6f2041166818dc069f2be29582a76abf9b1c461471e1267bef4ff267ed443944fdbd34ffaae57202c589cf6f9fa1c"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_nat.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "cdfbab0376fc3e9eb0d033aa3184e75d510cebd53205e938f56265a6ab66171072be8abab42e6a71f02adab11ce6bfaff738700d589ca2a1b5c03504015a9a89"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_nat_ftp.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "07ff680374a1a830c44e57b26322e44903cd9f4cd1f113cb2f8ebaad475f5fe4a3f6ad520127f02ce4609fca9511b99f5ff15fb676c08506c25a297c8f73c0ea"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_nat_h323.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "e0e500efc776596da41b630102d00448f0c486cfbfbf92e4929637f96677725efcbd79aba8676939c5f57e0447440e897a79b38e8125f6e2684313c82cf1c34f"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_nat_pptp.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "2ae043d22a40a20ded2c568d7e5bb3d1a44779013268bb9b3257c14dc7ef33f30c72f46f57b1eea6ec0eaf44218466c637809fd35bf98634f7cf1aba9aa94240"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_nat_proto_gre.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "751fca79590650e2e768ed884e0033e3399ba1651e9c705c37e7270e82cbd7464e66263f6a5794d5bfb5d9418f3a066ec510dd79d9a028b7c6f5886d4326e9cf"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_nat_rtsp.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "94d0567ebaddc26ca455e7f995b57a8312571901b1c07a3c6df171a73fe8b95d32c057ad2c9f6fe4d97bc9d63cd13412fc6e82f2665118b0d0c8c296f73bc424"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_nat_sip.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "e0fe61e06931250cf464df2563990960f0aadd4d0e9a0e11e1807e53acb5971a4b8f021a6d7a735857f1f642359cf4652e2462ebb3ee433ca79663acd487e3fa"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nf_nat_tftp.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "fa2a6ac46607a0b3ecbc58c5ca6ac3061343b15bf85a006d18fa07e07aa270b6bf0a5e48b7458c78ec756d4af246c0ab951730d63aab246826cf89dcfbe03eb9"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nls_cp850.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "6bd73a893647091e62180ac60485c73d77dae54cca351db8aadb86f88ec2000b61c346183609e842301236bf44644d27ba0b5626ad33de838eb1529e0a854572"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:nls_utf8.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "781ef94d57107922898316841d93c2aacc1eaddb1e9099efdc295381ee7f221c20939e74b2c1ffba0245ae314b9fdb3fcedcc9290c29cd6f751962882c5d8e38"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:option.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "11b4e7170c04fe592630ec39b5493e850e469492f8f58131b32b6e7c6fda42a19355e1e67faec9b90afdb99cc1b20c9e83cbb75beae8a372a5a45207f2f34492"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:pppol2tp.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "d2956488023cddbfd7451540c4fa80d92eef01e1648d0a7c9850075aa5cc17c371ce63b718cfe8ad3eb7fb49fb01ca665a6378d71276dddccd8003f962429e57"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:pptp.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "ae9414d573d1a226184a70a21859f135fa20d9e21093ce6f6ba73b0b99b4452deca4eefb0cb91bd801bf7af63a5c0182fe9e719e4b5b0629beadff20990d9b28"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:qmi_wwan.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "442d182673edb0e067d19baf27a8b2efae7a4eb7466c847244c86d36a0d734b8153f91c86de080bcd364316b1b2f76212f60ad13fb1951227392126d2f88bc22"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:rndis_host.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "f6643756d2a81a17a9c2995245ba4404c65a22af2bc6704d492255b97cbeaa38f82fecbb02761fb2a3c87734726260739216fe2f6f45cebc856314a79b05b64d"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:sch_htb.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "593b987eaf44a4561164825861e66c65b0123b7ddd1c25f4c246e7df63a2003a492ca11a2e927e81f940f60326420c9ed53702e590e8232490d0e7fadffe1b5b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:sch_prio.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "d4405bb613ba4cc3d89023fdab005edc4c93094a6ced2ec82e5a4fc888a1d0786fbba65184a16b44156bdd78a53cdeaccf8ca6b38a22f2d7b5a75c4872803388"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:sch_sfq.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "d63592b52f47f54a27b2e3fa10a33577acd786173bd505cb1fdc330fd56c54146f9cf5a0e46ac4ae7d397a7b22eaf2ae0b66f26d9f302c0a47089c763b693d0b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:statistics.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "6dbd0c7fc020549f63e0dd79c5829f4395e06814bcfc0ca83a463e2d4f8f8e6ba71d1179845fd192a459a1c94201767929f638a9044ba081dfb3b9a7820b0c33"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:tp_domain.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "bfd7849e0bde93007773c082a42b5eb0793c41ac5c5196d4f2723adbfc17ee3c432f3ce4588b29954d6ae5a3a94544f1300c1cea1885fa5275d64911036cd23b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:ts_kmp.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "c6a99a74c0fdcf29d439bee685636e038fd6a4bf66148e3923cd4c239516cd43e6de3279ed91baa5c65318e7bee9985cdccce1960f484575565fd9e61b95e508"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:usb-storage.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "2f67cbdb2d5f8a13e53c5d39d4305ee321dcc81a1b375b20bf47aa5be933dbd89246bd582858d996a1ff17d21df07c80bcacf47dbc29add430f2dd601b25183b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:usbnet.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "aface84d8448e0be017ffe926c630e37aa5d357e53fdddf8c2971ce36551849a17367682da52dd8a341c472becc38599327dfa47ac6805832843c37825c97b4d"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:usbserial.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "b812a87a003d8a7198990431c91dae6fe9837e77e3749c31488bed9c6946554f16aa6bbe93df09f701b14126850eb66281e5b4452b40dd7ce5646ce3e38cf790"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:vfat.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "55ca9dd378d23362cb53eda98291a05e905d1c171e628e35981cd8c8bbaaddb65a9b2e1e8318f232a612ee3918618967d80ea4dcaa9ae9680315cf4c724b24d5"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:wlan_warn.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "2f7308a0bb17975dd1387a6424d35ad1f95fa8bedc872c7dd2d2615922a5001963a0fbb871848ca77a086453c7a822e9849cbc7bb4a849c532da6e409e711250"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:x_tables.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "7f64775c7c0f6866b832261512f7f61017ed8ce0102b2338135cbbe15afc4d3d3bb550fe5bc24560d1bae28e42296b2b22640bd32f0cfddb484d2a803c4ec04b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:xt_mark.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "587a8462a4521273660bd5b62132590a11cc37dd99bf4e12cfa55b534f441b568d7e1ea043400e4baf621f1a11836c3f43df5f3b4d60ba3db91bd7bb0cfa2543"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:xt_tcpmss.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "f815d0b2fba38c9d852c7a33c6e993e0164ec4cd530d6c58bbbdb7dfb615b3f61518733b9c277db9801947241d8aa8b8475ca092c6aecb288e776622390bdfd7"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:xt_comment.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "33614b18b47aa6c98a57ac0967ac14185c520d096d98f686b5413c9bcf81aad64b51f43f2aa214c361a35a9052f89b16511139f8ef5fb311866b06f70094ae3b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:xt_conntrack.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "b532cd6f7c644ee2dbe18aaa1da0cf5746c6b0635376569e64a27d9de5997a3fef57658a778a8529617faaac5ea819aa59107cedef9e1238c1474c9e44a6dd2d"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:xt_iprange.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "514cd27abcf27902016f3bdc915350bb56eaaa4b8fde3f030140ddc780e6fc58d6d1282a9a45c5eb2bccaa7d00cb85fc23f2b92c02c2a1cf87f298df5682aa4d"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:xt_mac.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "2acf52bbe52e50fd42c6bebd657edcff2eebe77d72990528979ecb892e2ab032813eccd464f8c06113be6dc8edd7f99dfd3ed370a6e246a00267f54c0aecc87b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:xt_multiport.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "5dd5b17747009618206043ae4e93c779c2b991fe40738d6364923845615ebbdb6d53d4431dd40c0f8aa54ad555c907f778512a5bc0aa39f4de725e6c85639a47"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:xt_state.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "b13d59c5497784db7334eff1a5fd18b6e080579a06bad2d43f088c08343547766aee7d53832ec895c3e178de2899cc13df8eac71618768e1a63bef514aca1f69"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:xt_statistic.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "65f2344493f4865c54b5f38f0e3aad1098e4c12916c5703109050cd74e2d077413332383df38ba1bd293c4ce960f1c0fdb873ea9dd53709fa568ebab891c8980"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:xt_string.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "4cf2f07e4dc3a5ea44cd752b91b0a523a489c5cd62a07b84bea37cfcbff51c9ccb778a9df6acbc0e0875016358eea13cd928afddd7321d8ae51888ab98843c15"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:xt_tcpudp.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "90da6db3a45b650fa9574e42681a9253baecb44a27db343ccf1587ea4c0f4bab28ba8bc9f1e0fa5c1aa09e5c7a5cb741dddd0c9287c257146e7ab4ffd488c1e1"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:xt_time.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "a722887f4f69327a85cf21fe23b04c88a452c061357ec2d231ab0f72e8f414975a22d14a717e5c8d02630fb4011793bc531bf8a734058b69adcc26028e1a459a"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:adf.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "70ba1baab7036c22ac25c0b52889b8a7d08bedda2ee7caeab138302b7a022d093cbc8e23ea921996b42e549fca395a8c5ab17e619cd607afcb2449d0dff1a9ca"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:ag7240_mod.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "643f66be7735001363507abf40cc922b9f1c9fd09c526e8bb1488bc90d479bbb9ebb5c74c337995372b77bb16c1f68905215fa80aa6afa97ab40c34b66be067f"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:art.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "19002db7d8a2c073a7699b9df400a1144a041978cabddd0d53be0d5c8abf440a8e608a77650e83024616c9e48fae1e08df71362403684b7a188807ddead4a41f"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:asf.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "301ea864868d8e2e430902dfabec98f9114b73079beb2e59a2304912001cd47df240afc4cd1b6bc14450942cfb1f35adf480359d5be100c37f078462375b571d"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:ath_dev.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "a34ebc5bf37ef4722517195b4d50a3133439f8ecf5cfd81804f3a8c38f715c49e612887f88b86e8ec244dd1e4395c5f065bf82a09a59db57fd663be5f1c200f4"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:ath_hal.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "86876d701db0fb353a70eb00692f08698b11323ac5bd1dbc41614e7b586f038fe6eb6aa4df5b6528615ab034030dafeb3977b181616cfb8281592dd08e967ef5"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:ath_pktlog.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "a74553010dba01cd5189337091e292714321a2596a4508a04fea83de82b8784d48d5b29eb65d0bc76281152503b8693b7f99307793a9e19610961762d5037e8e"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:ath_rate_atheros.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "5566dade6f7e1af852c1b3183a7c9845b752d727827d0d1acb874d31782b59931441564a8d8ea872e5ac68361f201dfd5ae202983f5a62ec327c1b87b8d277e8"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "linux_kernel:umac.ko",
-        "version": "linux_kernel:2.6.31:",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version 2.6.31--lsdk-9.2.0.312",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "c04bf5ab398053e27b037e3ce0e317f00bb33129c568b7db57c1fe4321411d59e631dad75684c702475ac7c71967c28ce5d5488cccbe3965ad7cb2f517e37a2b"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "Linux Kernel lzma.uncompressed.elf",
-        "version": "Linux version 2.6.31--LSDK-9.2.0.312 (jenkins@git-server) (gcc version 4.3.3 (GCC) ) #1 Tue Apr 8 08:53:54 CST 2014",
-        "description": "SBOM generated by EMBA - type linux_kernel - originally identified version Linux version 2.6.31--LSDK-9.2.0.312 (jenkins@git-server) (gcc version 4.3.3 (GCC) ) #1 Tue Apr 8 08:53:54 CST 2014",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "6ef3d753ad34eda688568b5b56d55ace0b2b8036843099d7b23f3b42d8ca069d01d7eb46ac23834ed2f70463489fe6423c9a34487814b85168ebd74730f69811"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "busybox",
-        "version": "busybox:1.01",
-        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version BusyBox v1.01 (2014.04.08-00:56\u002B0000) multi-call binary",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "0aceb296155828842afa7baafe6b8676572f17f5b91935ea9a700609193942415a91b22a62e053aa1e4882e4e52e680e3cdf7c12a52212a96b02c20ede33cf3e"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "busybox",
-        "version": "busybox:1.01",
-        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version BusyBox v1.01 ",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "0aceb296155828842afa7baafe6b8676572f17f5b91935ea9a700609193942415a91b22a62e053aa1e4882e4e52e680e3cdf7c12a52212a96b02c20ede33cf3e"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "hostapd",
-        "version": "hostapd:0.5.9",
-        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version hostapd v0.5.9",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "122eeb2888ef5642344148426bc88f261e77112b86e3c4c8d538faa46a4ab1e5474c0a37243913342d1a8ad50e4e10fecb31ba1857bb165a377364e53bb400f0"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "iptables",
-        "version": "iptables:1.4.5",
-        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version 1.4.5",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "d084963e1ba9f0e075d05b8c8c3466319aa5a0ec76776f979412f75db88fef1271031ab8d0fac0be65ce38ff3e04e55df27126a3eb995a2bda39fe8b96a9e17f"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "wpa_supplicant",
-        "version": "wpa_supplicant:0.5.9",
-        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version wpa_supplicant v0.5.9",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "e232d8befdb754d8ee704418482cdb0ac902f8f3d6cd85444f576ffa38f932607a452662b233cfabf2a89ce57dc03d4050f712d1eec604a33263f18bddfc063d"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "BSD-3-Clause"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "zlib",
-        "version": "zlib:1.1.4",
-        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version inflate 1.1.4 Copyright 1995-2002 Mark Adler",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "6a2089038744f8551b291a3374b168e9bf982f1bc9100358ae44483fa991199220803fa5ca6a61616d4b7e69f95cd5468bc54cba45f6c1b5394638b910a80506"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "Zlib"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "bpalogin",
-        "version": "bpalogin:2.0.2",
-        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version BPALogin v2.0.2 - portable BigPond Broadband login client",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "332ed7a1dbd2960505cdd8baefa9738ca3120c47b19245a5dc23b3998c0b25c8f8ed4662119cb27a821081b7854ea12cac59be74e0b138e96b85826970cf9ddb"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "GPL-2.0-only"
-            }
-          }
-        ]
-      },
-      {
-        "type": "library",
-        "mime-type": "executable",
-        "supplier": {
-          "name": "unknown"
-        },
-        "name": "xl2tpd",
-        "version": "xl2tpd:1.1.12",
-        "description": "SBOM generated by EMBA - type static_bin_analysis - originally identified version xl2tpd version xl2tpd-1.1.12 started",
-        "hashes": [
-          {
-            "alg": "SHA-512",
-            "content": "4d92fd128c5ec5ee56ce35d3efe40a50c8e30101fd849c8ba3a1cece44107617bec928d5fcd23327f9dc312ffb8f2303f20b6333fd9e7a46b40e6eb1090d4877"
-          }
-        ],
-        "licenses": [
-          {
-            "license": {
-              "name": "unknown"
-            }
-          }
-        ]
-      }
-    ]
-  }
\ No newline at end of file

From 65097357d9f18b0aa08c1740e4b42642d395c30e Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Thu, 24 Oct 2024 12:39:56 +0000
Subject: [PATCH 05/23] user activation

---
 embark/embark/settings/deploy.py          |  7 +-
 embark/embark/settings/dev.py             |  3 +
 embark/embark/urls.py                     |  4 +-
 embark/templates/user/activate.html       |  5 ++
 embark/templates/user/email_template.html |  8 ++
 embark/users/forms.py                     | 14 ++++
 embark/users/models.py                    |  7 +-
 embark/users/urls.py                      |  1 +
 embark/users/views.py                     | 93 ++++++++++++++++++-----
 installer.sh                              |  6 +-
 10 files changed, 113 insertions(+), 35 deletions(-)
 create mode 100644 embark/templates/user/activate.html
 create mode 100644 embark/templates/user/email_template.html
 create mode 100644 embark/users/forms.py

diff --git a/embark/embark/settings/deploy.py b/embark/embark/settings/deploy.py
index b250efa5..04c47d6c 100644
--- a/embark/embark/settings/deploy.py
+++ b/embark/embark/settings/deploy.py
@@ -23,10 +23,6 @@
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
 
-# HASHID_FIELD_SALT = os.environ.get('HASHID_SALT')
-# HASHID_FIELD_MIN_LENGTH = os.environ.get('HASHID_FIELD_MIN_LENGTH', 7)
-# HASHID_FIELD_ENABLE_HASHID_OBJECT = os.environ.get('HASHID_FIELD_ENABLE_HASHID_OBJECT', False)
-# HASHID_FIELD_ENABLE_DESCRIPTOR = os.environ.get('HASHID_FIELD_ENABLE_DESCRIPTOR', False)
 SECRET_KEY = os.environ.get('SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
@@ -34,6 +30,9 @@
 
 ALLOWED_HOSTS = ['*']
 
+DOMAIN = "embark.local"
+EMAIL_ACTIVE = False
+
 # EMBA stuff
 # EMBA location
 EMBA_ROOT = os.path.join(BASE_DIR.parent, 'emba')
diff --git a/embark/embark/settings/dev.py b/embark/embark/settings/dev.py
index 3ccdad54..beb66775 100644
--- a/embark/embark/settings/dev.py
+++ b/embark/embark/settings/dev.py
@@ -21,6 +21,9 @@
 EMBA_LOG_URL = 'emba_logs/'
 
 DEBUG = True
+DOMAIN = "embark.local"
+EMAIL_ACTIVE = False
+
 
 INSTALLED_APPS = [
     'django.contrib.admin',
diff --git a/embark/embark/urls.py b/embark/embark/urls.py
index 4004ea17..c0cda493 100644
--- a/embark/embark/urls.py
+++ b/embark/embark/urls.py
@@ -17,12 +17,12 @@
 __author__ = 'm-1-k-3, RaviChandra, Garima Chauhan, Maximilian Wagner, diegiesskanne'
 __license__ = 'MIT'
 
-# from django.contrib import admin
+from django.contrib import admin
 from django.urls import path, include
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
 urlpatterns = [
-    # path('admin/', admin.site.urls),
+    path('admin/', admin.site.urls),
     path('', include('updater.urls')),
     path('', include('uploader.urls')),
     path('', include('users.urls')),
diff --git a/embark/templates/user/activate.html b/embark/templates/user/activate.html
new file mode 100644
index 00000000..e48695f8
--- /dev/null
+++ b/embark/templates/user/activate.html
@@ -0,0 +1,5 @@
+{% csrf_token %}
+{% for field in form %}
+<label >{{ field.label_tag }}</label>
+{{ field }}
+{% endfor %}
\ No newline at end of file
diff --git a/embark/templates/user/email_template.html b/embark/templates/user/email_template.html
new file mode 100644
index 00000000..e3e99f33
--- /dev/null
+++ b/embark/templates/user/email_template.html
@@ -0,0 +1,8 @@
+{% autoescape off %}
+Dear {{ username }},
+
+Please follow the link to confirm your registration,
+http://{{ domain }}{% url 'activate' user_id=uid activation_token=token %}
+
+OR manually input the following token: {{ token }}
+{% endautoescape %}
\ No newline at end of file
diff --git a/embark/users/forms.py b/embark/users/forms.py
new file mode 100644
index 00000000..0f3691da
--- /dev/null
+++ b/embark/users/forms.py
@@ -0,0 +1,14 @@
+from django import forms
+from django.contrib.auth.forms import UserCreationForm
+from users.models import User
+
+
+class SignupForm(UserCreationForm):
+    class Meta:
+        model = User
+        fields = ('username', 'email', 'password1', 'password2')
+
+
+class ActivationForm(forms.Form):
+
+    token = forms.CharField(max_length=256, min_length=256)
diff --git a/embark/users/models.py b/embark/users/models.py
index 40a3c0ad..0a701f8a 100644
--- a/embark/users/models.py
+++ b/embark/users/models.py
@@ -5,7 +5,7 @@
 import enum
 
 from django.db import models
-from django.contrib.auth.models import AbstractUser
+from django.contrib.auth.models import User as DjangoUser
 from django.conf import settings
 
 from lib.choice_enum import ChoiceIntEnum
@@ -26,10 +26,7 @@ class Team(models.Model):
     modified = models.DateTimeField(auto_now=True, help_text='Date time when this entry was modified')
 
 
-class User(AbstractUser):
-    is_active = models.BooleanField(default=True, help_text='User active or not')
-    created = models.DateTimeField(auto_now_add=True, help_text='Date time when this entry was created')
-    modified = models.DateTimeField(auto_now=True, help_text='Date time when this entry was modified')
+class User(DjangoUser):
     timezone = models.CharField(max_length=32, choices=settings.TIMEZONES, default='UTC')
 
 
diff --git a/embark/users/urls.py b/embark/users/urls.py
index 39f8332f..a1011cb6 100644
--- a/embark/users/urls.py
+++ b/embark/users/urls.py
@@ -12,6 +12,7 @@
     path(settings.LOGIN_URL, views.embark_login, name='embark-login'),
     path('user/', views.user_main, name='embark-user-main'),
     path('register/', views.register, name='embark-register'),
+    path('register/activate/<uuid:user_id>/', views.register, name='embark-activate-user'),
     path('logout/', views.embark_logout, name='embark-logout'),
     path('user/password_change/', views.password_change, name='embark-password-change'),
     path('user/acc_delete/', views.acc_delete, name='embark-acc-delete'),
diff --git a/embark/users/views.py b/embark/users/views.py
index 0957fbb1..1b03c81e 100644
--- a/embark/users/views.py
+++ b/embark/users/views.py
@@ -7,15 +7,20 @@
 import logging
 
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth import authenticate, login, logout, get_user
+from django.contrib.auth.tokens import default_token_generator
+from django.contrib.sites.shortcuts import get_current_site
+from django.contrib import messages
 from django.shortcuts import render, redirect
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
-
-from django.contrib.auth import authenticate, login, logout, get_user
-from django.contrib import messages
+from django.template.loader import render_to_string
 from django.conf import settings
 from django.utils import timezone
+from django.urls import reverse
+from django.core.mail import send_mail
 
+from users.forms import ActivationForm, SignupForm
 from users.models import User
 
 logger = logging.getLogger(__name__)
@@ -32,29 +37,38 @@ def user_main(request):
 def register(request):
     if request.method == "POST":
         logger.debug(request.POST)
-        data = {k: v[0] for k, v in dict(request.POST).items()}
-        logger.debug(data)
         try:
-            body = {k: v[0] for k, v in dict(request.POST).items()}
-            try:
-                username = body['username']
-                password = body['password']
-                confirm_password = body['confirm_password']
-                if password != confirm_password:
-                    logger.debug('Passwords do not match')
-                    messages.success(request, 'Passwords do not match.')
-                    return render(request, 'user/register.html')
+            user = get_user(request)
+            signup_form = SignupForm(request.POST)
+            if signup_form.is_valid():
+                username = signup_form.cleaned_data.get('username')
+                password = signup_form.cleaned_data.get('password')
+                email = signup_form.cleaned_data.get('email')
                 logger.debug('Passwords match. Creating user')
-                user = User.objects.create(username=username)
+                user = User.objects.create(username=username, email=email)
                 user.set_password(password)
+                user.is_active = False
                 user.save()
                 logger.debug('User created')
-                messages.success(request, 'Registration successful.')
-                return redirect('../../')
-            except KeyError:
-                logger.exception('Missing keys from data- Username, password, password_confirm')
-                messages.error(request, 'User data is missing/invalid.')
-                return render(request, 'user/register.html')
+                # TODO create email + token
+                token = default_token_generator.make_token(user)
+                current_site = get_current_site(request)
+                mail_subject = 'Activate your EMBArk account.'
+                message = render_to_string('email_template.html', context={
+                    'user': user,
+                    'username': user.username,
+                    'domain': current_site.domain,
+                    'uid': user.id,
+                    'token': token,
+                    })
+                
+                if settings.EMAIL_ACTIVE:
+                    send_mail(mail_subject, message, 'system@' + settings.DOMAIN, [email])
+                    messages.success(request, 'Registration successful. Please check your email to activate')
+                    return redirect(reverse('embark-login'))
+                else:
+                    logger.debug("Registered, redirecting to login")
+                    activate_user(user.id, token)
         except builtins.Exception as error:
             logger.exception('Wide exception in Signup: %s', error)
             messages.error(request, 'Something went wrong when signing up the user.')
@@ -230,3 +244,40 @@ def set_timezone(request):
     else:
         messages.error(request, 'Timezone could not be set')
         return redirect("..")
+
+
+def activate_user(user, token):
+    """
+    activates user with token
+    """
+    if default_token_generator.check_token(user, token):
+        user.is_active = True
+        user.save()
+        return True
+    return False
+
+
+@require_http_methods(["GET", "POST"])
+@login_required(login_url='/' + settings.LOGIN_URL)
+def activate(request):
+    """
+    activation page + form request
+    activates user through the usage of token
+    """
+    if request.method == "POST":
+        logger.debug(request.POST)
+        try:
+            user = get_user(request)
+            activation_form = ActivationForm(request.POST)
+            if activation_form.is_valid():
+                token = activation_form.cleand_data["token"]
+                if activate_user(user, token):
+                    messages.success(request, str(user.username) + 'activated')
+                else:
+                    messages.error(request, "Token invalid - maybe it expired?")
+        except ValueError as val_error:
+            logger.error(f"{val_error} in token {token}")
+        return redirect(reverse('embark-login'))
+    else:
+        activation_form = ActivationForm()
+        render(request, 'activate.html', {'activation-form': activation_form})
diff --git a/installer.sh b/installer.sh
index f168bae3..8ce95b78 100755
--- a/installer.sh
+++ b/installer.sh
@@ -81,9 +81,9 @@ save_old_env(){
 }
 
 write_env(){
-  local SUPER_PW="embark"
-  local SUPER_EMAIL="idk@lol.com"
-  local SUPER_USER="superuser"
+  local SUPER_PW="$(openssl rand -base64 8)"
+  local SUPER_EMAIL="admin@embark.local"
+  local SUPER_USER="admin"
   local RANDOM_PW=""
   local DJANGO_SECRET_KEY=""
   local ENV_FILES=()

From a1faeacf61bb8acc166caa5324246e130fd80ec9 Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Thu, 24 Oct 2024 14:01:25 +0000
Subject: [PATCH 06/23] fixes

---
 embark/templates/user/register.html | 31 ++++++-----------------------
 embark/users/models.py              |  4 ++--
 embark/users/views.py               | 13 +++++++-----
 3 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/embark/templates/user/register.html b/embark/templates/user/register.html
index 0e7e0893..cd4d4500 100644
--- a/embark/templates/user/register.html
+++ b/embark/templates/user/register.html
@@ -1,35 +1,16 @@
 {% extends "base.html" %}
 {% load static %}
+{% load django_bootstrap5 %}
 {% block style %}<link rel="stylesheet" type="text/css" href="{% static 'content/css/login.css' %}"/>{% endblock style %}
 {% block title %}EMBArk register{% endblock title %}
 {% block maincontent %}
     <div class="login-form-container">
-        {% if error_message %}
-        <div class="alert alert-danger alert-dismissible fade show" role="alert">
-            <medium>{{ message }}</medium>
-        </div>
-        {% endif %}
-        {% if success_message %}
-        <div class="alert alert-success alert-dismissible fade show" role="alert">
-            <medium>{{ message }}</medium>
-        </div>
-        {% endif %}
         <div id="embarkLogo"><img src="{% static 'content/images/embark_logo.svg' %}" alt="EMBArk logo graphic" height="auto" width="auto"/></div>
-        <div class="login">
-            <form action="{% url 'embark-register' %}" class="login-form" method="post" novalidate>
-                <h2 class="title">Register</h2>
-                <div class="input-field" data-error="Username is required">
-                    <svg viewBox="0 -2 25 25" xmlns="http://www.w3.org/2000/svg"><path d="m7.5.5c1.65685425 0 3 1.34314575 3 3v2c0 1.65685425-1.34314575 3-3 3s-3-1.34314575-3-3v-2c0-1.65685425 1.34314575-3 3-3zm7 14v-.7281753c0-3.1864098-3.6862915-5.2718247-7-5.2718247s-7 2.0854149-7 5.2718247v.7281753c0 .5522847.44771525 1 1 1h12c.5522847 0 1-.4477153 1-1z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" transform="translate(3 2)"/></svg>
-                    <input type="text" placeholder="Username" name="username" required/>
-                </div>
-                <div class="input-field">
-                    <svg viewBox="0 -2 25 25" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" transform="translate(4 1)"><path d="m2.5 8.5-.00586729-1.99475098c-.00728549-4.00349935 1.32800361-6.00524902 4.00586729-6.00524902s4.0112203 2.00174967 4.0000699 6.00524902v1.99475098m-8.0000699 0h8.0225317c1.0543618 0 1.9181652.81587779 1.9945143 1.8507377l.0054778.1548972-.0169048 6c-.0031058 1.1023652-.8976224 1.9943651-1.999992 1.9943651h-8.005627c-1.1045695 0-2-.8954305-2-2v-6c0-1.1045695.8954305-2 2-2z" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/><circle cx="6.5" cy="13.5" fill="#000" r="1.5"/></g></svg>
-                    <input type="password" placeholder="Password" name="password" required/>
-                </div>
-                <div class="input-field">
-                    <svg viewBox="0 -2 25 25" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" transform="translate(4 1)"><path d="m2.5 8.5-.00586729-1.99475098c-.00728549-4.00349935 1.32800361-6.00524902 4.00586729-6.00524902s4.0112203 2.00174967 4.0000699 6.00524902v1.99475098m-8.0000699 0h8.0225317c1.0543618 0 1.9181652.81587779 1.9945143 1.8507377l.0054778.1548972-.0169048 6c-.0031058 1.1023652-.8976224 1.9943651-1.999992 1.9943651h-8.005627c-1.1045695 0-2-.8954305-2-2v-6c0-1.1045695.8954305-2 2-2z" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/><circle cx="6.5" cy="13.5" fill="#000" r="1.5"/></g></svg>
-                    <input type="password" placeholder="Confirm password" name="confirm_password" required/>
-                </div>
+            <form action="{% url 'embark-register' %}" class="register-form" method="post" novalidate>
+                {% csrf_token %}
+                {% for field in signup_form %}
+                    {% bootstrap_field field %}
+                {% endfor %}
                 <input id="loginButton" type="submit" class="solid btn-login" value="Register" />
             </form> 
         </div>
diff --git a/embark/users/models.py b/embark/users/models.py
index 0a701f8a..9e3febc8 100644
--- a/embark/users/models.py
+++ b/embark/users/models.py
@@ -5,7 +5,7 @@
 import enum
 
 from django.db import models
-from django.contrib.auth.models import User as DjangoUser
+from django.contrib.auth.models import AbstractUser
 from django.conf import settings
 
 from lib.choice_enum import ChoiceIntEnum
@@ -26,7 +26,7 @@ class Team(models.Model):
     modified = models.DateTimeField(auto_now=True, help_text='Date time when this entry was modified')
 
 
-class User(DjangoUser):
+class User(AbstractUser):
     timezone = models.CharField(max_length=32, choices=settings.TIMEZONES, default='UTC')
 
 
diff --git a/embark/users/views.py b/embark/users/views.py
index 1b03c81e..21b85ce6 100644
--- a/embark/users/views.py
+++ b/embark/users/views.py
@@ -50,7 +50,6 @@ def register(request):
                 user.is_active = False
                 user.save()
                 logger.debug('User created')
-                # TODO create email + token
                 token = default_token_generator.make_token(user)
                 current_site = get_current_site(request)
                 mail_subject = 'Activate your EMBArk account.'
@@ -62,18 +61,22 @@ def register(request):
                     'token': token,
                     })
                 
-                if settings.EMAIL_ACTIVE:
+                if settings.EMAIL_ACTIVE == True:
                     send_mail(mail_subject, message, 'system@' + settings.DOMAIN, [email])
                     messages.success(request, 'Registration successful. Please check your email to activate')
                     return redirect(reverse('embark-login'))
                 else:
                     logger.debug("Registered, redirecting to login")
-                    activate_user(user.id, token)
+                    if activate_user(user.id, token):
+                        messages.success(request, 'Registration successful.')
+                        return redirect(reverse('embark-login'))
+                    else:
+                        raise Exception("Activation Error")
         except builtins.Exception as error:
             logger.exception('Wide exception in Signup: %s', error)
             messages.error(request, 'Something went wrong when signing up the user.')
-            return render(request, 'user/register.html')
-    return render(request, 'user/register.html')
+    register_form = SignupForm()
+    return render(request, 'user/register.html', {'signup_form': register_form})
 
 
 @require_http_methods(["GET", "POST"])

From 875732143900c1eff5538500d90748979579aec6 Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Thu, 24 Oct 2024 14:38:14 +0000
Subject: [PATCH 07/23] fix hash entry

---
 embark/dashboard/models.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/embark/dashboard/models.py b/embark/dashboard/models.py
index b89a4957..2c1df10a 100644
--- a/embark/dashboard/models.py
+++ b/embark/dashboard/models.py
@@ -22,12 +22,12 @@ class SoftwareInfo(models.Model):
     Many-to-many object for SBOM
     """
     id = models.UUIDField(primary_key=True, default=uuid.uuid4)
-    name = models.CharField(verbose_name="software name", blank=False, editable=True, max_length=256)
+    name = models.CharField(verbose_name="software name", blank=False, editable=True, default="NA", max_length=256)
     version = models.CharField(verbose_name="software version", blank=False, editable=True, default="1.0", max_length=32)
-    hashes = models.JSONField(null=True, unique=True)
-    cpe = models.CharField(verbose_name="CPE identifier", blank=False, editable=True, max_length=256)
+    hash = models.CharField(verbose_name="identivication hash", blank=False, editable=True, default="NA", max_length=1024)
+    cpe = models.CharField(verbose_name="CPE identifier", blank=False, editable=True, default="NA", max_length=256)
     type = models.CharField(verbose_name="software type", blank=False, editable=True, default="data", max_length=50)
-    purl = models.CharField(verbose_name="PUrl identifier", blank=False, editable=True, max_length=256)
+    purl = models.CharField(verbose_name="PUrl identifier", blank=False, editable=True, default="NA", max_length=256)
     details = models.JSONField(null=True)
 
 
@@ -86,4 +86,4 @@ class Result(models.Model):
     system_bin = models.TextField(default='{}')
 
     vulnerability = models.ManyToManyField(Vulnerability, help_text='CVE/Vulnerability', related_query_name='CVE', editable=True, blank=True)
-    sbom = models.ManyToManyField(SoftwareInfo, help_text='Software Bill of Material', related_query_name='sbom', editable=True, null=True)
+    sbom = models.ManyToManyField(SoftwareInfo, help_text='Software Bill of Material', related_query_name='sbom', editable=True, blank=True)

From a0b2dd5d903457aa8b44a139bd76973a40e50aed Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Fri, 25 Oct 2024 14:05:14 +0000
Subject: [PATCH 08/23] update registration

---
 embark/dashboard/urls.py                      |   1 +
 embark/embark/settings/dev.py                 |  17 +-
 embark/templates/user/accountDelete.html      |  30 ++--
 ...te.html => email_template_activation.html} |   2 +-
 .../user/email_template_deactivation.html     |   8 +
 embark/templates/user/index.html              |   8 +
 embark/templates/user/login.html              |  22 +--
 embark/templates/user/register.html           |   4 +-
 embark/users/forms.py                         |  40 ++++-
 embark/users/models.py                        |   1 +
 embark/users/urls.py                          |  13 +-
 embark/users/views.py                         | 148 ++++++++++--------
 12 files changed, 181 insertions(+), 113 deletions(-)
 rename embark/templates/user/{email_template.html => email_template_activation.html} (68%)
 create mode 100644 embark/templates/user/email_template_deactivation.html

diff --git a/embark/dashboard/urls.py b/embark/dashboard/urls.py
index 4eb798af..17b87a88 100644
--- a/embark/dashboard/urls.py
+++ b/embark/dashboard/urls.py
@@ -9,6 +9,7 @@
 
 # view routing
 urlpatterns = [
+    path('', views.main_dashboard, name='embark-MainDashboard'),
     path('dashboard/main/', views.main_dashboard, name='embark-MainDashboard'),
     path('dashboard/service/', views.service_dashboard, name='embark-dashboard-service'),
     path('dashboard/report/', views.report_dashboard, name='embark-ReportDashboard'),
diff --git a/embark/embark/settings/dev.py b/embark/embark/settings/dev.py
index beb66775..9de31948 100644
--- a/embark/embark/settings/dev.py
+++ b/embark/embark/settings/dev.py
@@ -82,6 +82,7 @@
 
 SESSION_COOKIE_SAMESITE = 'Strict'
 SESSION_COOKIE_HTTPONLY = True
+SESSION_COOKIE_SECURE = False
 
 WSGI_APPLICATION = 'embark.wsgi.application'
 
@@ -187,16 +188,19 @@
 
 AUTH_PASSWORD_VALIDATORS = [
     {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
+        "OPTIONS": {
+            "min_length": 8,
+        },
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
     },
 ]
 
@@ -226,10 +230,10 @@
 # STATICFILES_FINDERS
 
 # URL of Login-Page
-LOGIN_URL = ''
+LOGIN_URL = 'user/login/'
 
 # URL of Logout-Page
-LOGOUT_REDIRECT_URL = ''
+LOGOUT_REDIRECT_URL = 'user/logout'
 
 # Added for FIle storage to get the path to save Firmware images.
 MEDIA_ROOT = os.path.join(BASE_DIR.parent, 'media')
@@ -272,6 +276,7 @@
         },
     },
 }
+# TODO check this https://docs.djangoproject.com/en/5.1/topics/cache/
 TEMP_DIR = Path("/tmp/")
 
 try:
diff --git a/embark/templates/user/accountDelete.html b/embark/templates/user/accountDelete.html
index 6e673b50..b601123f 100644
--- a/embark/templates/user/accountDelete.html
+++ b/embark/templates/user/accountDelete.html
@@ -6,21 +6,21 @@
 {% block maincontent %}
 
 <div class="auth-wrapper">
-                <form action="{% url 'embark-acc-delete' %}" method="post" novalidate>
-                    <div class="box box-primary">
-                            <div class="box-header">
-                            <h2 class="page-header"><i class="fa fa-lock"></i> Permanently delete my Account </h2>
-                        </div>
-                        <div class="box box-body-second">
-                            <p>Are you sure you want to permanently delete your account?</p>
-                        </div>
-                        <div class="btn-cnt">
-                            <p>
-                                <button class="btn-reset" type="submit" name="DeleteAcc">Delete Account</button>
-                            </p>
-                        </div>
-                    </div>
-                </form>
+    <form action="{% url 'embark-acc-delete' %}" method="post" novalidate>
+        <div class="box box-primary">
+                <div class="box-header">
+                <h2 class="page-header"><i class="fa fa-lock"></i> Permanently delete my Account </h2>
+            </div>
+            <div class="box box-body-second">
+                <p>Are you sure you want to permanently delete your account?</p>
+            </div>
+            <div class="btn-cnt">
+                <p>
+                    <button class="btn-reset" type="submit" name="DeleteAcc">Delete Account</button>
+                </p>
+            </div>
+        </div>
+    </form>
 </div>
 
 {% endblock maincontent %}
\ No newline at end of file
diff --git a/embark/templates/user/email_template.html b/embark/templates/user/email_template_activation.html
similarity index 68%
rename from embark/templates/user/email_template.html
rename to embark/templates/user/email_template_activation.html
index e3e99f33..bad556a5 100644
--- a/embark/templates/user/email_template.html
+++ b/embark/templates/user/email_template_activation.html
@@ -2,7 +2,7 @@
 Dear {{ username }},
 
 Please follow the link to confirm your registration,
-http://{{ domain }}{% url 'activate' user_id=uid activation_token=token %}
+http://{{ domain }}{% url 'embark-activate-user' user_id=uid token=token %}
 
 OR manually input the following token: {{ token }}
 {% endautoescape %}
\ No newline at end of file
diff --git a/embark/templates/user/email_template_deactivation.html b/embark/templates/user/email_template_deactivation.html
new file mode 100644
index 00000000..0c005dec
--- /dev/null
+++ b/embark/templates/user/email_template_deactivation.html
@@ -0,0 +1,8 @@
+{% autoescape off %}
+Dear {{ username }},
+
+Please follow the link to confirm the account deletion,
+http://{{ domain }}{% url 'embark-deactivate-user' user_id=uid activation_token=token %}
+
+OR manually input the following token: {{ token }}
+{% endautoescape %}
\ No newline at end of file
diff --git a/embark/templates/user/index.html b/embark/templates/user/index.html
index 3bd3389c..1fdbe3f0 100644
--- a/embark/templates/user/index.html
+++ b/embark/templates/user/index.html
@@ -5,6 +5,14 @@
 
 {% block navigation %}{% include "navigation.html" %}{% endblock navigation %}
 {% block maincontent %}
+{% if user.is_staff %}
+<div class="d-flex justify-content-center">
+    <h3><span class="badge bg-secondary"><a href="{% url 'admin:index' %}">
+        <input class="solid btn-login" type="submit" value="Admin-page" />
+    </a></span></h3>
+    
+</div>
+{% endif %}
     <div class="container-fluid">
         {% block timezone %}{% include "user/timezone.html" %}{% endblock timezone %}
     </div>
diff --git a/embark/templates/user/login.html b/embark/templates/user/login.html
index cdb37bc9..e2489889 100644
--- a/embark/templates/user/login.html
+++ b/embark/templates/user/login.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load static %}
+{% load django_bootstrap5 %}
 {% block style %}<link rel="stylesheet" type="text/css" href="{% static 'content/css/login.css' %}"/>{% endblock style %}
 {% block title %}EMBArk login{% endblock title %}
 {% block maincontent %}
@@ -15,24 +16,23 @@ <h2><span class="badge bg-primary">New</span>  Version 0.1</h2>
           <h3><span class="badge bg-secondary">New</span>  New Buttons everywhere</h3>
         </div>
         <div class="login">
-            <form action="{% url 'embark-login' %}" class="login-form" method="post">
-                {% csrf_token %}
+            <form action="{% url 'embark-login' %}" class="login-form" method="post" novalidate>
                 <h2 class="title">Sign in</h2>
-                <div class="input-field" data-error="Username is required">
-                    <svg viewBox="0 -2 25 25" xmlns="http://www.w3.org/2000/svg"><path d="m7.5.5c1.65685425 0 3 1.34314575 3 3v2c0 1.65685425-1.34314575 3-3 3s-3-1.34314575-3-3v-2c0-1.65685425 1.34314575-3 3-3zm7 14v-.7281753c0-3.1864098-3.6862915-5.2718247-7-5.2718247s-7 2.0854149-7 5.2718247v.7281753c0 .5522847.44771525 1 1 1h12c.5522847 0 1-.4477153 1-1z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" transform="translate(3 2)"/></svg>
-                    <input type="text" placeholder="Username" name="username" required/>
-                </div>
-                <div class="input-field">
-                    <svg viewBox="0 -2 25 25" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" transform="translate(4 1)"><path d="m2.5 8.5-.00586729-1.99475098c-.00728549-4.00349935 1.32800361-6.00524902 4.00586729-6.00524902s4.0112203 2.00174967 4.0000699 6.00524902v1.99475098m-8.0000699 0h8.0225317c1.0543618 0 1.9181652.81587779 1.9945143 1.8507377l.0054778.1548972-.0169048 6c-.0031058 1.1023652-.8976224 1.9943651-1.999992 1.9943651h-8.005627c-1.1045695 0-2-.8954305-2-2v-6c0-1.1045695.8954305-2 2-2z" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/><circle cx="6.5" cy="13.5" fill="#000" r="1.5"/></g></svg>
-                    <input type="password" placeholder="Password" name="password" required/>
-                </div>
-                <input id="loginButton" type="submit" class="solid btn-login" value="Login" />
+                {% csrf_token %}
+                {% for field in form %}
+                    {% bootstrap_field field %}
+                {% endfor %}
+                <input id="loginButton" type="submit" class="solid btn-login" value="login" />
             </form> 
         </div>
         <div id="login_footer">
+            <a href="{% url 'embark-password-reset' %}">
+                <input class="solid btn-login" type="submit" value="Lost Password?" />
+            </a>
             <a href="{% url 'embark-register' %}">
                 <input class="solid btn-login" type="submit" value="Register" />
             </a>
         </div>
+
     </div>
 {% endblock maincontent %}
\ No newline at end of file
diff --git a/embark/templates/user/register.html b/embark/templates/user/register.html
index cd4d4500..ec70bf3c 100644
--- a/embark/templates/user/register.html
+++ b/embark/templates/user/register.html
@@ -6,9 +6,9 @@
 {% block maincontent %}
     <div class="login-form-container">
         <div id="embarkLogo"><img src="{% static 'content/images/embark_logo.svg' %}" alt="EMBArk logo graphic" height="auto" width="auto"/></div>
-            <form action="{% url 'embark-register' %}" class="register-form" method="post" novalidate>
+            <form action="{% url 'embark-register' %}" class="register-form" method="post">
                 {% csrf_token %}
-                {% for field in signup_form %}
+                {% for field in form %}
                     {% bootstrap_field field %}
                 {% endfor %}
                 <input id="loginButton" type="submit" class="solid btn-login" value="Register" />
diff --git a/embark/users/forms.py b/embark/users/forms.py
index 0f3691da..eb2368aa 100644
--- a/embark/users/forms.py
+++ b/embark/users/forms.py
@@ -1,14 +1,42 @@
 from django import forms
-from django.contrib.auth.forms import UserCreationForm
+from django.contrib.auth import password_validation 
+from django.contrib.auth.validators import UnicodeUsernameValidator
+from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
 from users.models import User
 
 
-class SignupForm(UserCreationForm):
+username_validator = UnicodeUsernameValidator()
+
+
+class SignUpForm(UserCreationForm):
+    first_name = forms.CharField(max_length=12, min_length=4, required=False, help_text='Optional: First Name',
+                                widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'First Name'}))
+    last_name = forms.CharField(max_length=12, min_length=4, required=False, help_text='Optional: Last Name',
+                               widget=(forms.TextInput(attrs={'class': 'form-control'})))
+    email = forms.EmailField(max_length=50, help_text='Required. Inform a valid email address.',
+                             widget=(forms.TextInput(attrs={'class': 'form-control'})))
+    password1 = forms.CharField(label='Password',
+                                widget=(forms.PasswordInput(attrs={'class': 'form-control'})),
+                                help_text=password_validation.password_validators_help_text_html())
+    password2 = forms.CharField(label='Password Confirmation', widget=forms.PasswordInput(attrs={'class': 'form-control'}),
+                                help_text='Just Enter the same password, for confirmation')
+    username = forms.CharField(
+        label='Username',
+        max_length=150,
+        help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.',
+        validators=[username_validator],
+        error_messages={'unique': "A user with that username already exists."},
+        widget=forms.TextInput(attrs={'class': 'form-control'})
+    )
+    usable_password = None
     class Meta:
         model = User
-        fields = ('username', 'email', 'password1', 'password2')
-
+        fields = ('username', 'first_name', 'last_name', 'email', 'password1', 'password2',)
 
-class ActivationForm(forms.Form):
 
-    token = forms.CharField(max_length=256, min_length=256)
+class LoginForm(AuthenticationForm):
+        error_messages = {
+        "invalid_login": "Please enter a correct %(username)s and password. Note that both fields may be case-sensitive.",
+        "inactive": "This account is not yet activated",
+        "deactivated": "Account was deactivated",
+    }
diff --git a/embark/users/models.py b/embark/users/models.py
index 9e3febc8..fd4a7c21 100644
--- a/embark/users/models.py
+++ b/embark/users/models.py
@@ -28,6 +28,7 @@ class Team(models.Model):
 
 class User(AbstractUser):
     timezone = models.CharField(max_length=32, choices=settings.TIMEZONES, default='UTC')
+    email = models.EmailField(verbose_name="email address", blank=True, unique=True)
 
 
 class TeamMember(models.Model):
diff --git a/embark/users/urls.py b/embark/users/urls.py
index a1011cb6..5d2811a8 100644
--- a/embark/users/urls.py
+++ b/embark/users/urls.py
@@ -11,12 +11,13 @@
 urlpatterns = [
     path(settings.LOGIN_URL, views.embark_login, name='embark-login'),
     path('user/', views.user_main, name='embark-user-main'),
-    path('register/', views.register, name='embark-register'),
-    path('register/activate/<uuid:user_id>/', views.register, name='embark-activate-user'),
-    path('logout/', views.embark_logout, name='embark-logout'),
+    path('user/register/', views.register, name='embark-register'),
+    path('user/<int:user_id>/activate/<str:token>', views.activate, name='embark-activate-user'),
+    path('user/reset_password/', views.reset_password, name='embark-password-reset'),
+    path(settings.LOGOUT_REDIRECT_URL, views.embark_logout, name='embark-logout'),
     path('user/password_change/', views.password_change, name='embark-password-change'),
-    path('user/acc_delete/', views.acc_delete, name='embark-acc-delete'),
+    path('user/delete/', views.acc_delete, name='embark-acc-delete'),
+    path('user/<int:user_id>/deactivate', views.deactivate, name='embark-deactivate-user'),
     path('user/set_timezone/', views.set_timezone, name='embark-acc-timezone'),
-    # TODO account menu path('my-account/', views., name='embark-), for admin options etc
-    path('log/<int:log_type>/<int:lines>/', views.get_log, name='log'),
+    path('log/<int:log_type>/<int:lines>/', views.get_log, name='log'), # TODO move to admin
 ]
diff --git a/embark/users/views.py b/embark/users/views.py
index 21b85ce6..23634c13 100644
--- a/embark/users/views.py
+++ b/embark/users/views.py
@@ -11,6 +11,7 @@
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.sites.shortcuts import get_current_site
 from django.contrib import messages
+from django.forms import ValidationError
 from django.shortcuts import render, redirect
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
@@ -20,7 +21,7 @@
 from django.urls import reverse
 from django.core.mail import send_mail
 
-from users.forms import ActivationForm, SignupForm
+from users.forms import LoginForm, SignUpForm
 from users.models import User
 
 logger = logging.getLogger(__name__)
@@ -29,6 +30,8 @@
 @require_http_methods(["GET"])
 def user_main(request):
     logger.debug("Account settings for %s", request.user)
+    user = get_user(request)
+    #   return render(request, 'user/index.html', {"timezones": settings.TIMEZONES, "server_tz": settings.TIME_ZONE, 'user': user})
     return render(request, 'user/index.html', {"timezones": settings.TIMEZONES, "server_tz": settings.TIME_ZONE})
 
 
@@ -39,7 +42,7 @@ def register(request):
         logger.debug(request.POST)
         try:
             user = get_user(request)
-            signup_form = SignupForm(request.POST)
+            signup_form = SignUpForm(data=request.POST)
             if signup_form.is_valid():
                 username = signup_form.cleaned_data.get('username')
                 password = signup_form.cleaned_data.get('password')
@@ -48,13 +51,13 @@ def register(request):
                 user = User.objects.create(username=username, email=email)
                 user.set_password(password)
                 user.is_active = False
+                # user.is_active = True
                 user.save()
                 logger.debug('User created')
                 token = default_token_generator.make_token(user)
                 current_site = get_current_site(request)
                 mail_subject = 'Activate your EMBArk account.'
-                message = render_to_string('email_template.html', context={
-                    'user': user,
+                message = render_to_string('user/email_template_activation.html', context={
                     'username': user.username,
                     'domain': current_site.domain,
                     'uid': user.id,
@@ -64,10 +67,10 @@ def register(request):
                 if settings.EMAIL_ACTIVE == True:
                     send_mail(mail_subject, message, 'system@' + settings.DOMAIN, [email])
                     messages.success(request, 'Registration successful. Please check your email to activate')
-                    return redirect(reverse('embark-login'))
+                    return redirect(reverse('embark-activate-user', kwargs={'uuid':user.id}))
                 else:
                     logger.debug("Registered, redirecting to login")
-                    if activate_user(user.id, token):
+                    if activate_user(user, token):
                         messages.success(request, 'Registration successful.')
                         return redirect(reverse('embark-login'))
                     else:
@@ -75,58 +78,51 @@ def register(request):
         except builtins.Exception as error:
             logger.exception('Wide exception in Signup: %s', error)
             messages.error(request, 'Something went wrong when signing up the user.')
-    register_form = SignupForm()
-    return render(request, 'user/register.html', {'signup_form': register_form})
+    else:
+        signup_form = SignUpForm()
+    return render(request, 'user/register.html', {'form': signup_form})
 
 
 @require_http_methods(["GET", "POST"])
 def embark_login(request):
     if request.method == "POST":
-        logger.debug(request.POST)
-        data = {k: v[0] for k, v in dict(request.POST).items()}
-        logger.debug(data)
         try:
-            body = {k: v[0] for k, v in dict(request.POST).items()}
-            try:
-                username = body['username']
-                password = body['password']
-            except KeyError:
-                logger.exception('Missing keys from data- Username and password')
-                messages.error(request, 'Username or password are wrong.')
-                return render(request, 'user/login.html')
-
-            logger.debug('Found user name and password')
-            user = authenticate(request, username=username, password=password)
-            if user is not None:
-                logger.debug('User authenticated')
-                login(request, user)
-                logger.debug('User logged in')
-                request.session["django_timezone"] = user.timezone
-                # messages.success(request, str(user.username) + ' timezone set to : ' + str(user.timezone))
-                return redirect('../../dashboard/main/')
-            # else:
-            logger.debug('User could not be authenticated')
-            messages.error(request, "Invalid user data")
-            return render(request, 'user/login.html')
+            login_form = LoginForm(request, request.POST)
+            logger.debug(login_form)
+            if login_form.is_valid():
+                logger.debug('form valid')
+                user = login_form.get_user()
+                if user:
+                    logger.debug('User authenticated')
+                    login(request, user)
+                    logger.debug('User logged in')
+                    request.session["django_timezone"] = user.timezone
+                    # messages.success(request, str(user.username) + ' timezone set to : ' + str(user.timezone))
+                    return redirect('embark-uploader-home')
+                logger.debug('User could not be authenticated')
+            logger.debug('Form errors: %s', str(login_form.errors))
+        except ValidationError as valid_error:
+            logger.error("Exception in value: %s ", valid_error)
+            messages.error(request, 'User is deactivated')
         except builtins.Exception as error:
             logger.exception('Wide exception in Signup: %s', error)
             messages.error(request, 'Something went wrong when logging in the user.')
-            return render(request, 'user/login.html')
-    return render(request, 'user/login.html')
+    else:
+        login_form = LoginForm()
+    return render(request, 'user/login.html', {'form': login_form})
 
 
-# @cache_control(no_cache=True, must_revalidate=True, no_store=True)
 @login_required(login_url='/' + settings.LOGIN_URL)
-def embark_logout(request):     # FIXME this just flushes session_id??!
+def embark_logout(request):
     logout(request=request)
     logger.debug("Logout user %s", request)
     messages.success(request, 'Logout successful.')
-    return render(request, 'user/login.html')
+    return redirect('embark-login')
 
 
 @login_required(login_url='/' + settings.LOGIN_URL)
 @require_http_methods(["GET", "POST"])
-def password_change(request):
+def password_change(request):   # FIXME
     if request.method == "POST":
         logger.debug(request.POST)
         user = get_user(request)
@@ -179,19 +175,41 @@ def acc_delete(request):
     if request.method == "POST":
         logger.debug('disabling account')
         user = get_user(request)
-        logger.debug(' %s Account: %s disabled', timezone.now().strftime("%H:%M:%S"), user)
-        user.username = user.get_username() + '_disactivated_' + timezone.now().strftime(
-            "%H:%M:%S")  # workaround for not duplicating entry users_user.username
-        user.is_active = False
-        user.save()
-        messages.success(request, 'Account successfully deleted.')
-        return render(request, 'user/register.html')    # TODO should be redirect
+        email = user.email
+        token = default_token_generator.make_token(user)
+        current_site = get_current_site(request)
+        mail_subject = 'Delete your EMBArk account.'
+        message = render_to_string('user/email_template_deactivation.html', context={
+            'user': user,
+            'username': user.username,
+            'domain': current_site.domain,
+            'uid': user.id,
+            'token': token,
+            })
+        if settings.EMAIL_ACTIVE == True:
+            send_mail(mail_subject, message, 'system@' + settings.DOMAIN, [email])
+            messages.success(request, 'Please check your email to confirm deletion')
+            return redirect(reverse('embark-deactivate-user', kwargs={'uuid':user.id}))
+        else:
+            logger.debug(' %s Account: %s disabled', timezone.now().strftime("%H:%M:%S"), user)
+            user.username = user.get_username() + '_disactivated_' + timezone.now().strftime(
+                "%H:%M:%S")  # workaround for not duplicating entry users_user.username
+            user.is_active = False
+            user.save()
+            messages.success(request, 'Account successfully deleted.')
+            return redirect('embark-login')
     return render(request, 'user/accountDelete.html')
 
 
+@require_http_methods(["POST"])
+@login_required(login_url='/' + settings.LOGIN_URL)
+def deactivate(request, uid):
+    pass
+
+
 @require_http_methods(["GET"])
 @login_required(login_url='/' + settings.LOGIN_URL)
-def get_log(request, log_type, lines):      # FIXME update or remove
+def get_log(request, log_type, lines):      # FIXME move to admin
     """
     View takes a get request with following params:
     1. log_type: selector of log file (daphne, migration, mysql_db, redis_db, uwsgi, web)
@@ -260,27 +278,25 @@ def activate_user(user, token):
     return False
 
 
-@require_http_methods(["GET", "POST"])
+@require_http_methods(["GET"])
 @login_required(login_url='/' + settings.LOGIN_URL)
-def activate(request):
+def activate(request, user_id, token):
     """
     activation page + form request
     activates user through the usage of token
     """
-    if request.method == "POST":
-        logger.debug(request.POST)
-        try:
-            user = get_user(request)
-            activation_form = ActivationForm(request.POST)
-            if activation_form.is_valid():
-                token = activation_form.cleand_data["token"]
-                if activate_user(user, token):
-                    messages.success(request, str(user.username) + 'activated')
-                else:
-                    messages.error(request, "Token invalid - maybe it expired?")
-        except ValueError as val_error:
-            logger.error(f"{val_error} in token {token}")
-        return redirect(reverse('embark-login'))
-    else:
-        activation_form = ActivationForm()
-        render(request, 'activate.html', {'activation-form': activation_form})
+    try:
+        user = User.objects.get(id=user_id)
+        if activate_user(user, token):
+            login(request, user)
+            messages.success(request, str(user.username) + 'activated')
+        else:
+            messages.error(request, "Token invalid - maybe it expired?")
+    except ValueError as val_error:
+        logger.error(f"{val_error} in token {token}")
+    return redirect(reverse('embark-MainDashboard'))
+
+
+@require_http_methods(["GET", "POST"])
+def reset_password(request):
+    pass

From e36386e3cecbea3f6458d3de1460b38ce15c88b9 Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Fri, 25 Oct 2024 14:37:27 +0000
Subject: [PATCH 09/23] fix registration

---
 embark/users/views.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/embark/users/views.py b/embark/users/views.py
index 23634c13..f91f4c54 100644
--- a/embark/users/views.py
+++ b/embark/users/views.py
@@ -45,13 +45,11 @@ def register(request):
             signup_form = SignUpForm(data=request.POST)
             if signup_form.is_valid():
                 username = signup_form.cleaned_data.get('username')
-                password = signup_form.cleaned_data.get('password')
+                password = signup_form.cleaned_data.get('password2')
                 email = signup_form.cleaned_data.get('email')
-                logger.debug('Passwords match. Creating user')
                 user = User.objects.create(username=username, email=email)
                 user.set_password(password)
                 user.is_active = False
-                # user.is_active = True
                 user.save()
                 logger.debug('User created')
                 token = default_token_generator.make_token(user)
@@ -87,7 +85,7 @@ def register(request):
 def embark_login(request):
     if request.method == "POST":
         try:
-            login_form = LoginForm(request, request.POST)
+            login_form = LoginForm(request=request, data=request.POST)
             logger.debug(login_form)
             if login_form.is_valid():
                 logger.debug('form valid')
@@ -107,8 +105,7 @@ def embark_login(request):
         except builtins.Exception as error:
             logger.exception('Wide exception in Signup: %s', error)
             messages.error(request, 'Something went wrong when logging in the user.')
-    else:
-        login_form = LoginForm()
+    login_form = LoginForm()
     return render(request, 'user/login.html', {'form': login_form})
 
 

From 81c5e4c14fae28b2928e73a0c1fa4feaa89cb20d Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Mon, 28 Oct 2024 17:35:28 +0000
Subject: [PATCH 10/23] password reset

---
 embark/embark/settings/dev.py               |  2 +-
 embark/static/content/css/passwordReset.css |  5 +++
 embark/templates/user/login.html            |  4 +--
 embark/templates/user/lostPassword.html     | 37 +++++++++++++++++++++
 embark/users/forms.py                       |  5 ++-
 embark/users/views.py                       | 16 ++++++---
 6 files changed, 61 insertions(+), 8 deletions(-)
 create mode 100644 embark/templates/user/lostPassword.html

diff --git a/embark/embark/settings/dev.py b/embark/embark/settings/dev.py
index 9de31948..5eb728f3 100644
--- a/embark/embark/settings/dev.py
+++ b/embark/embark/settings/dev.py
@@ -22,7 +22,7 @@
 
 DEBUG = True
 DOMAIN = "embark.local"
-EMAIL_ACTIVE = False
+EMAIL_ACTIVE = True
 
 
 INSTALLED_APPS = [
diff --git a/embark/static/content/css/passwordReset.css b/embark/static/content/css/passwordReset.css
index babc4fb0..15715110 100644
--- a/embark/static/content/css/passwordReset.css
+++ b/embark/static/content/css/passwordReset.css
@@ -76,4 +76,9 @@ form {
 
 h2.page-header{
     padding:30px;
+}
+
+#login_footer {
+    text-align: center;
+    margin: 50px 0;
 }
\ No newline at end of file
diff --git a/embark/templates/user/login.html b/embark/templates/user/login.html
index e2489889..88855e98 100644
--- a/embark/templates/user/login.html
+++ b/embark/templates/user/login.html
@@ -10,10 +10,10 @@
         </div>
         <div class="d-flex justify-content-center">
             <!--  TODO put actual version here-->
-            <h2><span class="badge bg-primary">New</span>  Version 0.1</h2>
+            <h2><span class="badge bg-primary">New</span>  Version 0.2</h2>
         </div>
         <div class="d-flex justify-content-center">
-          <h3><span class="badge bg-secondary">New</span>  New Buttons everywhere</h3>
+          <h3><span class="badge bg-secondary">New</span>  Track you SBOM</h3>
         </div>
         <div class="login">
             <form action="{% url 'embark-login' %}" class="login-form" method="post" novalidate>
diff --git a/embark/templates/user/lostPassword.html b/embark/templates/user/lostPassword.html
new file mode 100644
index 00000000..ace85cf8
--- /dev/null
+++ b/embark/templates/user/lostPassword.html
@@ -0,0 +1,37 @@
+{% extends "base.html" %}
+{% load static %}
+{% load django_bootstrap5 %}
+{% block style %}
+<link rel="stylesheet" type="text/css" href="{% static 'content/css/passwordReset.css' %}"/>
+<link rel="stylesheet" type="text/css" href="{% static 'content/css/login.css' %}"/>
+{% endblock style %}
+{% block title %}Reset Lost Password{% endblock title %}
+{% block maincontent %}
+<div class="password-change-container">
+    {% if email_setting %}
+        <div class="reset">
+                <form action="{% url 'embark-password-reset' %}" class="password-reset-form" method="post" novalidate>
+                    <h2 class="title">Reset Password</h2>
+                    {% csrf_token %}
+                    {% for field in form %}
+                        {% bootstrap_field field %}
+                    {% endfor %}
+                    <input id="loginButton" type="submit" class="solid btn-reset" value="reset" />
+                </form> 
+
+            <div id="login_footer">
+                <a href="{% url 'embark-login' %}">
+                    <input class="solid btn-login" type="submit" value="Login" />
+                </a>
+        </div>
+    {% else %}
+        <div class="d-flex justify-content-center">
+            <h1>
+                Contact your Admin
+                {{ admin_email }}
+            </h1>
+        </div>
+    {% endif %}
+
+</div>
+{% endblock maincontent %}
\ No newline at end of file
diff --git a/embark/users/forms.py b/embark/users/forms.py
index eb2368aa..fa308585 100644
--- a/embark/users/forms.py
+++ b/embark/users/forms.py
@@ -1,7 +1,7 @@
 from django import forms
 from django.contrib.auth import password_validation 
 from django.contrib.auth.validators import UnicodeUsernameValidator
-from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
+from django.contrib.auth.forms import UserCreationForm, AuthenticationForm, PasswordResetForm
 from users.models import User
 
 
@@ -40,3 +40,6 @@ class LoginForm(AuthenticationForm):
         "inactive": "This account is not yet activated",
         "deactivated": "Account was deactivated",
     }
+
+class ResetForm(PasswordResetForm):
+     pass
\ No newline at end of file
diff --git a/embark/users/views.py b/embark/users/views.py
index f91f4c54..2a38ed94 100644
--- a/embark/users/views.py
+++ b/embark/users/views.py
@@ -21,7 +21,7 @@
 from django.urls import reverse
 from django.core.mail import send_mail
 
-from users.forms import LoginForm, SignUpForm
+from users.forms import LoginForm, SignUpForm, ResetForm
 from users.models import User
 
 logger = logging.getLogger(__name__)
@@ -29,8 +29,8 @@
 
 @require_http_methods(["GET"])
 def user_main(request):
-    logger.debug("Account settings for %s", request.user)
     user = get_user(request)
+    logger.debug("Account settings for %s", user)
     #   return render(request, 'user/index.html', {"timezones": settings.TIMEZONES, "server_tz": settings.TIME_ZONE, 'user': user})
     return render(request, 'user/index.html', {"timezones": settings.TIMEZONES, "server_tz": settings.TIME_ZONE})
 
@@ -119,7 +119,7 @@ def embark_logout(request):
 
 @login_required(login_url='/' + settings.LOGIN_URL)
 @require_http_methods(["GET", "POST"])
-def password_change(request):   # FIXME
+def password_change(request):   # TODO adapt t
     if request.method == "POST":
         logger.debug(request.POST)
         user = get_user(request)
@@ -296,4 +296,12 @@ def activate(request, user_id, token):
 
 @require_http_methods(["GET", "POST"])
 def reset_password(request):
-    pass
+    if request.method == 'POST':
+        reset_form = ResetForm(request.POST)
+        if reset_form.is_valid():
+            logger.debug('Form is valid')
+            reset_form.save(request=request)            
+            messages.success(request,'Send Password reset request')
+    reset_form = ResetForm()
+    admin_email = User.objects.get(username='admin').email
+    return render(request, 'user/lostPassword.html', {'form': reset_form, 'email_setting': settings.EMAIL_ACTIVE, 'admin_email': admin_email})

From 2a470d9eae26c3554065d532af9f1d404a7fdbda Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Mon, 28 Oct 2024 17:49:13 +0000
Subject: [PATCH 11/23] enable further admin options

---
 embark/users/admin.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/embark/users/admin.py b/embark/users/admin.py
index a7a60e29..5fcb5c19 100644
--- a/embark/users/admin.py
+++ b/embark/users/admin.py
@@ -3,9 +3,10 @@
 __license__ = 'MIT'
 
 from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
 
 from users.models import User, Team, TeamMember
 
-admin.site.register(User)
-admin.site.register(Team)
-admin.site.register(TeamMember)
+admin.site.register(User, UserAdmin)
+admin.site.register(Team, UserAdmin)
+admin.site.register(TeamMember, UserAdmin)

From 201e1cc1dea67f5f6fb6303a652f3b7bbbff160b Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Thu, 31 Oct 2024 16:07:20 +0000
Subject: [PATCH 12/23] lint fixes

---
 embark/templates/user/lostPassword.html | 37 +++++++++---------
 embark/templates/user/register.html     |  2 +-
 embark/tracker/views.py                 |  2 +-
 embark/users/admin.py                   |  7 ++--
 embark/users/forms.py                   | 51 ++++++++++++++++++-------
 embark/users/models.py                  | 17 +++------
 embark/users/urls.py                    |  2 +-
 embark/users/views.py                   | 31 ++++++++-------
 installer.sh                            |  3 +-
 9 files changed, 83 insertions(+), 69 deletions(-)

diff --git a/embark/templates/user/lostPassword.html b/embark/templates/user/lostPassword.html
index ace85cf8..861d92f5 100644
--- a/embark/templates/user/lostPassword.html
+++ b/embark/templates/user/lostPassword.html
@@ -7,9 +7,9 @@
 {% endblock style %}
 {% block title %}Reset Lost Password{% endblock title %}
 {% block maincontent %}
-<div class="password-change-container">
-    {% if email_setting %}
-        <div class="reset">
+    <div class="password-change-container">
+        {% if email_setting %}
+            <div class="reset">
                 <form action="{% url 'embark-password-reset' %}" class="password-reset-form" method="post" novalidate>
                     <h2 class="title">Reset Password</h2>
                     {% csrf_token %}
@@ -18,20 +18,19 @@ <h2 class="title">Reset Password</h2>
                     {% endfor %}
                     <input id="loginButton" type="submit" class="solid btn-reset" value="reset" />
                 </form> 
-
-            <div id="login_footer">
-                <a href="{% url 'embark-login' %}">
-                    <input class="solid btn-login" type="submit" value="Login" />
-                </a>
-        </div>
-    {% else %}
-        <div class="d-flex justify-content-center">
-            <h1>
-                Contact your Admin
-                {{ admin_email }}
-            </h1>
-        </div>
-    {% endif %}
-
-</div>
+                <div id="login_footer">
+                    <a href="{% url 'embark-login' %}">
+                        <input class="solid btn-login" type="submit" value="Login" />
+                    </a>
+                </div>
+            </div>
+        {% else %}
+            <div class="d-flex justify-content-center">
+                <h1>
+                    Contact your Admin
+                    {{ admin_email }}
+                </h1>
+            </div>
+        {% endif %}
+    </div>
 {% endblock maincontent %}
\ No newline at end of file
diff --git a/embark/templates/user/register.html b/embark/templates/user/register.html
index ec70bf3c..0e40642d 100644
--- a/embark/templates/user/register.html
+++ b/embark/templates/user/register.html
@@ -5,7 +5,7 @@
 {% block title %}EMBArk register{% endblock title %}
 {% block maincontent %}
     <div class="login-form-container">
-        <div id="embarkLogo"><img src="{% static 'content/images/embark_logo.svg' %}" alt="EMBArk logo graphic" height="auto" width="auto"/></div>
+        <div id="embarkLogo"><img src="{% static 'content/images/embark_logo.svg' %}" alt="EMBArk logo graphic" height="auto" width="auto"/>
             <form action="{% url 'embark-register' %}" class="register-form" method="post">
                 {% csrf_token %}
                 {% for field in form %}
diff --git a/embark/tracker/views.py b/embark/tracker/views.py
index 016b7175..c238373d 100644
--- a/embark/tracker/views.py
+++ b/embark/tracker/views.py
@@ -15,7 +15,7 @@
 
 from django_tables2 import RequestConfig
 
-from dashboard.models import Result, SoftwareInfo
+from dashboard.models import Result
 from embark.helper import rnd_rgb_color, rnd_rgb_full
 from uploader.models import FirmwareAnalysis, Device, Vendor
 from tracker.tables import SimpleDeviceTable, SimpleSBOMTable
diff --git a/embark/users/admin.py b/embark/users/admin.py
index 5fcb5c19..eab4083c 100644
--- a/embark/users/admin.py
+++ b/embark/users/admin.py
@@ -3,10 +3,9 @@
 __license__ = 'MIT'
 
 from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.admin import UserAdmin, GroupAdmin
 
-from users.models import User, Team, TeamMember
+from users.models import User, Team
 
 admin.site.register(User, UserAdmin)
-admin.site.register(Team, UserAdmin)
-admin.site.register(TeamMember, UserAdmin)
+admin.site.register(Team, GroupAdmin)
diff --git a/embark/users/forms.py b/embark/users/forms.py
index fa308585..2f1b0d9a 100644
--- a/embark/users/forms.py
+++ b/embark/users/forms.py
@@ -1,7 +1,13 @@
+# pylint: disable=R0901
+__copyright__ = 'Copyright 2024 Siemens Energy AG'
+__author__ = 'Benedikt Kuehne'
+__license__ = 'MIT'
+
 from django import forms
-from django.contrib.auth import password_validation 
+from django.contrib.auth import password_validation
 from django.contrib.auth.validators import UnicodeUsernameValidator
 from django.contrib.auth.forms import UserCreationForm, AuthenticationForm, PasswordResetForm
+
 from users.models import User
 
 
@@ -9,17 +15,32 @@
 
 
 class SignUpForm(UserCreationForm):
-    first_name = forms.CharField(max_length=12, min_length=4, required=False, help_text='Optional: First Name',
-                                widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'First Name'}))
-    last_name = forms.CharField(max_length=12, min_length=4, required=False, help_text='Optional: Last Name',
-                               widget=(forms.TextInput(attrs={'class': 'form-control'})))
-    email = forms.EmailField(max_length=50, help_text='Required. Inform a valid email address.',
-                             widget=(forms.TextInput(attrs={'class': 'form-control'})))
-    password1 = forms.CharField(label='Password',
-                                widget=(forms.PasswordInput(attrs={'class': 'form-control'})),
-                                help_text=password_validation.password_validators_help_text_html())
-    password2 = forms.CharField(label='Password Confirmation', widget=forms.PasswordInput(attrs={'class': 'form-control'}),
-                                help_text='Just Enter the same password, for confirmation')
+    first_name = forms.CharField(
+        max_length=12, min_length=4, required=False, help_text='Optional: First Name',
+        widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'First Name'})
+    )
+
+    last_name = forms.CharField(
+        max_length=12, min_length=4, required=False, help_text='Optional: Last Name',
+        widget=forms.TextInput(attrs={'class': 'form-control'})
+    )
+
+    email = forms.EmailField(
+        max_length=50, help_text='Required. Inform a valid email address.',
+        widget=forms.TextInput(attrs={'class': 'form-control'})
+    )
+
+    password1 = forms.CharField(
+        label='Password',
+        widget=forms.PasswordInput(attrs={'class': 'form-control'}),
+        help_text=password_validation.password_validators_help_text_html()
+    )
+
+    password2 = forms.CharField(
+        label='Password Confirmation', widget=forms.PasswordInput(attrs={'class': 'form-control'}),
+        help_text='Just Enter the same password, for confirmation'
+    )
+
     username = forms.CharField(
         label='Username',
         max_length=150,
@@ -29,17 +50,19 @@ class SignUpForm(UserCreationForm):
         widget=forms.TextInput(attrs={'class': 'form-control'})
     )
     usable_password = None
+
     class Meta:
         model = User
         fields = ('username', 'first_name', 'last_name', 'email', 'password1', 'password2',)
 
 
 class LoginForm(AuthenticationForm):
-        error_messages = {
+    error_messages = {
         "invalid_login": "Please enter a correct %(username)s and password. Note that both fields may be case-sensitive.",
         "inactive": "This account is not yet activated",
         "deactivated": "Account was deactivated",
     }
 
+
 class ResetForm(PasswordResetForm):
-     pass
\ No newline at end of file
+    pass
diff --git a/embark/users/models.py b/embark/users/models.py
index fd4a7c21..aa81b9c5 100644
--- a/embark/users/models.py
+++ b/embark/users/models.py
@@ -5,7 +5,7 @@
 import enum
 
 from django.db import models
-from django.contrib.auth.models import AbstractUser
+from django.contrib.auth.models import AbstractUser, Group
 from django.conf import settings
 
 from lib.choice_enum import ChoiceIntEnum
@@ -19,8 +19,7 @@ class Role(ChoiceIntEnum):
     MANAGER = 3
 
 
-class Team(models.Model):
-    name = models.CharField(max_length=150, unique=True, help_text='Name of the team')
+class Team(Group):
     is_active = models.BooleanField(default=True, help_text='Whether this Team is active or not')
     created = models.DateTimeField(auto_now_add=True, help_text='Date time when this entry was created')
     modified = models.DateTimeField(auto_now=True, help_text='Date time when this entry was modified')
@@ -29,12 +28,6 @@ class Team(models.Model):
 class User(AbstractUser):
     timezone = models.CharField(max_length=32, choices=settings.TIMEZONES, default='UTC')
     email = models.EmailField(verbose_name="email address", blank=True, unique=True)
-
-
-class TeamMember(models.Model):
-    team = models.ForeignKey(Team, on_delete=models.CASCADE, related_name='team_member')
-    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='user_team_member')
-    role = models.IntegerField(choices=Role.choices(), default=Role.VIEWER)
-    is_active = models.BooleanField(default=True, help_text='Whether this team member is active or not')
-    created = models.DateTimeField(auto_now_add=True, help_text='Date time when this entry was created')
-    modified = models.DateTimeField(auto_now=True, help_text='Date time when this entry was modified')
+    team = models.ManyToManyField(Team, blank=True, related_name='member_of_team')
+    team_role = models.IntegerField(choices=Role.choices(), default=Role.VIEWER)
+    is_active_member = models.BooleanField(default=True, help_text='Whether this team member is active or not')
diff --git a/embark/users/urls.py b/embark/users/urls.py
index 5d2811a8..49781486 100644
--- a/embark/users/urls.py
+++ b/embark/users/urls.py
@@ -19,5 +19,5 @@
     path('user/delete/', views.acc_delete, name='embark-acc-delete'),
     path('user/<int:user_id>/deactivate', views.deactivate, name='embark-deactivate-user'),
     path('user/set_timezone/', views.set_timezone, name='embark-acc-timezone'),
-    path('log/<int:log_type>/<int:lines>/', views.get_log, name='log'), # TODO move to admin
+    path('log/<int:log_type>/<int:lines>/', views.get_log, name='log'),     # TODO move to admin
 ]
diff --git a/embark/users/views.py b/embark/users/views.py
index 2a38ed94..ea312473 100644
--- a/embark/users/views.py
+++ b/embark/users/views.py
@@ -60,19 +60,18 @@ def register(request):
                     'domain': current_site.domain,
                     'uid': user.id,
                     'token': token,
-                    })
-                
-                if settings.EMAIL_ACTIVE == True:
+                })
+                if settings.EMAIL_ACTIVE is True:
                     send_mail(mail_subject, message, 'system@' + settings.DOMAIN, [email])
                     messages.success(request, 'Registration successful. Please check your email to activate')
-                    return redirect(reverse('embark-activate-user', kwargs={'uuid':user.id}))
+                    return redirect(reverse('embark-activate-user', kwargs={'uuid': user.id}))
                 else:
                     logger.debug("Registered, redirecting to login")
                     if activate_user(user, token):
                         messages.success(request, 'Registration successful.')
                         return redirect(reverse('embark-login'))
                     else:
-                        raise Exception("Activation Error")
+                        raise ValidationError("Activation Error")
         except builtins.Exception as error:
             logger.exception('Wide exception in Signup: %s', error)
             messages.error(request, 'Something went wrong when signing up the user.')
@@ -182,15 +181,15 @@ def acc_delete(request):
             'domain': current_site.domain,
             'uid': user.id,
             'token': token,
-            })
-        if settings.EMAIL_ACTIVE == True:
+        })
+        if settings.EMAIL_ACTIVE is True:
             send_mail(mail_subject, message, 'system@' + settings.DOMAIN, [email])
             messages.success(request, 'Please check your email to confirm deletion')
-            return redirect(reverse('embark-deactivate-user', kwargs={'uuid':user.id}))
+            return redirect(reverse('embark-deactivate-user', kwargs={'uuid': user.id}))
         else:
             logger.debug(' %s Account: %s disabled', timezone.now().strftime("%H:%M:%S"), user)
             user.username = user.get_username() + '_disactivated_' + timezone.now().strftime(
-                "%H:%M:%S")  # workaround for not duplicating entry users_user.username
+                "%H:%M:%S")     # workaround for not duplicating entry users_user.username
             user.is_active = False
             user.save()
             messages.success(request, 'Account successfully deleted.')
@@ -198,10 +197,10 @@ def acc_delete(request):
     return render(request, 'user/accountDelete.html')
 
 
-@require_http_methods(["POST"])
-@login_required(login_url='/' + settings.LOGIN_URL)
-def deactivate(request, uid):
-    pass
+@require_http_methods(["GET"])
+def deactivate(request, user_id):   # TODO
+    logger.debug("deactivating user with id : %s", user_id)
+    return render(request, 'user/login.html')
 
 
 @require_http_methods(["GET"])
@@ -290,7 +289,7 @@ def activate(request, user_id, token):
         else:
             messages.error(request, "Token invalid - maybe it expired?")
     except ValueError as val_error:
-        logger.error(f"{val_error} in token {token}")
+        logger.error("%s in token %s", val_error, token)
     return redirect(reverse('embark-MainDashboard'))
 
 
@@ -300,8 +299,8 @@ def reset_password(request):
         reset_form = ResetForm(request.POST)
         if reset_form.is_valid():
             logger.debug('Form is valid')
-            reset_form.save(request=request)            
-            messages.success(request,'Send Password reset request')
+            reset_form.save(request=request)
+            messages.success(request, 'Send Password reset request')
     reset_form = ResetForm()
     admin_email = User.objects.get(username='admin').email
     return render(request, 'user/lostPassword.html', {'form': reset_form, 'email_setting': settings.EMAIL_ACTIVE, 'admin_email': admin_email})
diff --git a/installer.sh b/installer.sh
index 8ce95b78..c524384a 100755
--- a/installer.sh
+++ b/installer.sh
@@ -81,7 +81,8 @@ save_old_env(){
 }
 
 write_env(){
-  local SUPER_PW="$(openssl rand -base64 8)"
+  local SUPER_PW=""
+  SUPER_PW="$(openssl rand -base64 8)"
   local SUPER_EMAIL="admin@embark.local"
   local SUPER_USER="admin"
   local RANDOM_PW=""

From 77fc12013d7dec07832209c159e7c37672560327 Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Mon, 4 Nov 2024 06:31:33 +0000
Subject: [PATCH 13/23] add models to admin pages

---
 embark/dashboard/admin.py  | 6 ++++--
 embark/dashboard/models.py | 2 +-
 embark/uploader/admin.py   | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/embark/dashboard/admin.py b/embark/dashboard/admin.py
index 24817012..b14cd423 100644
--- a/embark/dashboard/admin.py
+++ b/embark/dashboard/admin.py
@@ -4,6 +4,8 @@
 
 from django.contrib import admin
 
-from dashboard.models import Result
+from dashboard.models import *
 
-admin.register(Result)
+admin.site.register(Result)
+admin.site.register(Vulnerability)
+admin.site.register(SoftwareInfo)
diff --git a/embark/dashboard/models.py b/embark/dashboard/models.py
index 2c1df10a..066218d8 100644
--- a/embark/dashboard/models.py
+++ b/embark/dashboard/models.py
@@ -19,7 +19,7 @@ class Vulnerability(models.Model):
 
 class SoftwareInfo(models.Model):
     """
-    Many-to-many object for SBOM
+    Many-to-many object for SBOM entries
     """
     id = models.UUIDField(primary_key=True, default=uuid.uuid4)
     name = models.CharField(verbose_name="software name", blank=False, editable=True, default="NA", max_length=256)
diff --git a/embark/uploader/admin.py b/embark/uploader/admin.py
index 14a7187d..d2795598 100644
--- a/embark/uploader/admin.py
+++ b/embark/uploader/admin.py
@@ -4,6 +4,8 @@
 
 from django.contrib import admin
 
-from uploader.models import FirmwareAnalysis
+from uploader.models import FirmwareAnalysis, FirmwareFile, Device
 
 admin.site.register(FirmwareAnalysis)
+admin.site.register(Device)
+admin.site.register(FirmwareFile)

From d6f153f5ec4efeac87e4df820c5786dc0ace0985 Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Mon, 4 Nov 2024 08:18:52 +0000
Subject: [PATCH 14/23] emba install flag in .env

---
 dev-tools/debug-server-start.sh | 10 ++++++----
 installer.sh                    |  5 +++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dev-tools/debug-server-start.sh b/dev-tools/debug-server-start.sh
index 9c302a2c..2d50a0c9 100755
--- a/dev-tools/debug-server-start.sh
+++ b/dev-tools/debug-server-start.sh
@@ -91,10 +91,12 @@ if [[ "${WSL}" -eq 1 ]]; then
 fi
 
 # check emba
-echo -e "${BLUE}""${BOLD}""checking EMBA""${NC}"
-if ! (cd ./emba && ./emba -d 1) ; then
-  echo -e "${RED}""EMBA is not configured correctly""${NC}"
-  exit 1
+if ! grep -q "EMBA_INSTALL=no" ./.env ; then
+  echo -e "${BLUE}""${BOLD}""checking EMBA""${NC}"
+  if ! (cd ./emba && ./emba -d 1) ; then
+    echo -e "${RED}""EMBA is not configured correctly""${NC}"
+    exit 1
+  fi
 fi
 
 check_db
diff --git a/installer.sh b/installer.sh
index c524384a..5ab3c05b 100755
--- a/installer.sh
+++ b/installer.sh
@@ -721,10 +721,15 @@ if [[ "${NO_EMBA}" -eq 0 ]]; then
   # use git or release
   if [[ "${NO_GIT}" -eq 1 ]]; then
     install_emba_src
+    echo "EMBA_INSTALL=src" >> .env
   else
     install_emba
+    echo "EMBA_INSTALL=git" >> .env
   fi
 fi
+if [[ "${NO_EMBA}" -eq 1 ]]; then
+  echo "EMBA_INSTALL=no" >> .env
+fi
 if [[ "${EMBA_ONLY}" -eq 1 ]]; then
   exit 0
 fi

From e5063b980ebc9ae22b4eaf2c3d433684a038d975 Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Mon, 4 Nov 2024 08:20:30 +0000
Subject: [PATCH 15/23] rm wildcard

---
 embark/dashboard/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/embark/dashboard/admin.py b/embark/dashboard/admin.py
index b14cd423..04580f52 100644
--- a/embark/dashboard/admin.py
+++ b/embark/dashboard/admin.py
@@ -4,7 +4,7 @@
 
 from django.contrib import admin
 
-from dashboard.models import *
+from dashboard.models import Result, Vulnerability, SoftwareInfo
 
 admin.site.register(Result)
 admin.site.register(Vulnerability)

From 26c56d972c96ef3f73741f20d705242efcb4b575 Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Wed, 6 Nov 2024 13:24:11 +0000
Subject: [PATCH 16/23] add retry for readin

---
 embark/dashboard/models.py          |  9 ++++--
 embark/embark/asgi.py               |  2 +-
 embark/embark/wsgi.py               |  2 +-
 embark/manage.py                    |  2 +-
 embark/porter/forms.py              |  4 +++
 embark/porter/importer.py           | 47 +++++++++++++++++------------
 embark/porter/urls.py               |  4 +--
 embark/porter/views.py              | 41 +++++++++++++++++++++++--
 embark/templates/porter/import.html |  1 +
 embark/templates/porter/retry.html  | 18 +++++++++++
 10 files changed, 100 insertions(+), 30 deletions(-)
 create mode 100644 embark/templates/porter/retry.html

diff --git a/embark/dashboard/models.py b/embark/dashboard/models.py
index 066218d8..be3052c6 100644
--- a/embark/dashboard/models.py
+++ b/embark/dashboard/models.py
@@ -21,14 +21,17 @@ class SoftwareInfo(models.Model):
     """
     Many-to-many object for SBOM entries
     """
-    id = models.UUIDField(primary_key=True, default=uuid.uuid4)
+    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=True)
+    type = models.CharField(verbose_name="type of blob", blank=False, editable=True, default="NA", max_length=256)
     name = models.CharField(verbose_name="software name", blank=False, editable=True, default="NA", max_length=256)
+    group = models.CharField(verbose_name="grouping", blank=False, editable=True, default="NA", max_length=256)
     version = models.CharField(verbose_name="software version", blank=False, editable=True, default="1.0", max_length=32)
-    hash = models.CharField(verbose_name="identivication hash", blank=False, editable=True, default="NA", max_length=1024)
+    hashes = models.CharField(verbose_name="identivication hash", blank=False, editable=True, default="NA", max_length=1024)
     cpe = models.CharField(verbose_name="CPE identifier", blank=False, editable=True, default="NA", max_length=256)
     type = models.CharField(verbose_name="software type", blank=False, editable=True, default="data", max_length=50)
     purl = models.CharField(verbose_name="PUrl identifier", blank=False, editable=True, default="NA", max_length=256)
-    details = models.JSONField(null=True)
+    description = models.CharField(verbose_name="description", blank=False, editable=True, default="NA", max_length=1024)
+    properties = models.JSONField(null=True, editable=True)
 
 
 class Result(models.Model):
diff --git a/embark/embark/asgi.py b/embark/embark/asgi.py
index 878a8389..f227b603 100644
--- a/embark/embark/asgi.py
+++ b/embark/embark/asgi.py
@@ -22,7 +22,7 @@
 
 from embark.routing import ws_urlpatterns
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'embark.settings.dev')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'embark.settings.deploy')
 
 
 application = ProtocolTypeRouter({
diff --git a/embark/embark/wsgi.py b/embark/embark/wsgi.py
index f4021295..3f78c856 100644
--- a/embark/embark/wsgi.py
+++ b/embark/embark/wsgi.py
@@ -14,6 +14,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'embark.settings.dev')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'embark.settings.deploy')
 
 application = get_wsgi_application()
diff --git a/embark/manage.py b/embark/manage.py
index 1b1aa9a8..582ed7e7 100755
--- a/embark/manage.py
+++ b/embark/manage.py
@@ -7,7 +7,7 @@
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'embark.settings.dev')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'embark.settings.deploy')
 
     try:
         # pylint: disable=import-outside-toplevel
diff --git a/embark/porter/forms.py b/embark/porter/forms.py
index 67a25a0d..c5b698ff 100644
--- a/embark/porter/forms.py
+++ b/embark/porter/forms.py
@@ -27,3 +27,7 @@ class FirmwareAnalysisExportForm(forms.Form):
 
 class DeleteZipForm(forms.Form):
     zip_file = forms.ModelChoiceField(queryset=LogZipFile.objects, empty_label='Select zip-file to delete')
+
+
+class RetryImportForm(forms.Form):
+    analysis = forms.ModelChoiceField(queryset=FirmwareAnalysis.objects.filter(failed=True))
diff --git a/embark/porter/importer.py b/embark/porter/importer.py
index 7b58ea08..c4753f59 100644
--- a/embark/porter/importer.py
+++ b/embark/porter/importer.py
@@ -29,8 +29,6 @@ def result_read_in(analysis_id):
     res = None
     csv_directory = f"{settings.EMBA_LOG_ROOT}/{analysis_id}/emba_logs/csv_logs/"
     csv_list = [os.path.join(csv_directory, file_) for file_ in os.listdir(csv_directory)]
-    json_directory = f"{settings.EMBA_LOG_ROOT}/{analysis_id}/emba_logs/json_logs/"
-    json_list = [os.path.join(json_directory, file_) for file_ in os.listdir(json_directory)]
     for file_ in csv_list:
         logger.debug("trying to read: %s", file_)
         if os.path.isfile(file_):      # TODO change check. > if valid EMBA csv file
@@ -43,15 +41,20 @@ def result_read_in(analysis_id):
                 # FIXME f20 in emba is broken!
                 # res = f20_csv(file_, analysis_id)
                 # logger.debug("Result for %s created or updated", analysis_id)
-    for file_ in json_list:
-        logger.debug("trying to read: %s", file_)
-        if os.path.isfile(file_):      # TODO change check. > if valid EMBA json file
-            logger.debug("File %s found and attempting to read", file_)
-            if file_.endswith('f15_cyclonedx_sbom.json'):
-                logger.info("f15 readin for %s skipped", analysis_id)
-                # f21_cyclonedx_sbom_json.json move into db object
-                res = f15_json(file_, analysis_id)
-        # TODO license info etc
+    # json_directory = f"{settings.EMBA_LOG_ROOT}/{analysis_id}/emba_logs/json_logs/"
+    # json_list = [os.path.join(json_directory, file_) for file_ in os.listdir(json_directory)]
+    # for file_ in json_list:
+    #     logger.debug("trying to read: %s", file_)
+    #     if os.path.isfile(file_):      # TODO change check. > if valid EMBA json file
+    #         logger.debug("File %s found and attempting to read", file_)
+    #         if file_.endswith('f15_cyclonedx_sbom.json'):
+    #             logger.info("f15 readin for %s skipped", analysis_id)
+    #             # f21_cyclonedx_sbom_json.json move into db object
+    #             res = f15_json(file_, analysis_id)
+    sbom_file = f"{settings.EMBA_LOG_ROOT}/{analysis_id}/emba_logs/SBOM/EMBA_cyclonedx_sbom.json"
+    if os.path.isfile(sbom_file):
+        logger.debug("File %s found and attempting to read", sbom_file)
+        res = f15_json(sbom_file, analysis_id)
     return res
 
 
@@ -214,23 +217,27 @@ def f15_json(_file_path, _analysis_id):
     )
     with open(_file_path, 'r', encoding='utf-8') as f15_json_file:
         f15_data = json.load(f15_json_file)
-        for component_ in f15_data.components:
+        for component_ in f15_data['components']:
+            logger.debug("Component is %s", component_)
             try:
                 new_sbom, add_ = SoftwareInfo.objects.update_or_create(
-                    name=component_.name,
-                    version=component_.version,
-                    hashes=component_.hashes,
-                    cpe=component_.cpe,
-                    type=component_.type,
-                    purl=component_.purl,
-                    details=component_
+                    id=component_['bom-ref'],
+                    name=component_['name'],
+                    type=component_['type'],
+                    group=component_['group'] or 'NA',
+                    version=component_['version'] or 'NA',
+                    hashes=component_['hashes'],
+                    cpe=component_['cpe'] or 'NA',
+                    purl=component_['purl'] or 'NA',
+                    description=component_['description'] or 'NA',
+                    properties=component_['properties'] or 'NA'
                 )
+                logger.debug("Was new? %s", add_)
                 logger.debug("Adding SBOM item: %s to res %s", new_sbom, res)
                 if add_:
                     res.sbom.add(new_sbom)
             except builtins.Exception as error_:
                 logger.error("Error in f15 readin: %s", error_)
-                logger.error("Component is %s ; Was new? %s", component_, add_)
     logger.debug("read f15 json done")
     return res
 
diff --git a/embark/porter/urls.py b/embark/porter/urls.py
index da9e31ae..82f07104 100644
--- a/embark/porter/urls.py
+++ b/embark/porter/urls.py
@@ -16,7 +16,7 @@
 
     path('export/', views.export_menu, name='embark-export-menu'),
     path('export/download/', views.export_analysis, name='embark-export-analysis'),
-    path('export/zip/<uuid:analysis_id>/', views.make_zip, name='embark-make-zip')
-
+    path('export/zip/<uuid:analysis_id>/', views.make_zip, name='embark-make-zip'),
 
+    path('retry-import/', views.retry_import, name='embark-retry-import'),
 ]
diff --git a/embark/porter/views.py b/embark/porter/views.py
index dc043546..a8d992d5 100644
--- a/embark/porter/views.py
+++ b/embark/porter/views.py
@@ -19,8 +19,9 @@
 from uploader.forms import DeviceForm, LabelForm, VendorForm
 from uploader.models import FirmwareAnalysis
 from porter.exporter import result_json
+from porter.importer import result_read_in
 from porter.models import LogZipFile
-from porter.forms import FirmwareAnalysisImportForm, FirmwareAnalysisExportForm, DeleteZipForm
+from porter.forms import FirmwareAnalysisImportForm, FirmwareAnalysisExportForm, DeleteZipForm, RetryImportForm
 
 
 logger = logging.getLogger(__name__)
@@ -30,6 +31,7 @@
 @login_required(login_url='/' + settings.LOGIN_URL)
 @require_http_methods(["GET"])
 def import_menu(request):
+    retry_form = RetryImportForm()
     import_read_form = FirmwareAnalysisImportForm()
     device_form = DeviceForm()
     vendor_form = VendorForm()
@@ -38,7 +40,7 @@ def import_menu(request):
         delete_form = DeleteZipForm(initial={'zip-file': LogZipFile.objects.latest('upload_date')})
     else:
         delete_form = DeleteZipForm()
-    return render(request, 'porter/import.html', {'import_read_form': import_read_form, 'device_form': device_form, 'vendor_form': vendor_form, 'label_form': label_form, 'delete_form': delete_form})
+    return render(request, 'porter/import.html', {'import_read_form': import_read_form, 'device_form': device_form, 'vendor_form': vendor_form, 'label_form': label_form, 'delete_form': delete_form, 'retry_form': retry_form})
 
 
 @login_required(login_url='/' + settings.LOGIN_URL)
@@ -191,3 +193,38 @@ def make_zip(request, analysis_id):
     except FirmwareAnalysis.DoesNotExist:
         messages.error(request, 'No analysis with that id found')
     return redirect('embark-ReportDashboard')
+
+
+@login_required(login_url='/' + settings.LOGIN_URL)
+@require_http_methods(["POST"])
+def retry_import(request):
+    """
+    retry to read emba_log foler with the importer
+
+        returns:
+        messages, status
+    """
+    req_logger.info("%s requested with: %s", __name__, request)
+    form = RetryImportForm(request.POST)
+    if form.is_valid():
+        logger.debug("Posted Form is valid")
+        analysis = form.cleaned_data['analysis']
+        if analysis.user != request.user:
+            logger.error("Permission denied - %s", request)
+            messages.error(request, "You don't have permission")
+            return redirect('..')
+        # trying to re-import
+        logger.info("Importing analysis with %s", analysis.id)
+        # TODO
+        if result_read_in(analysis.id) is not None:
+            analysis.finished = True
+            analysis.failed = False
+            analysis.save(update_fields=["finished", "failed"])
+            # success
+            logger.info("Successfully submitted for re-import %s", analysis.id)
+            messages.info(request, 'import submitted for ' + str(analysis.id))
+            return redirect('..')
+        messages.error(request, 're-import failed')
+        return redirect('..')
+    messages.error(request, 'form invalid')
+    return HttpResponseBadRequest("invalid form")
diff --git a/embark/templates/porter/import.html b/embark/templates/porter/import.html
index 603dfaad..77f77a22 100644
--- a/embark/templates/porter/import.html
+++ b/embark/templates/porter/import.html
@@ -21,6 +21,7 @@
         </div>
         <div class="col-sm">
             {% block read %}{% include "porter/read.html" %}{% endblock read %}
+            {% block retry %}{% include "porter/retry.html" %}{% endblock retry %}
         </div>
 
     </div>
diff --git a/embark/templates/porter/retry.html b/embark/templates/porter/retry.html
new file mode 100644
index 00000000..d7712499
--- /dev/null
+++ b/embark/templates/porter/retry.html
@@ -0,0 +1,18 @@
+{% load django_bootstrap5 %}
+
+        <div class="col-sm">
+            <div class="box">
+                <p class="mainText">Retry-importing</p>
+                <p class="subText">Manually</p>
+
+                <form action="{% url 'embark-retry-import' %}" method="post" id="form">
+                    {% csrf_token %}
+                    <div class="innerBlock">
+                        {% load filters %}
+                        {% bootstrap_form retry_form %}
+                        {% bootstrap_button "Re-import" button_type="submit" button_class="btn-primary" %}
+                    </div>
+                </form>
+
+            </div>
+        </div>
\ No newline at end of file

From 8a05bf73c54c647f74037e3540868cceda348b71 Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Wed, 6 Nov 2024 14:02:05 +0000
Subject: [PATCH 17/23] fix wrong viewname

---
 embark/tracker/tables.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/embark/tracker/tables.py b/embark/tracker/tables.py
index 55dda9d8..f19fe02c 100644
--- a/embark/tracker/tables.py
+++ b/embark/tracker/tables.py
@@ -18,7 +18,7 @@ class Meta:
         orderable = True
 
     def render_id(self, value):
-        return format_html(f"<a href=\"{reverse(viewname='embark-tracker-sbom', args=[value])}\">{value}</a>")
+        return format_html(f"<a href=\"{reverse(viewname='embark-tracker-device', args=[value])}\">{value}</a>")
 
 
 class SimpleSBOMTable(tables.Table):
@@ -28,4 +28,4 @@ class Meta:
         orderable = True
 
     #  def render_id(self, value):
-    #      return format_html(f"<a href=\"{reverse(viewname='embark-tracker-device', args=[value])}\">{value}</a>")
+    #      return format_html(f"<a href=\"{reverse(viewname='embark-tracker-sbom', args=[value])}\">{value}</a>")

From bce522c03c35b33adc62147425f56b8af20e228e Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Thu, 7 Nov 2024 14:53:45 +0000
Subject: [PATCH 18/23] model changes from sbom

---
 embark/dashboard/models.py                    | 13 +++-
 embark/porter/importer.py                     | 62 +++++++++++--------
 embark/templates/tracker/device.html          |  2 +-
 .../tracker/{sbom.html => results.html}       |  4 +-
 embark/tracker/tables.py                      |  9 ++-
 embark/tracker/urls.py                        |  1 +
 embark/tracker/views.py                       | 22 ++++---
 7 files changed, 75 insertions(+), 38 deletions(-)
 rename embark/templates/tracker/{sbom.html => results.html} (79%)

diff --git a/embark/dashboard/models.py b/embark/dashboard/models.py
index be3052c6..bf3af3fb 100644
--- a/embark/dashboard/models.py
+++ b/embark/dashboard/models.py
@@ -19,7 +19,7 @@ class Vulnerability(models.Model):
 
 class SoftwareInfo(models.Model):
     """
-    Many-to-many object for SBOM entries
+    Many-to-one object for SBOM entries
     """
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=True)
     type = models.CharField(verbose_name="type of blob", blank=False, editable=True, default="NA", max_length=256)
@@ -34,6 +34,15 @@ class SoftwareInfo(models.Model):
     properties = models.JSONField(null=True, editable=True)
 
 
+class SoftwareBillOfMaterial(models.Model):
+    """
+    1-to-1 object for result
+    """
+    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=True)
+    meta = models.CharField(verbose_name="meta data sbom", blank=False, editable=True, default="NA", max_length=1024)
+    component = models.ManyToManyField(SoftwareInfo, help_text='Software Bill of Material', related_query_name='sbom', editable=True, blank=True)
+
+
 class Result(models.Model):
     """
     1-to-1 Result object for related FirmwareAnalysis
@@ -89,4 +98,4 @@ class Result(models.Model):
     system_bin = models.TextField(default='{}')
 
     vulnerability = models.ManyToManyField(Vulnerability, help_text='CVE/Vulnerability', related_query_name='CVE', editable=True, blank=True)
-    sbom = models.ManyToManyField(SoftwareInfo, help_text='Software Bill of Material', related_query_name='sbom', editable=True, blank=True)
+    sbom = models.OneToOneField(SoftwareBillOfMaterial, help_text='Software Bill of Material', related_query_name='sbom', editable=True, blank=True, on_delete=models.CASCADE, null=True)
diff --git a/embark/porter/importer.py b/embark/porter/importer.py
index c4753f59..108ad5a0 100644
--- a/embark/porter/importer.py
+++ b/embark/porter/importer.py
@@ -14,7 +14,7 @@
 
 from django.conf import settings
 
-from dashboard.models import SoftwareInfo, Vulnerability, Result
+from dashboard.models import SoftwareBillOfMaterial, SoftwareInfo, Vulnerability, Result
 from uploader.models import FirmwareAnalysis
 
 logger = logging.getLogger(__name__)
@@ -212,32 +212,44 @@ def f15_json(_file_path, _analysis_id):
     SBOM json
     """
     logger.debug("starting f15 json import")
-    res, _ = Result.objects.get_or_create(
-        firmware_analysis=FirmwareAnalysis.objects.get(id=_analysis_id)
-    )
     with open(_file_path, 'r', encoding='utf-8') as f15_json_file:
         f15_data = json.load(f15_json_file)
-        for component_ in f15_data['components']:
-            logger.debug("Component is %s", component_)
-            try:
-                new_sbom, add_ = SoftwareInfo.objects.update_or_create(
-                    id=component_['bom-ref'],
-                    name=component_['name'],
-                    type=component_['type'],
-                    group=component_['group'] or 'NA',
-                    version=component_['version'] or 'NA',
-                    hashes=component_['hashes'],
-                    cpe=component_['cpe'] or 'NA',
-                    purl=component_['purl'] or 'NA',
-                    description=component_['description'] or 'NA',
-                    properties=component_['properties'] or 'NA'
-                )
-                logger.debug("Was new? %s", add_)
-                logger.debug("Adding SBOM item: %s to res %s", new_sbom, res)
-                if add_:
-                    res.sbom.add(new_sbom)
-            except builtins.Exception as error_:
-                logger.error("Error in f15 readin: %s", error_)
+        sbom_obj, add_sbom = SoftwareBillOfMaterial.objects.get_or_create(
+            id=f15_data['serialNumber'] #TODO grep uuid from this: "urn:uuid:f601dc24-7ba9-4821-b398-a30c59f7775e"
+        )
+        if add_sbom:
+            res, _ = Result.objects.get_or_create(
+                firmware_analysis=FirmwareAnalysis.objects.get(id=_analysis_id),
+                sbom=add_sbom
+            )
+        else:
+            for component_ in f15_data['components']:
+                logger.debug("Component is %s", component_)
+                try:
+                    new_sitem, add_sitem = SoftwareInfo.objects.update_or_create(
+                        id=component_['bom-ref'],
+                        name=component_['name'],
+                        type=component_['type'],
+                        group=component_['group'] or 'NA',
+                        version=component_['version'] or 'NA',
+                        hashes=component_['hashes'],
+                        cpe=component_['cpe'] or 'NA',
+                        purl=component_['purl'] or 'NA',
+                        description=component_['description'] or 'NA',
+                        properties=component_['properties'] or 'NA'
+                    )
+                    logger.debug("Was new? %s", add_sitem)
+                    logger.debug("Adding SBOM item: %s to sbom %s", new_sitem, sbom_obj)
+                    if add_sitem:
+                        sbom_obj.add(add_sitem)
+                    else:
+                        sbom_obj.add(new_sitem)
+                except builtins.Exception as error_:
+                    logger.error("Error in f15 readin: %s", error_)
+            res, _ = Result.objects.get_or_create(
+                firmware_analysis=FirmwareAnalysis.objects.get(id=_analysis_id),
+                sbom=sbom_obj
+            )
     logger.debug("read f15 json done")
     return res
 
diff --git a/embark/templates/tracker/device.html b/embark/templates/tracker/device.html
index 54330970..fd40556a 100644
--- a/embark/templates/tracker/device.html
+++ b/embark/templates/tracker/device.html
@@ -34,7 +34,7 @@
   {% endfor %}
 
 </div>
-
+{% block sbom %}{% include "tracker/results.html" %}{% endblock sbom%}
 <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center mx-auto border-bottom">
     <h1 class="h2">Device tracker</h1>
     <div class="btn-toolbar mx-auto">
diff --git a/embark/templates/tracker/sbom.html b/embark/templates/tracker/results.html
similarity index 79%
rename from embark/templates/tracker/sbom.html
rename to embark/templates/tracker/results.html
index c3aa4791..e62751a1 100644
--- a/embark/templates/tracker/sbom.html
+++ b/embark/templates/tracker/results.html
@@ -2,8 +2,8 @@
 This renders a interactive SBOM table for the device -->
 <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-top">
     <div class="justify-content-between flex-wrap flex-md-nowrap align-items-center mx-auto">
-        <h2>SBOM - PUT VERSION of device here</h2>
+        <h2>Results</h2>
         {% load django_tables2 %}
-        {% render_table table %}
+        {% render_table result_table %}
     </div>
 </div>
\ No newline at end of file
diff --git a/embark/tracker/tables.py b/embark/tracker/tables.py
index f19fe02c..25dd6bbd 100644
--- a/embark/tracker/tables.py
+++ b/embark/tracker/tables.py
@@ -7,7 +7,7 @@
 from django.utils.html import format_html
 from django.urls import reverse
 
-from dashboard.models import SoftwareInfo
+from dashboard.models import Result, SoftwareInfo
 from uploader.models import Device
 
 
@@ -29,3 +29,10 @@ class Meta:
 
     #  def render_id(self, value):
     #      return format_html(f"<a href=\"{reverse(viewname='embark-tracker-sbom', args=[value])}\">{value}</a>")
+
+
+class SimpleResultTable(tables.Table):
+
+    class Meta:
+        model = Result
+        orderable = True
diff --git a/embark/tracker/urls.py b/embark/tracker/urls.py
index 6e27a079..7bbeb799 100644
--- a/embark/tracker/urls.py
+++ b/embark/tracker/urls.py
@@ -12,6 +12,7 @@
     path('tracker/', views.tracker, name='embark-tracker'),
     # path('tracker/<time_delta:time>/', views.tracker, name='embark-tracker-time'),
     path('tracker/device/<int:device_id>/', views.get_report_for_device, name='embark-tracker-device'),
+    path('tracker/device/<int:device_id>/sbom/<int:result_id>', views.get_sbom_for_device, name='embark-tracker-sbom'),
     path('tracker/device/<int:device_id>/toggle', views.toggle_device_visible, name='embark-tracker-device-visible'),
     # path('tracker/vendor/<str:vendor_name>/', views.get_report_for_vendor, name='embark-tracker-vendor'),
     path('tracker/associate/<uuid:analysis_id>', views.set_associate_device_to, name='embark-tracker-ass')
diff --git a/embark/tracker/views.py b/embark/tracker/views.py
index c238373d..3dec4c58 100644
--- a/embark/tracker/views.py
+++ b/embark/tracker/views.py
@@ -18,7 +18,7 @@
 from dashboard.models import Result
 from embark.helper import rnd_rgb_color, rnd_rgb_full
 from uploader.models import FirmwareAnalysis, Device, Vendor
-from tracker.tables import SimpleDeviceTable, SimpleSBOMTable
+from tracker.tables import SimpleDeviceTable, SimpleResultTable, SimpleSBOMTable
 from tracker.forms import AssociateForm, TimeForm
 
 logger = logging.getLogger(__name__)
@@ -73,12 +73,12 @@ def tracker(request):
     return redirect('embark-uploader-home')
 
 
-@require_http_methods(["GET"])
+@require_http_methods(["GET", "POST"])
 @login_required(login_url='/' + settings.LOGIN_URL)
 def get_report_for_device(request, device_id):
     if Device.objects.filter(id=device_id).exists():
         device = Device.objects.get(id=device_id)
-        analysis_queryset = FirmwareAnalysis.objects.filter(device=device)  # TODO uhm Q working? and add user check
+        analysis_queryset = FirmwareAnalysis.objects.filter(device=device, failed=False)  # TODO uhm Q working? and add user check
         label_list = [
             'strcpy',
             'cve_high',
@@ -118,16 +118,24 @@ def get_report_for_device(request, device_id):
             dataset['pointHoverBackgroundColor'] = '#fff'
             dataset['pointHoverBorderColor'] = rnd_rgb_color()
             data.append(dataset)
-        # sbom table
-        sbom_table = SimpleSBOMTable(data=result_queryset.sbom, template_name="django_tables2/bootstrap-responsive.html")
-        RequestConfig(request).configure(sbom_table)
+
+        result_queryset = Result.objects.filter(firmware_analysis__in=analysis_queryset)
+        if result_queryset:
+            result_table = SimpleResultTable(data=analysis_queryset.all(), template_name="django_tables2/bootstrap-responsive.html")
+            RequestConfig(request).configure(result_table)
         logger.debug("tracker/device data: %s", str(data))
-        return render(request=request, template_name='tracker/device.html', context={'username': request.user.username, 'device_id': device_id, 'device': device, 'labels': label_list, 'data': data})
+        return render(request=request, template_name='tracker/device.html', context={'username': request.user.username, 'device_id': device_id, 'device': device, 'labels': label_list, 'data': data, 'result_table': result_table})
     logger.error("device id nonexistent: %s", device_id)
     logger.error("could  not get template - %s", request)
     return HttpResponseBadRequest("Bad Request")
 
 
+@require_http_methods(["GET"])
+@login_required(login_url='/' + settings.LOGIN_URL)
+def get_sbom_for_device(request, device_id, result_id):
+    pass    # TODO 
+
+
 @require_http_methods(["GET"])
 @login_required(login_url='/' + settings.LOGIN_URL)
 def tracker_time(request, time):

From 2ce6c15e15be473c3794b3a8652e63c56f6c1828 Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Fri, 8 Nov 2024 13:56:23 +0000
Subject: [PATCH 19/23] some fixes and updates add sbom to admin

---
 embark/dashboard/admin.py             |  3 ++-
 embark/dashboard/models.py            |  2 ++
 embark/porter/importer.py             | 26 +++++++++-----------------
 embark/templates/tracker/device.html  |  2 +-
 embark/templates/tracker/results.html |  2 +-
 embark/templates/tracker/sbom.html    | 25 +++++++++++++++++++++++++
 embark/tracker/forms.py               |  1 +
 embark/tracker/tables.py              |  8 ++++++--
 embark/tracker/urls.py                |  2 +-
 embark/tracker/views.py               | 17 ++++++++++++++---
 embark/uploader/models.py             |  2 +-
 11 files changed, 63 insertions(+), 27 deletions(-)
 create mode 100644 embark/templates/tracker/sbom.html

diff --git a/embark/dashboard/admin.py b/embark/dashboard/admin.py
index 04580f52..4ecce3fb 100644
--- a/embark/dashboard/admin.py
+++ b/embark/dashboard/admin.py
@@ -4,8 +4,9 @@
 
 from django.contrib import admin
 
-from dashboard.models import Result, Vulnerability, SoftwareInfo
+from dashboard.models import Result, Vulnerability, SoftwareInfo, SoftwareBillOfMaterial
 
 admin.site.register(Result)
 admin.site.register(Vulnerability)
 admin.site.register(SoftwareInfo)
+admin.site.register(SoftwareBillOfMaterial)
diff --git a/embark/dashboard/models.py b/embark/dashboard/models.py
index bf3af3fb..d5f291d1 100644
--- a/embark/dashboard/models.py
+++ b/embark/dashboard/models.py
@@ -5,6 +5,7 @@
 import uuid
 from django.db import models
 from django.core.validators import MinLengthValidator
+from django.utils import timezone
 
 from uploader.models import FirmwareAnalysis
 
@@ -51,6 +52,7 @@ class Result(models.Model):
     firmware_analysis = models.OneToOneField(FirmwareAnalysis, on_delete=models.CASCADE, primary_key=True)
     emba_command = models.CharField(blank=True, null=True, max_length=(FirmwareAnalysis.MAX_LENGTH * 6), help_text='')
     restricted = models.BooleanField(default=False, help_text='')
+    date = models.DateTimeField(default=timezone.now, blank=True)
 
     # base identifier
     os_verified = models.CharField(blank=True, null=True, max_length=256, help_text='')
diff --git a/embark/porter/importer.py b/embark/porter/importer.py
index 108ad5a0..554bb489 100644
--- a/embark/porter/importer.py
+++ b/embark/porter/importer.py
@@ -214,15 +214,10 @@ def f15_json(_file_path, _analysis_id):
     logger.debug("starting f15 json import")
     with open(_file_path, 'r', encoding='utf-8') as f15_json_file:
         f15_data = json.load(f15_json_file)
-        sbom_obj, add_sbom = SoftwareBillOfMaterial.objects.get_or_create(
-            id=f15_data['serialNumber'] #TODO grep uuid from this: "urn:uuid:f601dc24-7ba9-4821-b398-a30c59f7775e"
-        )
-        if add_sbom:
-            res, _ = Result.objects.get_or_create(
-                firmware_analysis=FirmwareAnalysis.objects.get(id=_analysis_id),
-                sbom=add_sbom
-            )
-        else:
+        sbom_uuid = f15_data['serialNumber'].split(":")[2]
+        logger.debug("Reading sbom uuid=%s", sbom_uuid)
+        sbom_obj, add_sbom = SoftwareBillOfMaterial.objects.get_or_create(id=sbom_uuid)
+        if not add_sbom:
             for component_ in f15_data['components']:
                 logger.debug("Component is %s", component_)
                 try:
@@ -240,16 +235,13 @@ def f15_json(_file_path, _analysis_id):
                     )
                     logger.debug("Was new? %s", add_sitem)
                     logger.debug("Adding SBOM item: %s to sbom %s", new_sitem, sbom_obj)
-                    if add_sitem:
-                        sbom_obj.add(add_sitem)
-                    else:
-                        sbom_obj.add(new_sitem)
+                    sbom_obj.component.add(new_sitem)
                 except builtins.Exception as error_:
                     logger.error("Error in f15 readin: %s", error_)
-            res, _ = Result.objects.get_or_create(
-                firmware_analysis=FirmwareAnalysis.objects.get(id=_analysis_id),
-                sbom=sbom_obj
-            )
+        res, _ = Result.objects.get_or_create(
+            firmware_analysis=FirmwareAnalysis.objects.get(id=_analysis_id),
+            sbom=sbom_obj
+        )
     logger.debug("read f15 json done")
     return res
 
diff --git a/embark/templates/tracker/device.html b/embark/templates/tracker/device.html
index fd40556a..4b53ac64 100644
--- a/embark/templates/tracker/device.html
+++ b/embark/templates/tracker/device.html
@@ -35,6 +35,7 @@
 
 </div>
 {% block sbom %}{% include "tracker/results.html" %}{% endblock sbom%}
+
 <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center mx-auto border-bottom">
     <h1 class="h2">Device tracker</h1>
     <div class="btn-toolbar mx-auto">
@@ -48,7 +49,6 @@ <h1 class="h2">Device tracker</h1>
         </div>  
     </div>
 </div>
-
 <div class="mx-auto border-bottom">
   <canvas id="trackerChart" width="900" height="380"></canvas>
   <script>
diff --git a/embark/templates/tracker/results.html b/embark/templates/tracker/results.html
index e62751a1..86db82a0 100644
--- a/embark/templates/tracker/results.html
+++ b/embark/templates/tracker/results.html
@@ -1,5 +1,5 @@
 <!--
-This renders a interactive SBOM table for the device -->
+This renders a interactive result table for the device -->
 <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-top">
     <div class="justify-content-between flex-wrap flex-md-nowrap align-items-center mx-auto">
         <h2>Results</h2>
diff --git a/embark/templates/tracker/sbom.html b/embark/templates/tracker/sbom.html
new file mode 100644
index 00000000..6d3b2fde
--- /dev/null
+++ b/embark/templates/tracker/sbom.html
@@ -0,0 +1,25 @@
+{% load static %}
+{% load django_bootstrap5 %}
+
+{% block style %}<link rel="stylesheet" type="text/css" href="{% static 'content/css/tracker.css' %}"/>{% endblock style %}
+
+{% block title %}EMBArk tracker sbom{% endblock title %}
+{% block navigation %}{% include "navigation.html" %}{% endblock navigation %}
+{% block sidebar %}{% include "tracker/sidebar.html" %}{% endblock sidebar %}
+
+{% bootstrap_messages %}
+
+{% block maincontent %}
+<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center mx-auto border-bottom">
+  {% for label in device.label.all %}
+    <span class="badge rounded-pill bg-primary">{{ label|safe }}</span>
+  {% endfor %}
+
+</div><div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-top">
+    <div class="justify-content-between flex-wrap flex-md-nowrap align-items-center mx-auto">
+        <h2>SBOM</h2>
+        {% load django_tables2 %}
+        {% render_table sbom_table %}
+    </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/embark/tracker/forms.py b/embark/tracker/forms.py
index f270433a..0e9f84ff 100644
--- a/embark/tracker/forms.py
+++ b/embark/tracker/forms.py
@@ -6,6 +6,7 @@
 
 from django import forms
 
+from dashboard.models import Result
 from uploader.models import Device
 
 
diff --git a/embark/tracker/tables.py b/embark/tracker/tables.py
index 25dd6bbd..d1b8749d 100644
--- a/embark/tracker/tables.py
+++ b/embark/tracker/tables.py
@@ -7,7 +7,7 @@
 from django.utils.html import format_html
 from django.urls import reverse
 
-from dashboard.models import Result, SoftwareInfo
+from dashboard.models import Result, SoftwareBillOfMaterial
 from uploader.models import Device
 
 
@@ -24,7 +24,7 @@ def render_id(self, value):
 class SimpleSBOMTable(tables.Table):
 
     class Meta:
-        model = SoftwareInfo
+        model = SoftwareBillOfMaterial
         orderable = True
 
     #  def render_id(self, value):
@@ -36,3 +36,7 @@ class SimpleResultTable(tables.Table):
     class Meta:
         model = Result
         orderable = True
+    
+    def render_sbom(self, value):
+       return format_html(f"<a href=\"{reverse(viewname='embark-tracker-sbom', args=[value])}\">{value}</a>")
+
diff --git a/embark/tracker/urls.py b/embark/tracker/urls.py
index 7bbeb799..535c1489 100644
--- a/embark/tracker/urls.py
+++ b/embark/tracker/urls.py
@@ -12,7 +12,7 @@
     path('tracker/', views.tracker, name='embark-tracker'),
     # path('tracker/<time_delta:time>/', views.tracker, name='embark-tracker-time'),
     path('tracker/device/<int:device_id>/', views.get_report_for_device, name='embark-tracker-device'),
-    path('tracker/device/<int:device_id>/sbom/<int:result_id>', views.get_sbom_for_device, name='embark-tracker-sbom'),
+    path('tracker/sbom/<uuid:sbom_id>', views.get_sbom, name='embark-tracker-sbom'),
     path('tracker/device/<int:device_id>/toggle', views.toggle_device_visible, name='embark-tracker-device-visible'),
     # path('tracker/vendor/<str:vendor_name>/', views.get_report_for_vendor, name='embark-tracker-vendor'),
     path('tracker/associate/<uuid:analysis_id>', views.set_associate_device_to, name='embark-tracker-ass')
diff --git a/embark/tracker/views.py b/embark/tracker/views.py
index 3dec4c58..ff0bdae3 100644
--- a/embark/tracker/views.py
+++ b/embark/tracker/views.py
@@ -12,16 +12,18 @@
 from django.shortcuts import redirect
 from django.contrib import messages
 from django.utils import timezone
+from django.core.exceptions import MultipleObjectsReturned
 
 from django_tables2 import RequestConfig
 
-from dashboard.models import Result
+from dashboard.models import Result, SoftwareBillOfMaterial
 from embark.helper import rnd_rgb_color, rnd_rgb_full
 from uploader.models import FirmwareAnalysis, Device, Vendor
 from tracker.tables import SimpleDeviceTable, SimpleResultTable, SimpleSBOMTable
 from tracker.forms import AssociateForm, TimeForm
 
 logger = logging.getLogger(__name__)
+req_logger = logging.getLogger("requests")
 
 
 @require_http_methods(["GET", "POST"])
@@ -132,8 +134,17 @@ def get_report_for_device(request, device_id):
 
 @require_http_methods(["GET"])
 @login_required(login_url='/' + settings.LOGIN_URL)
-def get_sbom_for_device(request, device_id, result_id):
-    pass    # TODO 
+def get_sbom(request, sbom_id):
+    req_logger.info("REquest from %s : %s", request.user, request)
+    try:
+        sbom_obj = SoftwareBillOfMaterial.objects.filter(id=sbom_id)
+        sbom_table = SimpleSBOMTable(data=sbom_obj, template_name="django_tables2/bootstrap-responsive.html")
+        RequestConfig(request).configure(sbom_table)
+    except MultipleObjectsReturned as multi_error:
+        messages.error(request, "wrong number of result objects %s ", multi_error)
+        sbom_table = None
+    logger.debug("Rendering sbom.html")
+    return render(request, "tracker/sbom.html", {'sbom_table': sbom_table})
 
 
 @require_http_methods(["GET"])
diff --git a/embark/uploader/models.py b/embark/uploader/models.py
index 1d745459..7bc7f48c 100644
--- a/embark/uploader/models.py
+++ b/embark/uploader/models.py
@@ -361,7 +361,7 @@ def get_flags(self):
 
         command = ""
         if self.version:
-            command = command + r" -X " + "\"" + re.sub(r"[^a-zA-Z0-9\.\-\_\ \+]+", "", str(self.version)) + "\""
+            command = command + r" -X " + "\"" + re.sub(r"[^a-zA-Z0-9\.\-\_\+]+", "", str(self.version)) + "\""
         if self.device:
             devices = self.device.all()
             logger.debug("get_flags - device - to dict query returns %s", devices)

From eae4bd84280855b5732b309c30350ed02aec9b1f Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Fri, 8 Nov 2024 14:47:40 +0000
Subject: [PATCH 20/23] lint fix

---
 embark/tracker/forms.py  | 1 -
 embark/tracker/tables.py | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/embark/tracker/forms.py b/embark/tracker/forms.py
index 0e9f84ff..f270433a 100644
--- a/embark/tracker/forms.py
+++ b/embark/tracker/forms.py
@@ -6,7 +6,6 @@
 
 from django import forms
 
-from dashboard.models import Result
 from uploader.models import Device
 
 
diff --git a/embark/tracker/tables.py b/embark/tracker/tables.py
index d1b8749d..9e483175 100644
--- a/embark/tracker/tables.py
+++ b/embark/tracker/tables.py
@@ -36,7 +36,6 @@ class SimpleResultTable(tables.Table):
     class Meta:
         model = Result
         orderable = True
-    
+
     def render_sbom(self, value):
        return format_html(f"<a href=\"{reverse(viewname='embark-tracker-sbom', args=[value])}\">{value}</a>")
-

From a6d42b86f89c056502585481e9234f843a8ab3f8 Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Fri, 8 Nov 2024 15:12:00 +0000
Subject: [PATCH 21/23] fix

---
 embark/tracker/tables.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/embark/tracker/tables.py b/embark/tracker/tables.py
index 9e483175..262748bd 100644
--- a/embark/tracker/tables.py
+++ b/embark/tracker/tables.py
@@ -38,4 +38,4 @@ class Meta:
         orderable = True
 
     def render_sbom(self, value):
-       return format_html(f"<a href=\"{reverse(viewname='embark-tracker-sbom', args=[value])}\">{value}</a>")
+        return format_html(f"<a href=\"{reverse(viewname='embark-tracker-sbom', args=[value])}\">{value}</a>")

From c58e97d51d9fa1b0a43a905e880f3bfa8635520f Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Tue, 12 Nov 2024 10:11:36 +0000
Subject: [PATCH 22/23] working sbom table

---
 embark/dashboard/models.py         |  2 +-
 embark/porter/importer.py          | 14 +++++++++-----
 embark/templates/tracker/sbom.html |  1 +
 embark/tracker/tables.py           | 22 ++++++++++++++++------
 embark/tracker/views.py            | 10 ++++++----
 embark/users/models.py             |  6 ++++++
 6 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/embark/dashboard/models.py b/embark/dashboard/models.py
index d5f291d1..cdde603d 100644
--- a/embark/dashboard/models.py
+++ b/embark/dashboard/models.py
@@ -32,7 +32,7 @@ class SoftwareInfo(models.Model):
     type = models.CharField(verbose_name="software type", blank=False, editable=True, default="data", max_length=50)
     purl = models.CharField(verbose_name="PUrl identifier", blank=False, editable=True, default="NA", max_length=256)
     description = models.CharField(verbose_name="description", blank=False, editable=True, default="NA", max_length=1024)
-    properties = models.JSONField(null=True, editable=True)
+    properties = models.JSONField(verbose_name="Properties", null=True, editable=True, serialize=True)
 
 
 class SoftwareBillOfMaterial(models.Model):
diff --git a/embark/porter/importer.py b/embark/porter/importer.py
index 554bb489..60667e76 100644
--- a/embark/porter/importer.py
+++ b/embark/porter/importer.py
@@ -13,6 +13,7 @@
 import re
 
 from django.conf import settings
+from django.db import DatabaseError
 
 from dashboard.models import SoftwareBillOfMaterial, SoftwareInfo, Vulnerability, Result
 from uploader.models import FirmwareAnalysis
@@ -54,7 +55,10 @@ def result_read_in(analysis_id):
     sbom_file = f"{settings.EMBA_LOG_ROOT}/{analysis_id}/emba_logs/SBOM/EMBA_cyclonedx_sbom.json"
     if os.path.isfile(sbom_file):
         logger.debug("File %s found and attempting to read", sbom_file)
-        res = f15_json(sbom_file, analysis_id)
+        try:
+            res = f15_json(sbom_file, analysis_id)
+        except DatabaseError as error:
+            logger.error("DB error in f15_json: %s", error, exc_info=1)
     return res
 
 
@@ -221,16 +225,15 @@ def f15_json(_file_path, _analysis_id):
             for component_ in f15_data['components']:
                 logger.debug("Component is %s", component_)
                 try:
-                    new_sitem, add_sitem = SoftwareInfo.objects.update_or_create(
+                    new_sitem, add_sitem = SoftwareInfo.objects.get_or_create(
                         id=component_['bom-ref'],
                         name=component_['name'],
                         type=component_['type'],
                         group=component_['group'] or 'NA',
                         version=component_['version'] or 'NA',
-                        hashes=component_['hashes'],
+                        hashes=[f"{key}:{value}" for key, value in component_['hashes']],
                         cpe=component_['cpe'] or 'NA',
                         purl=component_['purl'] or 'NA',
-                        description=component_['description'] or 'NA',
                         properties=component_['properties'] or 'NA'
                     )
                     logger.debug("Was new? %s", add_sitem)
@@ -240,8 +243,9 @@ def f15_json(_file_path, _analysis_id):
                     logger.error("Error in f15 readin: %s", error_)
         res, _ = Result.objects.get_or_create(
             firmware_analysis=FirmwareAnalysis.objects.get(id=_analysis_id),
-            sbom=sbom_obj
         )
+        res.sbom = sbom_obj
+        res.save()
     logger.debug("read f15 json done")
     return res
 
diff --git a/embark/templates/tracker/sbom.html b/embark/templates/tracker/sbom.html
index 6d3b2fde..8891c758 100644
--- a/embark/templates/tracker/sbom.html
+++ b/embark/templates/tracker/sbom.html
@@ -1,3 +1,4 @@
+{% extends "base.html" %}
 {% load static %}
 {% load django_bootstrap5 %}
 
diff --git a/embark/tracker/tables.py b/embark/tracker/tables.py
index 262748bd..9429260a 100644
--- a/embark/tracker/tables.py
+++ b/embark/tracker/tables.py
@@ -7,7 +7,7 @@
 from django.utils.html import format_html
 from django.urls import reverse
 
-from dashboard.models import Result, SoftwareBillOfMaterial
+from dashboard.models import Result, SoftwareInfo
 from uploader.models import Device
 
 
@@ -23,12 +23,21 @@ def render_id(self, value):
 
 class SimpleSBOMTable(tables.Table):
 
+    def render_properties(self, value, record):
+        return format_html(
+            '<button class="btn btn-primary" type="button" data-bs-toggle="collapse" data-bs-target="#collapsePoperties{}" aria-expanded="false" aria-controls="collapsePoperties{}" title="Show Properties {}">'
+            "show"
+            "</button>"
+            '<div class="collapse" id="collapsePoperties{}">'
+            '{}'
+            '</div', record.id, record.id, record.id, record.id, value
+        )
+    
+
     class Meta:
-        model = SoftwareBillOfMaterial
+        model = SoftwareInfo
         orderable = True
-
-    #  def render_id(self, value):
-    #      return format_html(f"<a href=\"{reverse(viewname='embark-tracker-sbom', args=[value])}\">{value}</a>")
+        fields = ("id", "name", "type", "version", "hashes", "cpe", "purl", "properties", )
 
 
 class SimpleResultTable(tables.Table):
@@ -36,6 +45,7 @@ class SimpleResultTable(tables.Table):
     class Meta:
         model = Result
         orderable = True
+        fields = ("firmware_analysis", "date", "vulnerability", "sbom_id", )
 
-    def render_sbom(self, value):
+    def render_sbom_id(self, value):
         return format_html(f"<a href=\"{reverse(viewname='embark-tracker-sbom', args=[value])}\">{value}</a>")
diff --git a/embark/tracker/views.py b/embark/tracker/views.py
index ff0bdae3..b446f368 100644
--- a/embark/tracker/views.py
+++ b/embark/tracker/views.py
@@ -7,7 +7,7 @@
 from django.conf import settings
 from django.shortcuts import render
 from django.http import HttpResponseBadRequest
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import login_required, permission_required
 from django.views.decorators.http import require_http_methods
 from django.shortcuts import redirect
 from django.contrib import messages
@@ -26,6 +26,7 @@
 req_logger = logging.getLogger("requests")
 
 
+@permission_required("user.non_minimal")
 @require_http_methods(["GET", "POST"])
 @login_required(login_url='/' + settings.LOGIN_URL)
 def tracker(request):
@@ -123,7 +124,7 @@ def get_report_for_device(request, device_id):
 
         result_queryset = Result.objects.filter(firmware_analysis__in=analysis_queryset)
         if result_queryset:
-            result_table = SimpleResultTable(data=analysis_queryset.all(), template_name="django_tables2/bootstrap-responsive.html")
+            result_table = SimpleResultTable(data=result_queryset.all(), template_name="django_tables2/bootstrap-responsive.html")
             RequestConfig(request).configure(result_table)
         logger.debug("tracker/device data: %s", str(data))
         return render(request=request, template_name='tracker/device.html', context={'username': request.user.username, 'device_id': device_id, 'device': device, 'labels': label_list, 'data': data, 'result_table': result_table})
@@ -137,8 +138,9 @@ def get_report_for_device(request, device_id):
 def get_sbom(request, sbom_id):
     req_logger.info("REquest from %s : %s", request.user, request)
     try:
-        sbom_obj = SoftwareBillOfMaterial.objects.filter(id=sbom_id)
-        sbom_table = SimpleSBOMTable(data=sbom_obj, template_name="django_tables2/bootstrap-responsive.html")
+        sbom_obj = SoftwareBillOfMaterial.objects.get(id=sbom_id)
+        sbom_table = SimpleSBOMTable(data=sbom_obj.component.all(), template_name="django_tables2/bootstrap-responsive.html")
+        logger.debug("Look at this sbmo table!: %s", sbom_table)
         RequestConfig(request).configure(sbom_table)
     except MultipleObjectsReturned as multi_error:
         messages.error(request, "wrong number of result objects %s ", multi_error)
diff --git a/embark/users/models.py b/embark/users/models.py
index aa81b9c5..5861742e 100644
--- a/embark/users/models.py
+++ b/embark/users/models.py
@@ -31,3 +31,9 @@ class User(AbstractUser):
     team = models.ManyToManyField(Team, blank=True, related_name='member_of_team')
     team_role = models.IntegerField(choices=Role.choices(), default=Role.VIEWER)
     is_active_member = models.BooleanField(default=True, help_text='Whether this team member is active or not')
+
+
+    class Meta:
+        permissions = (
+            ("non_minimal", "Can access more functionalities of embark"),
+        )

From 38901084f7453cdbdaea9bae5fcd929228db7420 Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Tue, 12 Nov 2024 10:59:42 +0000
Subject: [PATCH 23/23] prepare new version

---
 Pipfile.lock               | 1124 ++++++++++++++++++------------------
 VERSION.txt                |    2 +-
 dev-tools/update_pipenv.sh |    2 +-
 embark/tracker/tables.py   |    1 -
 embark/users/models.py     |    1 -
 5 files changed, 579 insertions(+), 551 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 9ad642be..60ef5cc9 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -34,11 +34,11 @@
         },
         "async-timeout": {
             "hashes": [
-                "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f",
-                "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028"
+                "sha256:39e3809566ff85354557ec2398b55e096c8364bacac9405a7a1fa429e77fe76c",
+                "sha256:d9321a7a3d5a6a5e187e824d2fa0793ce379a202935782d555d6e9d2735677d3"
             ],
             "markers": "python_full_version < '3.11.3'",
-            "version": "==4.0.3"
+            "version": "==5.0.1"
         },
         "attrs": {
             "hashes": [
@@ -66,84 +66,84 @@
         },
         "certifi": {
             "hashes": [
-                "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b",
-                "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"
+                "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8",
+                "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==2024.7.4"
+            "version": "==2024.8.30"
         },
         "cffi": {
             "hashes": [
-                "sha256:011aff3524d578a9412c8b3cfaa50f2c0bd78e03eb7af7aa5e0df59b158efb2f",
-                "sha256:0a048d4f6630113e54bb4b77e315e1ba32a5a31512c31a273807d0027a7e69ab",
-                "sha256:0bb15e7acf8ab35ca8b24b90af52c8b391690ef5c4aec3d31f38f0d37d2cc499",
-                "sha256:0d46ee4764b88b91f16661a8befc6bfb24806d885e27436fdc292ed7e6f6d058",
-                "sha256:0e60821d312f99d3e1569202518dddf10ae547e799d75aef3bca3a2d9e8ee693",
-                "sha256:0fdacad9e0d9fc23e519efd5ea24a70348305e8d7d85ecbb1a5fa66dc834e7fb",
-                "sha256:14b9cbc8f7ac98a739558eb86fabc283d4d564dafed50216e7f7ee62d0d25377",
-                "sha256:17c6d6d3260c7f2d94f657e6872591fe8733872a86ed1345bda872cfc8c74885",
-                "sha256:1a2ddbac59dc3716bc79f27906c010406155031a1c801410f1bafff17ea304d2",
-                "sha256:2404f3de742f47cb62d023f0ba7c5a916c9c653d5b368cc966382ae4e57da401",
-                "sha256:24658baf6224d8f280e827f0a50c46ad819ec8ba380a42448e24459daf809cf4",
-                "sha256:24aa705a5f5bd3a8bcfa4d123f03413de5d86e497435693b638cbffb7d5d8a1b",
-                "sha256:2770bb0d5e3cc0e31e7318db06efcbcdb7b31bcb1a70086d3177692a02256f59",
-                "sha256:331ad15c39c9fe9186ceaf87203a9ecf5ae0ba2538c9e898e3a6967e8ad3db6f",
-                "sha256:3aa9d43b02a0c681f0bfbc12d476d47b2b2b6a3f9287f11ee42989a268a1833c",
-                "sha256:41f4915e09218744d8bae14759f983e466ab69b178de38066f7579892ff2a555",
-                "sha256:4304d4416ff032ed50ad6bb87416d802e67139e31c0bde4628f36a47a3164bfa",
-                "sha256:435a22d00ec7d7ea533db494da8581b05977f9c37338c80bc86314bec2619424",
-                "sha256:45f7cd36186db767d803b1473b3c659d57a23b5fa491ad83c6d40f2af58e4dbb",
-                "sha256:48b389b1fd5144603d61d752afd7167dfd205973a43151ae5045b35793232aa2",
-                "sha256:4e67d26532bfd8b7f7c05d5a766d6f437b362c1bf203a3a5ce3593a645e870b8",
-                "sha256:516a405f174fd3b88829eabfe4bb296ac602d6a0f68e0d64d5ac9456194a5b7e",
-                "sha256:5ba5c243f4004c750836f81606a9fcb7841f8874ad8f3bf204ff5e56332b72b9",
-                "sha256:5bdc0f1f610d067c70aa3737ed06e2726fd9d6f7bfee4a351f4c40b6831f4e82",
-                "sha256:6107e445faf057c118d5050560695e46d272e5301feffda3c41849641222a828",
-                "sha256:6327b572f5770293fc062a7ec04160e89741e8552bf1c358d1a23eba68166759",
-                "sha256:669b29a9eca6146465cc574659058ed949748f0809a2582d1f1a324eb91054dc",
-                "sha256:6ce01337d23884b21c03869d2f68c5523d43174d4fc405490eb0091057943118",
-                "sha256:6d872186c1617d143969defeadac5a904e6e374183e07977eedef9c07c8953bf",
-                "sha256:6f76a90c345796c01d85e6332e81cab6d70de83b829cf1d9762d0a3da59c7932",
-                "sha256:70d2aa9fb00cf52034feac4b913181a6e10356019b18ef89bc7c12a283bf5f5a",
-                "sha256:7cbc78dc018596315d4e7841c8c3a7ae31cc4d638c9b627f87d52e8abaaf2d29",
-                "sha256:856bf0924d24e7f93b8aee12a3a1095c34085600aa805693fb7f5d1962393206",
-                "sha256:8a98748ed1a1df4ee1d6f927e151ed6c1a09d5ec21684de879c7ea6aa96f58f2",
-                "sha256:93a7350f6706b31f457c1457d3a3259ff9071a66f312ae64dc024f049055f72c",
-                "sha256:964823b2fc77b55355999ade496c54dde161c621cb1f6eac61dc30ed1b63cd4c",
-                "sha256:a003ac9edc22d99ae1286b0875c460351f4e101f8c9d9d2576e78d7e048f64e0",
-                "sha256:a0ce71725cacc9ebf839630772b07eeec220cbb5f03be1399e0457a1464f8e1a",
-                "sha256:a47eef975d2b8b721775a0fa286f50eab535b9d56c70a6e62842134cf7841195",
-                "sha256:a8b5b9712783415695663bd463990e2f00c6750562e6ad1d28e072a611c5f2a6",
-                "sha256:a9015f5b8af1bb6837a3fcb0cdf3b874fe3385ff6274e8b7925d81ccaec3c5c9",
-                "sha256:aec510255ce690d240f7cb23d7114f6b351c733a74c279a84def763660a2c3bc",
-                "sha256:b00e7bcd71caa0282cbe3c90966f738e2db91e64092a877c3ff7f19a1628fdcb",
-                "sha256:b50aaac7d05c2c26dfd50c3321199f019ba76bb650e346a6ef3616306eed67b0",
-                "sha256:b7b6ea9e36d32582cda3465f54c4b454f62f23cb083ebc7a94e2ca6ef011c3a7",
-                "sha256:bb9333f58fc3a2296fb1d54576138d4cf5d496a2cc118422bd77835e6ae0b9cb",
-                "sha256:c1c13185b90bbd3f8b5963cd8ce7ad4ff441924c31e23c975cb150e27c2bf67a",
-                "sha256:c3b8bd3133cd50f6b637bb4322822c94c5ce4bf0d724ed5ae70afce62187c492",
-                "sha256:c5d97162c196ce54af6700949ddf9409e9833ef1003b4741c2b39ef46f1d9720",
-                "sha256:c815270206f983309915a6844fe994b2fa47e5d05c4c4cef267c3b30e34dbe42",
-                "sha256:cab2eba3830bf4f6d91e2d6718e0e1c14a2f5ad1af68a89d24ace0c6b17cced7",
-                "sha256:d1df34588123fcc88c872f5acb6f74ae59e9d182a2707097f9e28275ec26a12d",
-                "sha256:d6bdcd415ba87846fd317bee0774e412e8792832e7805938987e4ede1d13046d",
-                "sha256:db9a30ec064129d605d0f1aedc93e00894b9334ec74ba9c6bdd08147434b33eb",
-                "sha256:dbc183e7bef690c9abe5ea67b7b60fdbca81aa8da43468287dae7b5c046107d4",
-                "sha256:dca802c8db0720ce1c49cce1149ff7b06e91ba15fa84b1d59144fef1a1bc7ac2",
-                "sha256:dec6b307ce928e8e112a6bb9921a1cb00a0e14979bf28b98e084a4b8a742bd9b",
-                "sha256:df8bb0010fdd0a743b7542589223a2816bdde4d94bb5ad67884348fa2c1c67e8",
-                "sha256:e4094c7b464cf0a858e75cd14b03509e84789abf7b79f8537e6a72152109c76e",
-                "sha256:e4760a68cab57bfaa628938e9c2971137e05ce48e762a9cb53b76c9b569f1204",
-                "sha256:eb09b82377233b902d4c3fbeeb7ad731cdab579c6c6fda1f763cd779139e47c3",
-                "sha256:eb862356ee9391dc5a0b3cbc00f416b48c1b9a52d252d898e5b7696a5f9fe150",
-                "sha256:ef9528915df81b8f4c7612b19b8628214c65c9b7f74db2e34a646a0a2a0da2d4",
-                "sha256:f3157624b7558b914cb039fd1af735e5e8049a87c817cc215109ad1c8779df76",
-                "sha256:f3e0992f23bbb0be00a921eae5363329253c3b86287db27092461c887b791e5e",
-                "sha256:f9338cc05451f1942d0d8203ec2c346c830f8e86469903d5126c1f0a13a2bcbb",
-                "sha256:ffef8fd58a36fb5f1196919638f73dd3ae0db1a878982b27a9a5a176ede4ba91"
+                "sha256:045d61c734659cc045141be4bae381a41d89b741f795af1dd018bfb532fd0df8",
+                "sha256:0984a4925a435b1da406122d4d7968dd861c1385afe3b45ba82b750f229811e2",
+                "sha256:0e2b1fac190ae3ebfe37b979cc1ce69c81f4e4fe5746bb401dca63a9062cdaf1",
+                "sha256:0f048dcf80db46f0098ccac01132761580d28e28bc0f78ae0d58048063317e15",
+                "sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36",
+                "sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824",
+                "sha256:1d599671f396c4723d016dbddb72fe8e0397082b0a77a4fab8028923bec050e8",
+                "sha256:28b16024becceed8c6dfbc75629e27788d8a3f9030691a1dbf9821a128b22c36",
+                "sha256:2bb1a08b8008b281856e5971307cc386a8e9c5b625ac297e853d36da6efe9c17",
+                "sha256:30c5e0cb5ae493c04c8b42916e52ca38079f1b235c2f8ae5f4527b963c401caf",
+                "sha256:31000ec67d4221a71bd3f67df918b1f88f676f1c3b535a7eb473255fdc0b83fc",
+                "sha256:386c8bf53c502fff58903061338ce4f4950cbdcb23e2902d86c0f722b786bbe3",
+                "sha256:3edc8d958eb099c634dace3c7e16560ae474aa3803a5df240542b305d14e14ed",
+                "sha256:45398b671ac6d70e67da8e4224a065cec6a93541bb7aebe1b198a61b58c7b702",
+                "sha256:46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1",
+                "sha256:4ceb10419a9adf4460ea14cfd6bc43d08701f0835e979bf821052f1805850fe8",
+                "sha256:51392eae71afec0d0c8fb1a53b204dbb3bcabcb3c9b807eedf3e1e6ccf2de903",
+                "sha256:5da5719280082ac6bd9aa7becb3938dc9f9cbd57fac7d2871717b1feb0902ab6",
+                "sha256:610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d",
+                "sha256:636062ea65bd0195bc012fea9321aca499c0504409f413dc88af450b57ffd03b",
+                "sha256:6883e737d7d9e4899a8a695e00ec36bd4e5e4f18fabe0aca0efe0a4b44cdb13e",
+                "sha256:6b8b4a92e1c65048ff98cfe1f735ef8f1ceb72e3d5f0c25fdb12087a23da22be",
+                "sha256:6f17be4345073b0a7b8ea599688f692ac3ef23ce28e5df79c04de519dbc4912c",
+                "sha256:706510fe141c86a69c8ddc029c7910003a17353970cff3b904ff0686a5927683",
+                "sha256:72e72408cad3d5419375fc87d289076ee319835bdfa2caad331e377589aebba9",
+                "sha256:733e99bc2df47476e3848417c5a4540522f234dfd4ef3ab7fafdf555b082ec0c",
+                "sha256:7596d6620d3fa590f677e9ee430df2958d2d6d6de2feeae5b20e82c00b76fbf8",
+                "sha256:78122be759c3f8a014ce010908ae03364d00a1f81ab5c7f4a7a5120607ea56e1",
+                "sha256:805b4371bf7197c329fcb3ead37e710d1bca9da5d583f5073b799d5c5bd1eee4",
+                "sha256:85a950a4ac9c359340d5963966e3e0a94a676bd6245a4b55bc43949eee26a655",
+                "sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67",
+                "sha256:9755e4345d1ec879e3849e62222a18c7174d65a6a92d5b346b1863912168b595",
+                "sha256:98e3969bcff97cae1b2def8ba499ea3d6f31ddfdb7635374834cf89a1a08ecf0",
+                "sha256:a08d7e755f8ed21095a310a693525137cfe756ce62d066e53f502a83dc550f65",
+                "sha256:a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41",
+                "sha256:a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6",
+                "sha256:a45e3c6913c5b87b3ff120dcdc03f6131fa0065027d0ed7ee6190736a74cd401",
+                "sha256:a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6",
+                "sha256:ad9413ccdeda48c5afdae7e4fa2192157e991ff761e7ab8fdd8926f40b160cc3",
+                "sha256:b2ab587605f4ba0bf81dc0cb08a41bd1c0a5906bd59243d56bad7668a6fc6c16",
+                "sha256:b62ce867176a75d03a665bad002af8e6d54644fad99a3c70905c543130e39d93",
+                "sha256:c03e868a0b3bc35839ba98e74211ed2b05d2119be4e8a0f224fba9384f1fe02e",
+                "sha256:c59d6e989d07460165cc5ad3c61f9fd8f1b4796eacbd81cee78957842b834af4",
+                "sha256:c7eac2ef9b63c79431bc4b25f1cd649d7f061a28808cbc6c47b534bd789ef964",
+                "sha256:c9c3d058ebabb74db66e431095118094d06abf53284d9c81f27300d0e0d8bc7c",
+                "sha256:ca74b8dbe6e8e8263c0ffd60277de77dcee6c837a3d0881d8c1ead7268c9e576",
+                "sha256:caaf0640ef5f5517f49bc275eca1406b0ffa6aa184892812030f04c2abf589a0",
+                "sha256:cdf5ce3acdfd1661132f2a9c19cac174758dc2352bfe37d98aa7512c6b7178b3",
+                "sha256:d016c76bdd850f3c626af19b0542c9677ba156e4ee4fccfdd7848803533ef662",
+                "sha256:d01b12eeeb4427d3110de311e1774046ad344f5b1a7403101878976ecd7a10f3",
+                "sha256:d63afe322132c194cf832bfec0dc69a99fb9bb6bbd550f161a49e9e855cc78ff",
+                "sha256:da95af8214998d77a98cc14e3a3bd00aa191526343078b530ceb0bd710fb48a5",
+                "sha256:dd398dbc6773384a17fe0d3e7eeb8d1a21c2200473ee6806bb5e6a8e62bb73dd",
+                "sha256:de2ea4b5833625383e464549fec1bc395c1bdeeb5f25c4a3a82b5a8c756ec22f",
+                "sha256:de55b766c7aa2e2a3092c51e0483d700341182f08e67c63630d5b6f200bb28e5",
+                "sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14",
+                "sha256:e03eab0a8677fa80d646b5ddece1cbeaf556c313dcfac435ba11f107ba117b5d",
+                "sha256:e221cf152cff04059d011ee126477f0d9588303eb57e88923578ace7baad17f9",
+                "sha256:e31ae45bc2e29f6b2abd0de1cc3b9d5205aa847cafaecb8af1476a609a2f6eb7",
+                "sha256:edae79245293e15384b51f88b00613ba9f7198016a5948b5dddf4917d4d26382",
+                "sha256:f1e22e8c4419538cb197e4dd60acc919d7696e5ef98ee4da4e01d3f8cfa4cc5a",
+                "sha256:f3a2b4222ce6b60e2e8b337bb9596923045681d71e5a082783484d845390938e",
+                "sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a",
+                "sha256:f75c7ab1f9e4aca5414ed4d8e5c0e303a34f4421f8a0d47a4d019ceff0ab6af4",
+                "sha256:f79fc4fc25f1c8698ff97788206bb3c2598949bfe0fef03d299eb1b5356ada99",
+                "sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87",
+                "sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b"
             ],
             "markers": "platform_python_implementation != 'PyPy'",
-            "version": "==1.17.0"
+            "version": "==1.17.1"
         },
         "channels": {
             "hashes": [
@@ -165,99 +165,114 @@
         },
         "charset-normalizer": {
             "hashes": [
-                "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027",
-                "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087",
-                "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786",
-                "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8",
-                "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09",
-                "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185",
-                "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574",
-                "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e",
-                "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519",
-                "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898",
-                "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269",
-                "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3",
-                "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f",
-                "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6",
-                "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8",
-                "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a",
-                "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73",
-                "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc",
-                "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714",
-                "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2",
-                "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc",
-                "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce",
-                "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d",
-                "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e",
-                "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6",
-                "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269",
-                "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96",
-                "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d",
-                "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a",
-                "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4",
-                "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77",
-                "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d",
-                "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0",
-                "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed",
-                "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068",
-                "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac",
-                "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25",
-                "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8",
-                "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab",
-                "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26",
-                "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2",
-                "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db",
-                "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f",
-                "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5",
-                "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99",
-                "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c",
-                "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d",
-                "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811",
-                "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa",
-                "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a",
-                "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03",
-                "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b",
-                "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04",
-                "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c",
-                "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001",
-                "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458",
-                "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389",
-                "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99",
-                "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985",
-                "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537",
-                "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238",
-                "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f",
-                "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d",
-                "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796",
-                "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a",
-                "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143",
-                "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8",
-                "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c",
-                "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5",
-                "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5",
-                "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711",
-                "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4",
-                "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6",
-                "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c",
-                "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7",
-                "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4",
-                "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b",
-                "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae",
-                "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12",
-                "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c",
-                "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae",
-                "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8",
-                "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887",
-                "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b",
-                "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4",
-                "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f",
-                "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5",
-                "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33",
-                "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519",
-                "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"
+                "sha256:0099d79bdfcf5c1f0c2c72f91516702ebf8b0b8ddd8905f97a8aecf49712c621",
+                "sha256:0713f3adb9d03d49d365b70b84775d0a0d18e4ab08d12bc46baa6132ba78aaf6",
+                "sha256:07afec21bbbbf8a5cc3651aa96b980afe2526e7f048fdfb7f1014d84acc8b6d8",
+                "sha256:0b309d1747110feb25d7ed6b01afdec269c647d382c857ef4663bbe6ad95a912",
+                "sha256:0d99dd8ff461990f12d6e42c7347fd9ab2532fb70e9621ba520f9e8637161d7c",
+                "sha256:0de7b687289d3c1b3e8660d0741874abe7888100efe14bd0f9fd7141bcbda92b",
+                "sha256:1110e22af8ca26b90bd6364fe4c763329b0ebf1ee213ba32b68c73de5752323d",
+                "sha256:130272c698667a982a5d0e626851ceff662565379baf0ff2cc58067b81d4f11d",
+                "sha256:136815f06a3ae311fae551c3df1f998a1ebd01ddd424aa5603a4336997629e95",
+                "sha256:14215b71a762336254351b00ec720a8e85cada43b987da5a042e4ce3e82bd68e",
+                "sha256:1db4e7fefefd0f548d73e2e2e041f9df5c59e178b4c72fbac4cc6f535cfb1565",
+                "sha256:1ffd9493de4c922f2a38c2bf62b831dcec90ac673ed1ca182fe11b4d8e9f2a64",
+                "sha256:2006769bd1640bdf4d5641c69a3d63b71b81445473cac5ded39740a226fa88ab",
+                "sha256:20587d20f557fe189b7947d8e7ec5afa110ccf72a3128d61a2a387c3313f46be",
+                "sha256:223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e",
+                "sha256:27623ba66c183eca01bf9ff833875b459cad267aeeb044477fedac35e19ba907",
+                "sha256:285e96d9d53422efc0d7a17c60e59f37fbf3dfa942073f666db4ac71e8d726d0",
+                "sha256:2de62e8801ddfff069cd5c504ce3bc9672b23266597d4e4f50eda28846c322f2",
+                "sha256:2f6c34da58ea9c1a9515621f4d9ac379871a8f21168ba1b5e09d74250de5ad62",
+                "sha256:309a7de0a0ff3040acaebb35ec45d18db4b28232f21998851cfa709eeff49d62",
+                "sha256:35c404d74c2926d0287fbd63ed5d27eb911eb9e4a3bb2c6d294f3cfd4a9e0c23",
+                "sha256:3710a9751938947e6327ea9f3ea6332a09bf0ba0c09cae9cb1f250bd1f1549bc",
+                "sha256:3d59d125ffbd6d552765510e3f31ed75ebac2c7470c7274195b9161a32350284",
+                "sha256:40d3ff7fc90b98c637bda91c89d51264a3dcf210cade3a2c6f838c7268d7a4ca",
+                "sha256:425c5f215d0eecee9a56cdb703203dda90423247421bf0d67125add85d0c4455",
+                "sha256:43193c5cda5d612f247172016c4bb71251c784d7a4d9314677186a838ad34858",
+                "sha256:44aeb140295a2f0659e113b31cfe92c9061622cadbc9e2a2f7b8ef6b1e29ef4b",
+                "sha256:47334db71978b23ebcf3c0f9f5ee98b8d65992b65c9c4f2d34c2eaf5bcaf0594",
+                "sha256:4796efc4faf6b53a18e3d46343535caed491776a22af773f366534056c4e1fbc",
+                "sha256:4a51b48f42d9358460b78725283f04bddaf44a9358197b889657deba38f329db",
+                "sha256:4b67fdab07fdd3c10bb21edab3cbfe8cf5696f453afce75d815d9d7223fbe88b",
+                "sha256:4ec9dd88a5b71abfc74e9df5ebe7921c35cbb3b641181a531ca65cdb5e8e4dea",
+                "sha256:4f9fc98dad6c2eaa32fc3af1417d95b5e3d08aff968df0cd320066def971f9a6",
+                "sha256:54b6a92d009cbe2fb11054ba694bc9e284dad30a26757b1e372a1fdddaf21920",
+                "sha256:55f56e2ebd4e3bc50442fbc0888c9d8c94e4e06a933804e2af3e89e2f9c1c749",
+                "sha256:5726cf76c982532c1863fb64d8c6dd0e4c90b6ece9feb06c9f202417a31f7dd7",
+                "sha256:5d447056e2ca60382d460a604b6302d8db69476fd2015c81e7c35417cfabe4cd",
+                "sha256:5ed2e36c3e9b4f21dd9422f6893dec0abf2cca553af509b10cd630f878d3eb99",
+                "sha256:5ff2ed8194587faf56555927b3aa10e6fb69d931e33953943bc4f837dfee2242",
+                "sha256:62f60aebecfc7f4b82e3f639a7d1433a20ec32824db2199a11ad4f5e146ef5ee",
+                "sha256:63bc5c4ae26e4bc6be6469943b8253c0fd4e4186c43ad46e713ea61a0ba49129",
+                "sha256:6b40e8d38afe634559e398cc32b1472f376a4099c75fe6299ae607e404c033b2",
+                "sha256:6b493a043635eb376e50eedf7818f2f322eabbaa974e948bd8bdd29eb7ef2a51",
+                "sha256:6dba5d19c4dfab08e58d5b36304b3f92f3bd5d42c1a3fa37b5ba5cdf6dfcbcee",
+                "sha256:6fd30dc99682dc2c603c2b315bded2799019cea829f8bf57dc6b61efde6611c8",
+                "sha256:707b82d19e65c9bd28b81dde95249b07bf9f5b90ebe1ef17d9b57473f8a64b7b",
+                "sha256:7706f5850360ac01d80c89bcef1640683cc12ed87f42579dab6c5d3ed6888613",
+                "sha256:7782afc9b6b42200f7362858f9e73b1f8316afb276d316336c0ec3bd73312742",
+                "sha256:79983512b108e4a164b9c8d34de3992f76d48cadc9554c9e60b43f308988aabe",
+                "sha256:7f683ddc7eedd742e2889d2bfb96d69573fde1d92fcb811979cdb7165bb9c7d3",
+                "sha256:82357d85de703176b5587dbe6ade8ff67f9f69a41c0733cf2425378b49954de5",
+                "sha256:84450ba661fb96e9fd67629b93d2941c871ca86fc38d835d19d4225ff946a631",
+                "sha256:86f4e8cca779080f66ff4f191a685ced73d2f72d50216f7112185dc02b90b9b7",
+                "sha256:8cda06946eac330cbe6598f77bb54e690b4ca93f593dee1568ad22b04f347c15",
+                "sha256:8ce7fd6767a1cc5a92a639b391891bf1c268b03ec7e021c7d6d902285259685c",
+                "sha256:8ff4e7cdfdb1ab5698e675ca622e72d58a6fa2a8aa58195de0c0061288e6e3ea",
+                "sha256:9289fd5dddcf57bab41d044f1756550f9e7cf0c8e373b8cdf0ce8773dc4bd417",
+                "sha256:92a7e36b000bf022ef3dbb9c46bfe2d52c047d5e3f3343f43204263c5addc250",
+                "sha256:92db3c28b5b2a273346bebb24857fda45601aef6ae1c011c0a997106581e8a88",
+                "sha256:95c3c157765b031331dd4db3c775e58deaee050a3042fcad72cbc4189d7c8dca",
+                "sha256:980b4f289d1d90ca5efcf07958d3eb38ed9c0b7676bf2831a54d4f66f9c27dfa",
+                "sha256:9ae4ef0b3f6b41bad6366fb0ea4fc1d7ed051528e113a60fa2a65a9abb5b1d99",
+                "sha256:9c98230f5042f4945f957d006edccc2af1e03ed5e37ce7c373f00a5a4daa6149",
+                "sha256:9fa2566ca27d67c86569e8c85297aaf413ffab85a8960500f12ea34ff98e4c41",
+                "sha256:a14969b8691f7998e74663b77b4c36c0337cb1df552da83d5c9004a93afdb574",
+                "sha256:a8aacce6e2e1edcb6ac625fb0f8c3a9570ccc7bfba1f63419b3769ccf6a00ed0",
+                "sha256:a8e538f46104c815be19c975572d74afb53f29650ea2025bbfaef359d2de2f7f",
+                "sha256:aa41e526a5d4a9dfcfbab0716c7e8a1b215abd3f3df5a45cf18a12721d31cb5d",
+                "sha256:aa693779a8b50cd97570e5a0f343538a8dbd3e496fa5dcb87e29406ad0299654",
+                "sha256:ab22fbd9765e6954bc0bcff24c25ff71dcbfdb185fcdaca49e81bac68fe724d3",
+                "sha256:ab2e5bef076f5a235c3774b4f4028a680432cded7cad37bba0fd90d64b187d19",
+                "sha256:ab973df98fc99ab39080bfb0eb3a925181454d7c3ac8a1e695fddfae696d9e90",
+                "sha256:af73657b7a68211996527dbfeffbb0864e043d270580c5aef06dc4b659a4b578",
+                "sha256:b197e7094f232959f8f20541ead1d9862ac5ebea1d58e9849c1bf979255dfac9",
+                "sha256:b295729485b06c1a0683af02a9e42d2caa9db04a373dc38a6a58cdd1e8abddf1",
+                "sha256:b8831399554b92b72af5932cdbbd4ddc55c55f631bb13ff8fe4e6536a06c5c51",
+                "sha256:b8dcd239c743aa2f9c22ce674a145e0a25cb1566c495928440a181ca1ccf6719",
+                "sha256:bcb4f8ea87d03bc51ad04add8ceaf9b0f085ac045ab4d74e73bbc2dc033f0236",
+                "sha256:bd7af3717683bea4c87acd8c0d3d5b44d56120b26fd3f8a692bdd2d5260c620a",
+                "sha256:bf4475b82be41b07cc5e5ff94810e6a01f276e37c2d55571e3fe175e467a1a1c",
+                "sha256:c3e446d253bd88f6377260d07c895816ebf33ffffd56c1c792b13bff9c3e1ade",
+                "sha256:c57516e58fd17d03ebe67e181a4e4e2ccab1168f8c2976c6a334d4f819fe5944",
+                "sha256:c94057af19bc953643a33581844649a7fdab902624d2eb739738a30e2b3e60fc",
+                "sha256:cab5d0b79d987c67f3b9e9c53f54a61360422a5a0bc075f43cab5621d530c3b6",
+                "sha256:ce031db0408e487fd2775d745ce30a7cd2923667cf3b69d48d219f1d8f5ddeb6",
+                "sha256:cee4373f4d3ad28f1ab6290684d8e2ebdb9e7a1b74fdc39e4c211995f77bec27",
+                "sha256:d5b054862739d276e09928de37c79ddeec42a6e1bfc55863be96a36ba22926f6",
+                "sha256:dbe03226baf438ac4fda9e2d0715022fd579cb641c4cf639fa40d53b2fe6f3e2",
+                "sha256:dc15e99b2d8a656f8e666854404f1ba54765871104e50c8e9813af8a7db07f12",
+                "sha256:dcaf7c1524c0542ee2fc82cc8ec337f7a9f7edee2532421ab200d2b920fc97cf",
+                "sha256:dd4eda173a9fcccb5f2e2bd2a9f423d180194b1bf17cf59e3269899235b2a114",
+                "sha256:dd9a8bd8900e65504a305bf8ae6fa9fbc66de94178c420791d0293702fce2df7",
+                "sha256:de7376c29d95d6719048c194a9cf1a1b0393fbe8488a22008610b0361d834ecf",
+                "sha256:e7fdd52961feb4c96507aa649550ec2a0d527c086d284749b2f582f2d40a2e0d",
+                "sha256:e91f541a85298cf35433bf66f3fab2a4a2cff05c127eeca4af174f6d497f0d4b",
+                "sha256:e9e3c4c9e1ed40ea53acf11e2a386383c3304212c965773704e4603d589343ed",
+                "sha256:ee803480535c44e7f5ad00788526da7d85525cfefaf8acf8ab9a310000be4b03",
+                "sha256:f09cb5a7bbe1ecae6e87901a2eb23e0256bb524a79ccc53eb0b7629fbe7677c4",
+                "sha256:f19c1585933c82098c2a520f8ec1227f20e339e33aca8fa6f956f6691b784e67",
+                "sha256:f1a2f519ae173b5b6a2c9d5fa3116ce16e48b3462c8b96dfdded11055e3d6365",
+                "sha256:f28f891ccd15c514a0981f3b9db9aa23d62fe1a99997512b0491d2ed323d229a",
+                "sha256:f3e73a4255342d4eb26ef6df01e3962e73aa29baa3124a8e824c5d3364a65748",
+                "sha256:f606a1881d2663630ea5b8ce2efe2111740df4b687bd78b34a8131baa007f79b",
+                "sha256:fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079",
+                "sha256:ffc519621dce0c767e96b9c53f09c5d215578e10b02c285809f76509a3931482"
             ],
             "markers": "python_full_version >= '3.7.0'",
-            "version": "==3.3.2"
+            "version": "==3.4.0"
         },
         "constantly": {
             "hashes": [
@@ -269,36 +284,36 @@
         },
         "cryptography": {
             "hashes": [
-                "sha256:0663585d02f76929792470451a5ba64424acc3cd5227b03921dab0e2f27b1709",
-                "sha256:08a24a7070b2b6804c1940ff0f910ff728932a9d0e80e7814234269f9d46d069",
-                "sha256:232ce02943a579095a339ac4b390fbbe97f5b5d5d107f8a08260ea2768be8cc2",
-                "sha256:2905ccf93a8a2a416f3ec01b1a7911c3fe4073ef35640e7ee5296754e30b762b",
-                "sha256:299d3da8e00b7e2b54bb02ef58d73cd5f55fb31f33ebbf33bd00d9aa6807df7e",
-                "sha256:2c6d112bf61c5ef44042c253e4859b3cbbb50df2f78fa8fae6747a7814484a70",
-                "sha256:31e44a986ceccec3d0498e16f3d27b2ee5fdf69ce2ab89b52eaad1d2f33d8778",
-                "sha256:3d9a1eca329405219b605fac09ecfc09ac09e595d6def650a437523fcd08dd22",
-                "sha256:3dcdedae5c7710b9f97ac6bba7e1052b95c7083c9d0e9df96e02a1932e777895",
-                "sha256:47ca71115e545954e6c1d207dd13461ab81f4eccfcb1345eac874828b5e3eaaf",
-                "sha256:4a997df8c1c2aae1e1e5ac49c2e4f610ad037fc5a3aadc7b64e39dea42249431",
-                "sha256:51956cf8730665e2bdf8ddb8da0056f699c1a5715648c1b0144670c1ba00b48f",
-                "sha256:5bcb8a5620008a8034d39bce21dc3e23735dfdb6a33a06974739bfa04f853947",
-                "sha256:64c3f16e2a4fc51c0d06af28441881f98c5d91009b8caaff40cf3548089e9c74",
-                "sha256:6e2b11c55d260d03a8cf29ac9b5e0608d35f08077d8c087be96287f43af3ccdc",
-                "sha256:7b3f5fe74a5ca32d4d0f302ffe6680fcc5c28f8ef0dc0ae8f40c0f3a1b4fca66",
-                "sha256:844b6d608374e7d08f4f6e6f9f7b951f9256db41421917dfb2d003dde4cd6b66",
-                "sha256:9a8d6802e0825767476f62aafed40532bd435e8a5f7d23bd8b4f5fd04cc80ecf",
-                "sha256:aae4d918f6b180a8ab8bf6511a419473d107df4dbb4225c7b48c5c9602c38c7f",
-                "sha256:ac1955ce000cb29ab40def14fd1bbfa7af2017cca696ee696925615cafd0dce5",
-                "sha256:b88075ada2d51aa9f18283532c9f60e72170041bba88d7f37e49cbb10275299e",
-                "sha256:cb013933d4c127349b3948aa8aaf2f12c0353ad0eccd715ca789c8a0f671646f",
-                "sha256:cc70b4b581f28d0a254d006f26949245e3657d40d8857066c2ae22a61222ef55",
-                "sha256:e9c5266c432a1e23738d178e51c2c7a5e2ddf790f248be939448c0ba2021f9d1",
-                "sha256:ea9e57f8ea880eeea38ab5abf9fbe39f923544d7884228ec67d666abd60f5a47",
-                "sha256:ee0c405832ade84d4de74b9029bedb7b31200600fa524d218fc29bfa371e97f5",
-                "sha256:fdcb265de28585de5b859ae13e3846a8e805268a823a12a4da2597f1f5afc9f0"
+                "sha256:0c580952eef9bf68c4747774cde7ec1d85a6e61de97281f2dba83c7d2c806362",
+                "sha256:0f996e7268af62598f2fc1204afa98a3b5712313a55c4c9d434aef49cadc91d4",
+                "sha256:1ec0bcf7e17c0c5669d881b1cd38c4972fade441b27bda1051665faaa89bdcaa",
+                "sha256:281c945d0e28c92ca5e5930664c1cefd85efe80e5c0d2bc58dd63383fda29f83",
+                "sha256:2ce6fae5bdad59577b44e4dfed356944fbf1d925269114c28be377692643b4ff",
+                "sha256:315b9001266a492a6ff443b61238f956b214dbec9910a081ba5b6646a055a805",
+                "sha256:443c4a81bb10daed9a8f334365fe52542771f25aedaf889fd323a853ce7377d6",
+                "sha256:4a02ded6cd4f0a5562a8887df8b3bd14e822a90f97ac5e544c162899bc467664",
+                "sha256:53a583b6637ab4c4e3591a15bc9db855b8d9dee9a669b550f311480acab6eb08",
+                "sha256:63efa177ff54aec6e1c0aefaa1a241232dcd37413835a9b674b6e3f0ae2bfd3e",
+                "sha256:74f57f24754fe349223792466a709f8e0c093205ff0dca557af51072ff47ab18",
+                "sha256:7e1ce50266f4f70bf41a2c6dc4358afadae90e2a1e5342d3c08883df1675374f",
+                "sha256:81ef806b1fef6b06dcebad789f988d3b37ccaee225695cf3e07648eee0fc6b73",
+                "sha256:846da004a5804145a5f441b8530b4bf35afbf7da70f82409f151695b127213d5",
+                "sha256:8ac43ae87929a5982f5948ceda07001ee5e83227fd69cf55b109144938d96984",
+                "sha256:9762ea51a8fc2a88b70cf2995e5675b38d93bf36bd67d91721c309df184f49bd",
+                "sha256:a2a431ee15799d6db9fe80c82b055bae5a752bef645bba795e8e52687c69efe3",
+                "sha256:bf7a1932ac4176486eab36a19ed4c0492da5d97123f1406cf15e41b05e787d2e",
+                "sha256:c2e6fc39c4ab499049df3bdf567f768a723a5e8464816e8f009f121a5a9f4405",
+                "sha256:cbeb489927bd7af4aa98d4b261af9a5bc025bd87f0e3547e11584be9e9427be2",
+                "sha256:d03b5621a135bffecad2c73e9f4deb1a0f977b9a8ffe6f8e002bf6c9d07b918c",
+                "sha256:d56e96520b1020449bbace2b78b603442e7e378a9b3bd68de65c782db1507995",
+                "sha256:df6b6c6d742395dd77a23ea3728ab62f98379eff8fb61be2744d4679ab678f73",
+                "sha256:e1be4655c7ef6e1bbe6b5d0403526601323420bcf414598955968c9ef3eb7d16",
+                "sha256:f18c716be16bc1fea8e95def49edf46b82fccaa88587a45f8dc0ff6ab5d8e0a7",
+                "sha256:f46304d6f0c6ab8e52770addfa2fc41e6629495548862279641972b6215451cd",
+                "sha256:f7b178f11ed3664fd0e995a47ed2b5ff0a12d893e41dd0494f406d1cf555cab7"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==43.0.0"
+            "version": "==43.0.3"
         },
         "daphne": {
             "hashes": [
@@ -311,29 +326,29 @@
         },
         "django": {
             "hashes": [
-                "sha256:848a5980e8efb76eea70872fb0e4bc5e371619c70fffbe48e3e1b50b2c09455d",
-                "sha256:d3b811bf5371a26def053d7ee42a9df1267ef7622323fe70a601936725aa4557"
+                "sha256:8b38a9a12da3ae00cb0ba72da985ec4b14de6345046b1e174b1fd7254398f818",
+                "sha256:c0fa0e619c39325a169208caef234f90baa925227032ad3f44842ba14d75234a"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.10'",
-            "version": "==5.1"
+            "version": "==5.1.3"
         },
         "django-apscheduler": {
             "hashes": [
-                "sha256:60ced2c07b531b0477076dfef2d6de4790a983a4bbd75fae5e387ac360e9c8fd",
-                "sha256:d30a05be98e01c12aa50d0a7afd8d0fd529c874d1c75af20891b6417d2f36475"
+                "sha256:30d61a2ba98615922fc2c9782f84bba342ec0c5ed63384d686d71ea90a1a4318",
+                "sha256:869d489775420245c9455d55e35f663c856a33ebfc996d92938f786ffb8730ce"
             ],
             "index": "pypi",
-            "version": "==0.6.2"
+            "version": "==0.7.0"
         },
         "django-bootstrap5": {
             "hashes": [
-                "sha256:6a5d83e9ff1952f7c07c54cebcb76c85f09787b8b57eeb4ec07554cd583acc64",
-                "sha256:a3cee2b3d45745210c5b898af2917f310f44df746269fe09a93be28a0adc2a4b"
+                "sha256:98f7916f9f7f9c34dfe157f7c062a28ebf6d17ff95307bef260ba794ba34e2a0",
+                "sha256:ca5ec5568fc2a3fc239f0cb8ce41a7df3802b8c4af930d7f64451784ec7ddc16"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==24.2"
+            "version": "==24.3"
         },
         "django-hashid-field": {
             "hashes": [
@@ -377,11 +392,11 @@
         },
         "idna": {
             "hashes": [
-                "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac",
-                "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"
+                "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
+                "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==3.8"
+            "version": "==3.10"
         },
         "incremental": {
             "hashes": [
@@ -401,136 +416,143 @@
         },
         "mod-wsgi-httpd": {
             "hashes": [
-                "sha256:cbf3495e4efa5f15db60efde959e1470b36dc834da12b62d10e70042b172e31d"
+                "sha256:259fb1af4700bcfaf0b0213313a9ff1a6e13a5b754cc29ee37747276be4b0e0d"
             ],
-            "version": "==2.4.54.1"
+            "version": "==2.4.62.1"
         },
         "mod-wsgi-standalone": {
             "hashes": [
-                "sha256:0a9e65773d6a794cd468c8f5f2e4ef92f1009f27dd12833049448b243539d0d8"
+                "sha256:26266a3ab550ddc404edb4751b317903ff09463be1b6cfdb0a3509ee35c22de0"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==5.0.0"
+            "version": "==5.0.1"
         },
         "msgpack": {
             "hashes": [
-                "sha256:00e073efcba9ea99db5acef3959efa45b52bc67b61b00823d2a1a6944bf45982",
-                "sha256:0726c282d188e204281ebd8de31724b7d749adebc086873a59efb8cf7ae27df3",
-                "sha256:0ceea77719d45c839fd73abcb190b8390412a890df2f83fb8cf49b2a4b5c2f40",
-                "sha256:114be227f5213ef8b215c22dde19532f5da9652e56e8ce969bf0a26d7c419fee",
-                "sha256:13577ec9e247f8741c84d06b9ece5f654920d8365a4b636ce0e44f15e07ec693",
-                "sha256:1876b0b653a808fcd50123b953af170c535027bf1d053b59790eebb0aeb38950",
-                "sha256:1ab0bbcd4d1f7b6991ee7c753655b481c50084294218de69365f8f1970d4c151",
-                "sha256:1cce488457370ffd1f953846f82323cb6b2ad2190987cd4d70b2713e17268d24",
-                "sha256:26ee97a8261e6e35885c2ecd2fd4a6d38252246f94a2aec23665a4e66d066305",
-                "sha256:3528807cbbb7f315bb81959d5961855e7ba52aa60a3097151cb21956fbc7502b",
-                "sha256:374a8e88ddab84b9ada695d255679fb99c53513c0a51778796fcf0944d6c789c",
-                "sha256:376081f471a2ef24828b83a641a02c575d6103a3ad7fd7dade5486cad10ea659",
-                "sha256:3923a1778f7e5ef31865893fdca12a8d7dc03a44b33e2a5f3295416314c09f5d",
-                "sha256:4916727e31c28be8beaf11cf117d6f6f188dcc36daae4e851fee88646f5b6b18",
-                "sha256:493c5c5e44b06d6c9268ce21b302c9ca055c1fd3484c25ba41d34476c76ee746",
-                "sha256:505fe3d03856ac7d215dbe005414bc28505d26f0c128906037e66d98c4e95868",
-                "sha256:5845fdf5e5d5b78a49b826fcdc0eb2e2aa7191980e3d2cfd2a30303a74f212e2",
-                "sha256:5c330eace3dd100bdb54b5653b966de7f51c26ec4a7d4e87132d9b4f738220ba",
-                "sha256:5dbf059fb4b7c240c873c1245ee112505be27497e90f7c6591261c7d3c3a8228",
-                "sha256:5e390971d082dba073c05dbd56322427d3280b7cc8b53484c9377adfbae67dc2",
-                "sha256:5fbb160554e319f7b22ecf530a80a3ff496d38e8e07ae763b9e82fadfe96f273",
-                "sha256:64d0fcd436c5683fdd7c907eeae5e2cbb5eb872fafbc03a43609d7941840995c",
-                "sha256:69284049d07fce531c17404fcba2bb1df472bc2dcdac642ae71a2d079d950653",
-                "sha256:6a0e76621f6e1f908ae52860bdcb58e1ca85231a9b0545e64509c931dd34275a",
-                "sha256:73ee792784d48aa338bba28063e19a27e8d989344f34aad14ea6e1b9bd83f596",
-                "sha256:74398a4cf19de42e1498368c36eed45d9528f5fd0155241e82c4082b7e16cffd",
-                "sha256:7938111ed1358f536daf311be244f34df7bf3cdedb3ed883787aca97778b28d8",
-                "sha256:82d92c773fbc6942a7a8b520d22c11cfc8fd83bba86116bfcf962c2f5c2ecdaa",
-                "sha256:83b5c044f3eff2a6534768ccfd50425939e7a8b5cf9a7261c385de1e20dcfc85",
-                "sha256:8db8e423192303ed77cff4dce3a4b88dbfaf43979d280181558af5e2c3c71afc",
-                "sha256:9517004e21664f2b5a5fd6333b0731b9cf0817403a941b393d89a2f1dc2bd836",
-                "sha256:95c02b0e27e706e48d0e5426d1710ca78e0f0628d6e89d5b5a5b91a5f12274f3",
-                "sha256:99881222f4a8c2f641f25703963a5cefb076adffd959e0558dc9f803a52d6a58",
-                "sha256:9ee32dcb8e531adae1f1ca568822e9b3a738369b3b686d1477cbc643c4a9c128",
-                "sha256:a22e47578b30a3e199ab067a4d43d790249b3c0587d9a771921f86250c8435db",
-                "sha256:b5505774ea2a73a86ea176e8a9a4a7c8bf5d521050f0f6f8426afe798689243f",
-                "sha256:bd739c9251d01e0279ce729e37b39d49a08c0420d3fee7f2a4968c0576678f77",
-                "sha256:d16a786905034e7e34098634b184a7d81f91d4c3d246edc6bd7aefb2fd8ea6ad",
-                "sha256:d3420522057ebab1728b21ad473aa950026d07cb09da41103f8e597dfbfaeb13",
-                "sha256:d56fd9f1f1cdc8227d7b7918f55091349741904d9520c65f0139a9755952c9e8",
-                "sha256:d661dc4785affa9d0edfdd1e59ec056a58b3dbb9f196fa43587f3ddac654ac7b",
-                "sha256:dfe1f0f0ed5785c187144c46a292b8c34c1295c01da12e10ccddfc16def4448a",
-                "sha256:e1dd7839443592d00e96db831eddb4111a2a81a46b028f0facd60a09ebbdd543",
-                "sha256:e2872993e209f7ed04d963e4b4fbae72d034844ec66bc4ca403329db2074377b",
-                "sha256:e2f879ab92ce502a1e65fce390eab619774dda6a6ff719718069ac94084098ce",
-                "sha256:e3aa7e51d738e0ec0afbed661261513b38b3014754c9459508399baf14ae0c9d",
-                "sha256:e532dbd6ddfe13946de050d7474e3f5fb6ec774fbb1a188aaf469b08cf04189a",
-                "sha256:e6b7842518a63a9f17107eb176320960ec095a8ee3b4420b5f688e24bf50c53c",
-                "sha256:e75753aeda0ddc4c28dce4c32ba2f6ec30b1b02f6c0b14e547841ba5b24f753f",
-                "sha256:eadb9f826c138e6cf3c49d6f8de88225a3c0ab181a9b4ba792e006e5292d150e",
-                "sha256:ed59dd52075f8fc91da6053b12e8c89e37aa043f8986efd89e61fae69dc1b011",
-                "sha256:ef254a06bcea461e65ff0373d8a0dd1ed3aa004af48839f002a0c994a6f72d04",
-                "sha256:f3709997b228685fe53e8c433e2df9f0cdb5f4542bd5114ed17ac3c0129b0480",
-                "sha256:f51bab98d52739c50c56658cc303f190785f9a2cd97b823357e7aeae54c8f68a",
-                "sha256:f9904e24646570539a8950400602d66d2b2c492b9010ea7e965025cb71d0c86d",
-                "sha256:f9af38a89b6a5c04b7d18c492c8ccf2aee7048aff1ce8437c4683bb5a1df893d"
+                "sha256:06f5fd2f6bb2a7914922d935d3b8bb4a7fff3a9a91cfce6d06c13bc42bec975b",
+                "sha256:071603e2f0771c45ad9bc65719291c568d4edf120b44eb36324dcb02a13bfddf",
+                "sha256:0907e1a7119b337971a689153665764adc34e89175f9a34793307d9def08e6ca",
+                "sha256:0f92a83b84e7c0749e3f12821949d79485971f087604178026085f60ce109330",
+                "sha256:115a7af8ee9e8cddc10f87636767857e7e3717b7a2e97379dc2054712693e90f",
+                "sha256:13599f8829cfbe0158f6456374e9eea9f44eee08076291771d8ae93eda56607f",
+                "sha256:17fb65dd0bec285907f68b15734a993ad3fc94332b5bb21b0435846228de1f39",
+                "sha256:2137773500afa5494a61b1208619e3871f75f27b03bcfca7b3a7023284140247",
+                "sha256:3180065ec2abbe13a4ad37688b61b99d7f9e012a535b930e0e683ad6bc30155b",
+                "sha256:398b713459fea610861c8a7b62a6fec1882759f308ae0795b5413ff6a160cf3c",
+                "sha256:3d364a55082fb2a7416f6c63ae383fbd903adb5a6cf78c5b96cc6316dc1cedc7",
+                "sha256:3df7e6b05571b3814361e8464f9304c42d2196808e0119f55d0d3e62cd5ea044",
+                "sha256:41c991beebf175faf352fb940bf2af9ad1fb77fd25f38d9142053914947cdbf6",
+                "sha256:42f754515e0f683f9c79210a5d1cad631ec3d06cea5172214d2176a42e67e19b",
+                "sha256:452aff037287acb1d70a804ffd022b21fa2bb7c46bee884dbc864cc9024128a0",
+                "sha256:4676e5be1b472909b2ee6356ff425ebedf5142427842aa06b4dfd5117d1ca8a2",
+                "sha256:46c34e99110762a76e3911fc923222472c9d681f1094096ac4102c18319e6468",
+                "sha256:471e27a5787a2e3f974ba023f9e265a8c7cfd373632247deb225617e3100a3c7",
+                "sha256:4a1964df7b81285d00a84da4e70cb1383f2e665e0f1f2a7027e683956d04b734",
+                "sha256:4b51405e36e075193bc051315dbf29168d6141ae2500ba8cd80a522964e31434",
+                "sha256:4d1b7ff2d6146e16e8bd665ac726a89c74163ef8cd39fa8c1087d4e52d3a2325",
+                "sha256:53258eeb7a80fc46f62fd59c876957a2d0e15e6449a9e71842b6d24419d88ca1",
+                "sha256:534480ee5690ab3cbed89d4c8971a5c631b69a8c0883ecfea96c19118510c846",
+                "sha256:58638690ebd0a06427c5fe1a227bb6b8b9fdc2bd07701bec13c2335c82131a88",
+                "sha256:58dfc47f8b102da61e8949708b3eafc3504509a5728f8b4ddef84bd9e16ad420",
+                "sha256:59caf6a4ed0d164055ccff8fe31eddc0ebc07cf7326a2aaa0dbf7a4001cd823e",
+                "sha256:5dbad74103df937e1325cc4bfeaf57713be0b4f15e1c2da43ccdd836393e2ea2",
+                "sha256:5e1da8f11a3dd397f0a32c76165cf0c4eb95b31013a94f6ecc0b280c05c91b59",
+                "sha256:646afc8102935a388ffc3914b336d22d1c2d6209c773f3eb5dd4d6d3b6f8c1cb",
+                "sha256:64fc9068d701233effd61b19efb1485587560b66fe57b3e50d29c5d78e7fef68",
+                "sha256:65553c9b6da8166e819a6aa90ad15288599b340f91d18f60b2061f402b9a4915",
+                "sha256:685ec345eefc757a7c8af44a3032734a739f8c45d1b0ac45efc5d8977aa4720f",
+                "sha256:6ad622bf7756d5a497d5b6836e7fc3752e2dd6f4c648e24b1803f6048596f701",
+                "sha256:73322a6cc57fcee3c0c57c4463d828e9428275fb85a27aa2aa1a92fdc42afd7b",
+                "sha256:74bed8f63f8f14d75eec75cf3d04ad581da6b914001b474a5d3cd3372c8cc27d",
+                "sha256:79ec007767b9b56860e0372085f8504db5d06bd6a327a335449508bbee9648fa",
+                "sha256:7a946a8992941fea80ed4beae6bff74ffd7ee129a90b4dd5cf9c476a30e9708d",
+                "sha256:7ad442d527a7e358a469faf43fda45aaf4ac3249c8310a82f0ccff9164e5dccd",
+                "sha256:7c9a35ce2c2573bada929e0b7b3576de647b0defbd25f5139dcdaba0ae35a4cc",
+                "sha256:7e7b853bbc44fb03fbdba34feb4bd414322180135e2cb5164f20ce1c9795ee48",
+                "sha256:879a7b7b0ad82481c52d3c7eb99bf6f0645dbdec5134a4bddbd16f3506947feb",
+                "sha256:8a706d1e74dd3dea05cb54580d9bd8b2880e9264856ce5068027eed09680aa74",
+                "sha256:8a84efb768fb968381e525eeeb3d92857e4985aacc39f3c47ffd00eb4509315b",
+                "sha256:8cf9e8c3a2153934a23ac160cc4cba0ec035f6867c8013cc6077a79823370346",
+                "sha256:8da4bf6d54ceed70e8861f833f83ce0814a2b72102e890cbdfe4b34764cdd66e",
+                "sha256:8e59bca908d9ca0de3dc8684f21ebf9a690fe47b6be93236eb40b99af28b6ea6",
+                "sha256:914571a2a5b4e7606997e169f64ce53a8b1e06f2cf2c3a7273aa106236d43dd5",
+                "sha256:a51abd48c6d8ac89e0cfd4fe177c61481aca2d5e7ba42044fd218cfd8ea9899f",
+                "sha256:a52a1f3a5af7ba1c9ace055b659189f6c669cf3657095b50f9602af3a3ba0fe5",
+                "sha256:ad33e8400e4ec17ba782f7b9cf868977d867ed784a1f5f2ab46e7ba53b6e1e1b",
+                "sha256:b4c01941fd2ff87c2a934ee6055bda4ed353a7846b8d4f341c428109e9fcde8c",
+                "sha256:bce7d9e614a04d0883af0b3d4d501171fbfca038f12c77fa838d9f198147a23f",
+                "sha256:c40ffa9a15d74e05ba1fe2681ea33b9caffd886675412612d93ab17b58ea2fec",
+                "sha256:c5a91481a3cc573ac8c0d9aace09345d989dc4a0202b7fcb312c88c26d4e71a8",
+                "sha256:c921af52214dcbb75e6bdf6a661b23c3e6417f00c603dd2070bccb5c3ef499f5",
+                "sha256:d46cf9e3705ea9485687aa4001a76e44748b609d260af21c4ceea7f2212a501d",
+                "sha256:d8ce0b22b890be5d252de90d0e0d119f363012027cf256185fc3d474c44b1b9e",
+                "sha256:dd432ccc2c72b914e4cb77afce64aab761c1137cc698be3984eee260bcb2896e",
+                "sha256:e0856a2b7e8dcb874be44fea031d22e5b3a19121be92a1e098f46068a11b0870",
+                "sha256:e1f3c3d21f7cf67bcf2da8e494d30a75e4cf60041d98b3f79875afb5b96f3a3f",
+                "sha256:f1ba6136e650898082d9d5a5217d5906d1e138024f836ff48691784bbe1adf96",
+                "sha256:f3e9b4936df53b970513eac1758f3882c88658a220b58dcc1e39606dccaaf01c",
+                "sha256:f80bc7d47f76089633763f952e67f8214cb7b3ee6bfa489b3cb6a84cfac114cd",
+                "sha256:fd2906780f25c8ed5d7b323379f6138524ba793428db5d0e9d226d3fa6aa1788"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==1.0.8"
+            "version": "==1.1.0"
         },
         "mysqlclient": {
             "hashes": [
-                "sha256:329e4eec086a2336fe3541f1ce095d87a6f169d1cc8ba7b04ac68bcb234c9711",
-                "sha256:33bc9fb3464e7d7c10b1eaf7336c5ff8f2a3d3b88bab432116ad2490beb3bf41",
-                "sha256:3c318755e06df599338dad7625f884b8a71fcf322a9939ef78c9b3db93e1de7a",
-                "sha256:4e80dcad884dd6e14949ac6daf769123223a52a6805345608bf49cdaf7bc8b3a",
-                "sha256:9d3310295cb682232cadc28abd172f406c718b9ada41d2371259098ae37779d3",
-                "sha256:9d4c015480c4a6b2b1602eccd9846103fc70606244788d04aa14b31c4bd1f0e2",
-                "sha256:ac44777eab0a66c14cb0d38965572f762e193ec2e5c0723bcd11319cc5b693c5",
-                "sha256:d43987bb9626096a302ca6ddcdd81feaeca65ced1d5fe892a6a66b808326aa54",
-                "sha256:e1ebe3f41d152d7cb7c265349fdb7f1eca86ccb0ca24a90036cde48e00ceb2ab"
+                "sha256:1d2e2ca0fe8405d8d6464edd01bf059951279e4bc27284d39341bd4737b2bc64",
+                "sha256:3f9625bea2b9bcde0ace76b32708762d44597491092c819fd1bff5b4e27f709b",
+                "sha256:8012c633aab8c91ea8172ac479807135b171501b9cad1a7cd9b58c4dc8dcdab5",
+                "sha256:add8643c32f738014d252d2bdebb478623b04802e8396d5903905db36474d3ff",
+                "sha256:aee14f1872114865679fcb09aac3772de4595fa7dcf2f83a4c7afee15e508854",
+                "sha256:b54511648c1455b43ac28f8b4c1f732c5b0c343e87f7a3bd6fc9f9fe0f91934e",
+                "sha256:b78438314199504c64f69e1e3521f2c9b419f19fcd85158b44c997b64409a6af",
+                "sha256:e871ede4261d0d42b8ed20a2459db411c7deafedd8e77b7e4ba760be4a6a752b"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==2.2.4"
+            "version": "==2.2.5"
         },
         "psutil": {
             "hashes": [
-                "sha256:02b69001f44cc73c1c5279d02b30a817e339ceb258ad75997325e0e6169d8b35",
-                "sha256:1287c2b95f1c0a364d23bc6f2ea2365a8d4d9b726a3be7294296ff7ba97c17f0",
-                "sha256:1e7c870afcb7d91fdea2b37c24aeb08f98b6d67257a5cb0a8bc3ac68d0f1a68c",
-                "sha256:21f1fb635deccd510f69f485b87433460a603919b45e2a324ad65b0cc74f8fb1",
-                "sha256:33ea5e1c975250a720b3a6609c490db40dae5d83a4eb315170c4fe0d8b1f34b3",
-                "sha256:34859b8d8f423b86e4385ff3665d3f4d94be3cdf48221fbe476e883514fdb71c",
-                "sha256:5fd9a97c8e94059b0ef54a7d4baf13b405011176c3b6ff257c247cae0d560ecd",
-                "sha256:6ec7588fb3ddaec7344a825afe298db83fe01bfaaab39155fa84cf1c0d6b13c3",
-                "sha256:6ed2440ada7ef7d0d608f20ad89a04ec47d2d3ab7190896cd62ca5fc4fe08bf0",
-                "sha256:8faae4f310b6d969fa26ca0545338b21f73c6b15db7c4a8d934a5482faa818f2",
-                "sha256:a021da3e881cd935e64a3d0a20983bda0bb4cf80e4f74fa9bfcb1bc5785360c6",
-                "sha256:a495580d6bae27291324fe60cea0b5a7c23fa36a7cd35035a16d93bdcf076b9d",
-                "sha256:a9a3dbfb4de4f18174528d87cc352d1f788b7496991cca33c6996f40c9e3c92c",
-                "sha256:c588a7e9b1173b6e866756dde596fd4cad94f9399daf99ad8c3258b3cb2b47a0",
-                "sha256:e2e8d0054fc88153ca0544f5c4d554d42e33df2e009c4ff42284ac9ebdef4132",
-                "sha256:fc8c9510cde0146432bbdb433322861ee8c3efbf8589865c8bf8d21cb30c4d14",
-                "sha256:ffe7fc9b6b36beadc8c322f84e1caff51e8703b88eee1da46d1e3a6ae11b4fd0"
+                "sha256:000d1d1ebd634b4efb383f4034437384e44a6d455260aaee2eca1e9c1b55f047",
+                "sha256:045f00a43c737f960d273a83973b2511430d61f283a44c96bf13a6e829ba8fdc",
+                "sha256:0895b8414afafc526712c498bd9de2b063deaac4021a3b3c34566283464aff8e",
+                "sha256:1209036fbd0421afde505a4879dee3b2fd7b1e14fee81c0069807adcbbcca747",
+                "sha256:1ad45a1f5d0b608253b11508f80940985d1d0c8f6111b5cb637533a0e6ddc13e",
+                "sha256:353815f59a7f64cdaca1c0307ee13558a0512f6db064e92fe833784f08539c7a",
+                "sha256:498c6979f9c6637ebc3a73b3f87f9eb1ec24e1ce53a7c5173b8508981614a90b",
+                "sha256:5cd2bcdc75b452ba2e10f0e8ecc0b57b827dd5d7aaffbc6821b2a9a242823a76",
+                "sha256:6d3fbbc8d23fcdcb500d2c9f94e07b1342df8ed71b948a2649b5cb060a7c94ca",
+                "sha256:6e2dcd475ce8b80522e51d923d10c7871e45f20918e027ab682f94f1c6351688",
+                "sha256:9118f27452b70bb1d9ab3198c1f626c2499384935aaf55388211ad982611407e",
+                "sha256:9dcbfce5d89f1d1f2546a2090f4fcf87c7f669d1d90aacb7d7582addece9fb38",
+                "sha256:a8506f6119cff7015678e2bce904a4da21025cc70ad283a53b099e7620061d85",
+                "sha256:a8fb3752b491d246034fa4d279ff076501588ce8cbcdbb62c32fd7a377d996be",
+                "sha256:c0e0c00aa18ca2d3b2b991643b799a15fc8f0563d2ebb6040f64ce8dc027b942",
+                "sha256:d905186d647b16755a800e7263d43df08b790d709d575105d419f8b6ef65423a",
+                "sha256:ff34df86226c0227c52f38b919213157588a678d049688eded74c76c8ba4a5d0"
             ],
             "index": "pypi",
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
-            "version": "==6.0.0"
+            "version": "==6.1.0"
         },
         "pyasn1": {
             "hashes": [
-                "sha256:3a35ab2c4b5ef98e17dfdec8ab074046fbda76e281c5a706ccd82328cfc8f64c",
-                "sha256:cca4bb0f2df5504f02f6f8a775b6e416ff9b0b3b16f7ee80b5a3153d9b804473"
+                "sha256:0d632f46f2ba09143da3a8afe9e33fb6f92fa2320ab7e886e2d0f7672af84629",
+                "sha256:6f580d2bdd84365380830acf45550f2511469f673cb4a5ae3857a3170128b034"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.6.0"
+            "version": "==0.6.1"
         },
         "pyasn1-modules": {
             "hashes": [
-                "sha256:831dbcea1b177b28c9baddf4c6d1013c24c3accd14a1873fffaa6a2e905f17b6",
-                "sha256:be04f15b66c206eed667e0bb5ab27e2b1855ea54a842e5037738099e8ca4ae0b"
+                "sha256:49bfa96b45a292b711e986f222502c1c9a5e1f4e568fc30e2574a6c7d07838fd",
+                "sha256:c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2ab60a7c"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.4.0"
+            "version": "==0.4.1"
         },
         "pycparser": {
             "hashes": [
@@ -558,18 +580,18 @@
         },
         "pytz": {
             "hashes": [
-                "sha256:2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812",
-                "sha256:328171f4e3623139da4983451950b28e95ac706e13f3f2630a879749e7a8b319"
+                "sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a",
+                "sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725"
             ],
-            "version": "==2024.1"
+            "version": "==2024.2"
         },
         "redis": {
             "hashes": [
-                "sha256:0c5b10d387568dfe0698c6fad6615750c24170e548ca2deac10c649d463e9870",
-                "sha256:56134ee08ea909106090934adc36f65c9bcbbaecea5b21ba704ba6fb561f8eb4"
+                "sha256:0b1087665a771b1ff2e003aa5bdd354f15a70c9e25d5a7dbf9c722c16528a7b0",
+                "sha256:ae174f2bb3b1bf2b09d54bf3e51fbc1469cf6c10aa03e21141f51969801a7897"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==5.0.8"
+            "markers": "python_version >= '3.8'",
+            "version": "==5.2.0"
         },
         "requests": {
             "hashes": [
@@ -591,18 +613,18 @@
         },
         "service-identity": {
             "hashes": [
-                "sha256:6829c9d62fb832c2e1c435629b0a8c476e1929881f28bee4d20bc24161009221",
-                "sha256:a28caf8130c8a5c1c7a6f5293faaf239bbfb7751e4862436920ee6f2616f568a"
+                "sha256:6b047fbd8a84fd0bb0d55ebce4031e400562b9196e1e0d3e0fe2b8a59f6d4a85",
+                "sha256:b8683ba13f0d39c6cd5d625d2c5f65421d6d707b013b375c355751557cbe8e09"
             ],
-            "version": "==24.1.0"
+            "version": "==24.2.0"
         },
         "setuptools": {
             "hashes": [
-                "sha256:b208925fcb9f7af924ed2dc04708ea89791e24bde0d3020b27df0e116088b34e",
-                "sha256:d59a3e788ab7e012ab2c4baed1b376da6366883ee20d7a5fc426816e3d7b1193"
+                "sha256:1dc484f5cf56fd3fe7216d7b8df820802e7246cfb534a1db2aa64f14fcb9cdcb",
+                "sha256:b3c5d862f98500b06ffdf7cc4499b48c46c317d8d56cb30b5c8bce4d88f5c216"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==73.0.1"
+            "markers": "python_version >= '3.9'",
+            "version": "==75.4.0"
         },
         "six": {
             "hashes": [
@@ -622,22 +644,22 @@
         },
         "tomli": {
             "hashes": [
-                "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
-                "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"
+                "sha256:3f646cae2aec94e17d04973e4249548320197cfabdf130015d023de4b74d8ab8",
+                "sha256:a5c57c3d1c56f5ccdf89f6523458f60ef716e210fc47c4cfb188c5ba473e0391"
             ],
             "markers": "python_version < '3.11'",
-            "version": "==2.0.1"
+            "version": "==2.1.0"
         },
         "twisted": {
             "extras": [
                 "tls"
             ],
             "hashes": [
-                "sha256:5a60147f044187a127ec7da96d170d49bcce50c6fd36f594e60f4587eff4d394",
-                "sha256:734832ef98108136e222b5230075b1079dad8a3fc5637319615619a7725b0c81"
+                "sha256:02951299672595fea0f70fa2d5f7b5e3d56836157eda68859a6ad6492d36756e",
+                "sha256:67aa7c8aa94387385302acf44ade12967c747858c8bcce0f11d38077a11c5326"
             ],
             "markers": "python_full_version >= '3.8.0'",
-            "version": "==24.7.0"
+            "version": "==24.10.0"
         },
         "txaio": {
             "hashes": [
@@ -665,98 +687,101 @@
         },
         "urllib3": {
             "hashes": [
-                "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
-                "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
+                "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
+                "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.2.2"
+            "version": "==2.2.3"
         },
         "watchdog": {
             "hashes": [
-                "sha256:0120b2fa65732797ffa65fa8ee5540c288aa861d91447df298626d6385a24658",
-                "sha256:01ab36cddc836a0f202c66267daaef92ba5c17c7d6436deff0587bb61234c5c9",
-                "sha256:0710e9502727f688a7e06d48078545c54485b3d6eb53b171810879d8223c362a",
-                "sha256:0834c21efa3e767849b09e667274604c7cdfe30b49eb95d794565c53f4db3c1e",
-                "sha256:109daafc5b0f2a98d1fa9475ff9737eb3559d57b18129a36495e20c71de0b44f",
-                "sha256:1228cb097e855d1798b550be8f0e9f0cfbac4384f9a3e91f66d250d03e11294e",
-                "sha256:16c1aa3377bb1f82c5e24277fcbf4e2cac3c4ce46aaaf7212d53caa9076eb7b7",
-                "sha256:1d17ec7e022c34fa7ddc72aa41bf28c9d1207ffb193df18ba4f6fde453725b3c",
-                "sha256:1e26f570dd7f5178656affb24d6f0e22ce66c8daf88d4061a27bfb9ac866b40d",
-                "sha256:22fcad6168fc43cf0e709bd854be5b8edbb0b260f0a6f28f1ea9baa53c6907f7",
-                "sha256:2aa59fab7ff75281778c649557275ca3085eccbdf825a0e2a5ca3810e977afe5",
-                "sha256:3c177085c3d210d1c73cb4569442bdaef706ebebc423bd7aed9e90fc12b2e553",
-                "sha256:3c2d50fdb86aa6df3973313272f5a17eb26eab29ff5a0bf54b6d34597b4dc4e4",
-                "sha256:4fe6780915000743074236b21b6c37419aea71112af62237881bc265589fe463",
-                "sha256:663b096368ed7831ac42259919fdb9e0a1f0a8994d972675dfbcca0225e74de1",
-                "sha256:685931412978d00a91a193d9018fc9e394e565e8e7a0c275512a80e59c6e85f8",
-                "sha256:6c96b1706430839872a3e33b9370ee3f7a0079f6b828129d88498ad1f96a0f45",
-                "sha256:6e58eafe9cc5ceebe1562cdb89bacdcd0ef470896e8b0139fe677a5abec243da",
-                "sha256:78db0fe0336958fc0e1269545c980b6f33d04d184ba191b2800a8b71d3e971a9",
-                "sha256:7e6b0e9b8a9dc3865d65888b5f5222da4ba9c4e09eab13cff5e305e7b7e7248f",
-                "sha256:990aedb9e2f336b45a70aed9c014450e7c4a70fd99c5f5b1834d57e1453a177e",
-                "sha256:b8d747bf6d8fe5ce89cb1a36c3724d1599bd4cde3f90fcba518e6260c7058a52",
-                "sha256:bc16d448a74a929b896ed9578c25756b2125400b19b3258be8d9a681c7ae8e71",
-                "sha256:bf3216ec994eabb2212df9861f19056ca0d4cd3516d56cb95801933876519bfe",
-                "sha256:c2b4d90962639ae7cee371ea3a8da506831945d4418eee090c53bc38e6648dc6",
-                "sha256:cb59ad83a1700304fc1ac7bc53ae9e5cbe9d60a52ed9bba8e2e2d782a201bb2b",
-                "sha256:d146331e6b206baa9f6dd40f72b5783ad2302c240df68e7fce196d30588ccf7b",
-                "sha256:d1acef802916083f2ad7988efc7decf07e46e266916c0a09d8fb9d387288ea12",
-                "sha256:d76efab5248aafbf8a2c2a63cd7b9545e6b346ad1397af8b862a3bb3140787d8",
-                "sha256:ff4e957c45c446de34c513eadce01d0b65da7eee47c01dce472dd136124552c9"
+                "sha256:07df1fdd701c5d4c8e55ef6cf55b8f0120fe1aef7ef39a1c6fc6bc2e606d517a",
+                "sha256:20ffe5b202af80ab4266dcd3e91aae72bf2da48c0d33bdb15c66658e685e94e2",
+                "sha256:212ac9b8bf1161dc91bd09c048048a95ca3a4c4f5e5d4a7d1b1a7d5752a7f96f",
+                "sha256:2cce7cfc2008eb51feb6aab51251fd79b85d9894e98ba847408f662b3395ca3c",
+                "sha256:490ab2ef84f11129844c23fb14ecf30ef3d8a6abafd3754a6f75ca1e6654136c",
+                "sha256:6eb11feb5a0d452ee41f824e271ca311a09e250441c262ca2fd7ebcf2461a06c",
+                "sha256:6f10cb2d5902447c7d0da897e2c6768bca89174d0c6e1e30abec5421af97a5b0",
+                "sha256:7607498efa04a3542ae3e05e64da8202e58159aa1fa4acddf7678d34a35d4f13",
+                "sha256:76aae96b00ae814b181bb25b1b98076d5fc84e8a53cd8885a318b42b6d3a5134",
+                "sha256:7a0e56874cfbc4b9b05c60c8a1926fedf56324bb08cfbc188969777940aef3aa",
+                "sha256:82dc3e3143c7e38ec49d61af98d6558288c415eac98486a5c581726e0737c00e",
+                "sha256:9041567ee8953024c83343288ccc458fd0a2d811d6a0fd68c4c22609e3490379",
+                "sha256:90c8e78f3b94014f7aaae121e6b909674df5b46ec24d6bebc45c44c56729af2a",
+                "sha256:9513f27a1a582d9808cf21a07dae516f0fab1cf2d7683a742c498b93eedabb11",
+                "sha256:9ddf7c82fda3ae8e24decda1338ede66e1c99883db93711d8fb941eaa2d8c282",
+                "sha256:a175f755fc2279e0b7312c0035d52e27211a5bc39719dd529625b1930917345b",
+                "sha256:a1914259fa9e1454315171103c6a30961236f508b9b623eae470268bbcc6a22f",
+                "sha256:afd0fe1b2270917c5e23c2a65ce50c2a4abb63daafb0d419fde368e272a76b7c",
+                "sha256:bc64ab3bdb6a04d69d4023b29422170b74681784ffb9463ed4870cf2f3e66112",
+                "sha256:bdd4e6f14b8b18c334febb9c4425a878a2ac20efd1e0b231978e7b150f92a948",
+                "sha256:c7ac31a19f4545dd92fc25d200694098f42c9a8e391bc00bdd362c5736dbf881",
+                "sha256:c7c15dda13c4eb00d6fb6fc508b3c0ed88b9d5d374056b239c4ad1611125c860",
+                "sha256:c897ac1b55c5a1461e16dae288d22bb2e412ba9807df8397a635d88f671d36c3",
+                "sha256:cbafb470cf848d93b5d013e2ecb245d4aa1c8fd0504e863ccefa32445359d680",
+                "sha256:d1cdb490583ebd691c012b3d6dae011000fe42edb7a82ece80965b42abd61f26",
+                "sha256:e3df4cbb9a450c6d49318f6d14f4bbc80d763fa587ba46ec86f99f9e6876bb26",
+                "sha256:e6439e374fc012255b4ec786ae3c4bc838cd7309a540e5fe0952d03687d8804e",
+                "sha256:e6f0e77c9417e7cd62af82529b10563db3423625c5fce018430b249bf977f9e8",
+                "sha256:e7631a77ffb1f7d2eefa4445ebbee491c720a5661ddf6df3498ebecae5ed375c",
+                "sha256:ef810fbf7b781a5a593894e4f439773830bdecb885e6880d957d5b9382a960d2"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.9'",
-            "version": "==5.0.0"
+            "version": "==6.0.0"
         },
         "zope-interface": {
             "hashes": [
-                "sha256:0821efcbdeaf48e12c66b0d19a1f9edec2ed22697ab8885d322c8f82fe5bc892",
-                "sha256:08d86319fd7542984d4c0ef7865759dab58616154cb237a5a1ce758687255de0",
-                "sha256:093ab9a2c5105d826755c43a76770b69353dbe95ec27a0b5e88ab4f63d7744b8",
-                "sha256:13aacff95c59000ecd562d9717a87eca8211f6bc74bea6b8ca68e742d1f8f13d",
-                "sha256:185ef3a7a01fac1151622579a08995aab66590711c1a4f9b605f88129229dba1",
-                "sha256:22c93492e5d2f09100a4a23cf709b20f0305cdbbad14f9af2f6e9311742bed8e",
-                "sha256:28f29dd42819d99682e46a8d3cc2ee60461a77554d4320e0e8a37363f04208e0",
-                "sha256:3246cccb9e4ce34c9b32ad55a53098043af5e7185623bf5de8e6ec5d8e71415e",
-                "sha256:356a9c1c8cfece776f54806157057be759d812168395762f47f046b40901e974",
-                "sha256:375258373bc3879a6c509281487063cf14add7129fc867eb1c287c0db46ca007",
-                "sha256:3ab142cebe69e0f72bf892da040af97f61fd03c09a23ae2fc7de3ab576c5d4cd",
-                "sha256:40beb36330ef00d2cd50d212a0c74ecd57042b8c8b2b6ebd6247cc98f9808824",
-                "sha256:4b671f943d6487d6f1a6bbdce3faffae35e4f74f98ac9b865d2b7370cb6b0bd3",
-                "sha256:4f5e39373952e1d689476b6e43d779553b165ce332d0fde9c36d9b095f28d052",
-                "sha256:67e0ff3f2e02d6131535956b22795be2ec5af6762f4fe682f67eb723fbc16273",
-                "sha256:738de1c72390a2caf543247013f617ed15d272e4c19731a998e81dd5a2379f1c",
-                "sha256:797510df26b82cf619a894dac4ff4036d11f6340bec0287c89cecb0b1b1c429e",
-                "sha256:7c47a5068df03f0c9215d3525b166c9d8d4f6d03cbe4e60339818f8c393e3e3e",
-                "sha256:8eab70e404c2416176b4630914cda275ca95678529e54e66ea45d1a0be422994",
-                "sha256:91bb6b5e1a158b751e12458d5618c1af42eb3dc8472b87a613d543d9fb7660e0",
-                "sha256:93e5bf8de5a51aaeddd5e1d1c0ac0ca4f995a4f5a832abdc08bb8fbae25ac660",
-                "sha256:9da2fb807a20cd4fe381e23e2f906f0a0f4acece6d9abac65d5fc0a1f8383ed8",
-                "sha256:b76f6048c1a334e26e5d46fdb4f327d9e7e6b348ad607ee9fdce9c7325b5a635",
-                "sha256:b9d865209cc9795d0f9f4f63b87a86e7a9e032d3cbbb10b1c13bf27343a4fc54",
-                "sha256:ba16bb2214f671e29b75f16d7b8b0bb1f75cdc8bce06979fdbf638edf6531586",
-                "sha256:bceaf7ee95735b0d6ac3f5bba0209d056e686999732dc32bd463a53d4488ccdb",
-                "sha256:bf2746931a6f83370fdc4005dbea4e39e3a3d0333da42897040698c1ff282e9c",
-                "sha256:d20fa14f0f8682ad37a6552712e4493cfb35d66c5fb4f8052af3a50ae6cd4f77",
-                "sha256:d9ab785a7af39c6968385a9d39b712d2263661fa3780bd38efec0cefdbb84036",
-                "sha256:dd28ba1e2deb0c339881ee7755db649433347bdf3c4f3d885f029fcf10aacdf7",
-                "sha256:deac72b653817a68b96079c1428ae84860c76f653af03668a02f97b74f8a465b",
-                "sha256:e299f672cfad3392b097af885a552a51e60d3b44e8572f1401e87f863f8986b4",
-                "sha256:f1146bb27a411d0d40cc0e88182a6b0e979d68ab526c8e5ae9e27c06506ed017",
-                "sha256:f77d58cfc3af86d062b8cfa7194db74ca78a615d66bbd23b251bad1b1ecf9818"
+                "sha256:0de23bcb93401994ea00bc5c677ef06d420340ac0a4e9c10d80e047b9ce5af3f",
+                "sha256:179ad46ece518c9084cb272e4a69d266b659f7f8f48e51706746c2d8a426433e",
+                "sha256:190eeec67e023d5aac54d183fa145db0b898664234234ac54643a441da434616",
+                "sha256:1a2ed0852c25950cf430067f058f8d98df6288502ac313861d9803fe7691a9b3",
+                "sha256:1c4e1b4c06d9abd1037c088dae1566c85f344a3e6ae4350744c3f7f7259d9c67",
+                "sha256:1d0e23c6b746eb8ce04573cc47bcac60961ac138885d207bd6f57e27a1431ae8",
+                "sha256:2317e1d4dba68203a5227ea3057f9078ec9376275f9700086b8f0ffc0b358e1b",
+                "sha256:2d553e02b68c0ea5a226855f02edbc9eefd99f6a8886fa9f9bdf999d77f46585",
+                "sha256:3603ef82a9920bd0bfb505423cb7e937498ad971ad5a6141841e8f76d2fd5446",
+                "sha256:3defc925c4b22ac1272d544a49c6ba04c3eefcce3200319ee1be03d9270306dd",
+                "sha256:3e59f175e868f856a77c0a77ba001385c377df2104fdbda6b9f99456a01e102a",
+                "sha256:4284d664ef0ff7b709836d4de7b13d80873dc5faeffc073abdb280058bfac5e3",
+                "sha256:55c373becbd36a44d0c9be1d5271422fdaa8562d158fb44b4192297b3c67096c",
+                "sha256:5836b8fb044c6e75ba34dfaabc602493019eadfa0faf6ff25f4c4c356a71a853",
+                "sha256:5cdb7e7e5524b76d3ec037c1d81a9e2c7457b240fd4cb0a2476b65c3a5a6c81f",
+                "sha256:6650bd56ef350d37c8baccfd3ee8a0483ed6f8666e641e4b9ae1a1827b79f9e5",
+                "sha256:7395f13533318f150ee72adb55b29284b16e73b6d5f02ab21f173b3e83f242b8",
+                "sha256:7720322763aceb5e0a7cadcc38c67b839efe599f0887cbf6c003c55b1458c501",
+                "sha256:7cd5e3d910ac87652a09f6e5db8e41bc3b49cf08ddd2d73d30afc644801492cd",
+                "sha256:81744a7e61b598ebcf4722ac56a7a4f50502432b5b4dc7eb29075a89cf82d029",
+                "sha256:84e87eba6b77a3af187bae82d8de1a7c208c2a04ec9f6bd444fd091b811ad92e",
+                "sha256:8d0fe45be57b5219aa4b96e846631c04615d5ef068146de5a02ccd15c185321f",
+                "sha256:9595e478047ce752b35cfa221d7601a5283ccdaab40422e0dc1d4a334c70f580",
+                "sha256:99c14f0727c978639139e6cad7a60e82b7720922678d75aacb90cf4ef74a068c",
+                "sha256:9b1eed7670d564f1025d7cda89f99f216c30210e42e95de466135be0b4a499d9",
+                "sha256:9fad9bd5502221ab179f13ea251cb30eef7cf65023156967f86673aff54b53a0",
+                "sha256:ad339509dcfbbc99bf8e147db6686249c4032f26586699ec4c82f6e5909c9fe2",
+                "sha256:bcbeb44fc16e0078b3b68a95e43f821ae34dcbf976dde6985141838a5f23dd3d",
+                "sha256:c8e7b05dc6315a193cceaec071cc3cf1c180cea28808ccded0b1283f1c38ba73",
+                "sha256:ca95594d936ee349620900be5b46c0122a1ff6ce42d7d5cb2cf09dc84071ef16",
+                "sha256:d029fac6a80edae80f79c37e5e3abfa92968fe921886139b3ee470a1b177321a",
+                "sha256:d17e7fc814eaab93409b80819fd6d30342844345c27f3bc3c4b43c2425a8d267",
+                "sha256:d6821ef9870f32154da873fcde439274f99814ea452dd16b99fa0b66345c4b6b",
+                "sha256:e6503534b52bb1720ace9366ee30838a58a3413d3e197512f3338c8f34b5d89d",
+                "sha256:ed1df8cc01dd1e3970666a7370b8bfc7457371c58ba88c57bd5bca17ab198053",
+                "sha256:f1d52d052355e0c5c89e0630dd2ff7c0b823fd5f56286a663e92444761b35e25",
+                "sha256:f85b290e5b8b11814efb0d004d8ce6c9a483c35c462e8d9bf84abb93e79fa770"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==7.0.2"
+            "version": "==7.1.1"
         }
     },
     "develop": {
         "astroid": {
             "hashes": [
-                "sha256:0e14202810b30da1b735827f78f5157be2bbd4a7a59b7707ca0bfc2fb4c0063a",
-                "sha256:413658a61eeca6202a59231abb473f932038fbcbf1666587f66d482083413a25"
+                "sha256:5cfc40ae9f68311075d27ef68a4841bdc5cc7f6cf86671b49f00607d30188e2d",
+                "sha256:a9d1c946ada25098d790e079ba2a1b112157278f3fb7e718ae6a9252f5835dc8"
             ],
-            "markers": "python_full_version >= '3.8.0'",
-            "version": "==3.2.4"
+            "markers": "python_full_version >= '3.9.0'",
+            "version": "==3.3.5"
         },
         "attrs": {
             "hashes": [
@@ -768,11 +793,11 @@
         },
         "certifi": {
             "hashes": [
-                "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b",
-                "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"
+                "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8",
+                "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==2024.7.4"
+            "version": "==2024.8.30"
         },
         "click": {
             "hashes": [
@@ -798,20 +823,40 @@
         },
         "dill": {
             "hashes": [
-                "sha256:3ebe3c479ad625c4553aca177444d89b486b1d84982eeacded644afc0cf797ca",
-                "sha256:c36ca9ffb54365bdd2f8eb3eff7d2a21237f8452b57ace88b1ac615b7e815bd7"
+                "sha256:468dff3b89520b474c0397703366b7b95eebe6303f108adf9b19da1f702be87a",
+                "sha256:81aa267dddf68cbfe8029c42ca9ec6a4ab3b22371d1c450abc54422577b4512c"
             ],
             "markers": "python_version < '3.11'",
-            "version": "==0.3.8"
+            "version": "==0.3.9"
         },
         "djlint": {
             "hashes": [
-                "sha256:96ff1c464fb6f061130ebc88663a2ea524d7ec51f4b56221a2b3f0320a3cfce8",
-                "sha256:db93fa008d19eaadb0454edf1704931d14469d48508daba2df9941111f408346"
+                "sha256:001e5124b0ebab60a2044134abd11ff11dee772e7c3caaa2c8d12eb5d3b1f1dc",
+                "sha256:02c22352a49c053ff6260428ed571afb783011d20afc98b44bbe1dd2fa2d5418",
+                "sha256:095d62f3cabbac08683c51c1d9dacab522b54437a2a317df9e134599360f7b89",
+                "sha256:1577490802ca4697af3488ed13066c9214ef0f625a96aa20d4f297e37aa19303",
+                "sha256:210f319c2d22489aebc0e9c1acd5015ca3892b66fa35647344511b3c03fcbe82",
+                "sha256:2237ac5cecd2524960e1684f64ce358624b0d769b7404e5aad415750ad00edc9",
+                "sha256:2f907e97f4d67f4423dc71671592891cfd9cd311aeef14db25633f292dbf7048",
+                "sha256:3ae356faf8180c7629ca705b7b9d8c9269b2c53273a1887a438a21b8fa263588",
+                "sha256:4399477ac51f9c8147eedbef70aa8465eccba6759d875d1feec6782744aa168a",
+                "sha256:4712de3dea172000a098da6a0cd709d158909b4964ba0f68bee584cef18b4878",
+                "sha256:607437a0a230462916858c269bc5dfd15ff71b27d15dfd1ad6e96b3da9cbd8f6",
+                "sha256:63d01c1425170b7059d68a3b01709e1c31d2cd6520a1eb0166e6670fd250518a",
+                "sha256:65585a97d3a37760b4c1fbd089a3573506ad0ab2885119322a66231f911d113f",
+                "sha256:7aa3db13d7702c35f4e408325061d9d4e84d006c99bb3e55fddf2b2543736923",
+                "sha256:7f31646435385eec1d4b03dad7bebb5e4078d9893c60d490a685535bd6303c83",
+                "sha256:8ddc9ae6b83b288465f6685b24797adbde79952d6e1a5276026e5ef479bac76f",
+                "sha256:950782b396dd82b74622c09d7e4c52328e56a3b03c8ac790c319708e5caa0686",
+                "sha256:99a2debeea2e931b68360306fdbf13861e3d6f96037a9d882f3d4d5e44fdc319",
+                "sha256:abadf6b61dc53d81710f230542f57f2d470b7503cd3108ad8a0113271c0514dd",
+                "sha256:ef40527fd6cd82cdd18f65a6bf5b486b767d2386f6c21f2ebd60e5d88f487fe8",
+                "sha256:f08c217b17d3ae3c0e3b5fff57fb708029cceda6e232f5a54ff1b3aeb43a7540",
+                "sha256:f7260637ed72c270fa6dd4a87628e1a21c49b24a46df52e4e26f44d4934fb97c"
             ],
             "index": "pypi",
-            "markers": "python_full_version >= '3.8.0' and python_full_version < '4.0.0'",
-            "version": "==1.34.1"
+            "markers": "python_version >= '3.9'",
+            "version": "==1.36.1"
         },
         "editorconfig": {
             "hashes": [
@@ -835,29 +880,13 @@
             "markers": "python_version >= '3.7'",
             "version": "==0.14.0"
         },
-        "html-tag-names": {
-            "hashes": [
-                "sha256:04924aca48770f36b5a41c27e4d917062507be05118acb0ba869c97389084297",
-                "sha256:eeb69ef21078486b615241f0393a72b41352c5219ee648e7c61f5632d26f0420"
-            ],
-            "markers": "python_version >= '3.7' and python_version < '4.0'",
-            "version": "==0.1.2"
-        },
-        "html-void-elements": {
-            "hashes": [
-                "sha256:784cf39db03cdeb017320d9301009f8f3480f9d7b254d0974272e80e0cb5e0d2",
-                "sha256:931b88f84cd606fee0b582c28fcd00e41d7149421fb673e1e1abd2f0c4f231f0"
-            ],
-            "markers": "python_version >= '3.7' and python_version < '4.0'",
-            "version": "==0.1.0"
-        },
         "idna": {
             "hashes": [
-                "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac",
-                "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"
+                "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
+                "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==3.8"
+            "version": "==3.10"
         },
         "isort": {
             "hashes": [
@@ -875,11 +904,11 @@
         },
         "json5": {
             "hashes": [
-                "sha256:34ed7d834b1341a86987ed52f3f76cd8ee184394906b6e22a1e0deb9ab294e8f",
-                "sha256:548e41b9be043f9426776f05df8635a00fe06104ea51ed24b67f908856e151ae"
+                "sha256:1f82f36e615bc5b42f1bbd49dbc94b12563c56408c6ffa06414ea310890e9a6e",
+                "sha256:29c56f1accdd8bc2e037321237662034a7e07921e2b7223281a5ce2c46f0c4df"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==0.9.25"
+            "markers": "python_full_version >= '3.8.0'",
+            "version": "==0.9.28"
         },
         "mccabe": {
             "hashes": [
@@ -907,11 +936,11 @@
         },
         "platformdirs": {
             "hashes": [
-                "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee",
-                "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3"
+                "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907",
+                "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==4.2.2"
+            "version": "==4.3.6"
         },
         "pycodestyle": {
             "hashes": [
@@ -924,20 +953,20 @@
         },
         "pylint": {
             "hashes": [
-                "sha256:03c8e3baa1d9fb995b12c1dbe00aa6c4bcef210c2a2634374aedeb22fb4a8f8f",
-                "sha256:a5d01678349454806cff6d886fb072294f56a58c4761278c97fb557d708e1eb3"
+                "sha256:2f846a466dd023513240bc140ad2dd73bfc080a5d85a710afdb728c420a5a2b9",
+                "sha256:9f3dcc87b1203e612b78d91a896407787e708b3f189b5fa0b307712d49ff0c6e"
             ],
-            "markers": "python_full_version >= '3.8.0'",
-            "version": "==3.2.6"
+            "markers": "python_full_version >= '3.9.0'",
+            "version": "==3.3.1"
         },
         "pylint-django": {
             "hashes": [
-                "sha256:2f339e4bf55776958283395c5139c37700c91bd5ef1d8251ef6ac88b5abbba9b",
-                "sha256:5abd5c2228e0e5e2a4cb6d0b4fc1d1cef1e773d0be911412f4dd4fc1a1a440b7"
+                "sha256:19e8c85a8573a04e3de7be2ba91e9a7c818ebf05e1b617be2bbae67a906b725f",
+                "sha256:359f68fe8c810ee6bc8e1ab4c83c19b15a43b234a24b08978f47a23462b5ce28"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.7' and python_version < '4.0'",
-            "version": "==2.5.5"
+            "markers": "python_version >= '3.9' and python_version < '4.0'",
+            "version": "==2.6.1"
         },
         "pylint-plugin-utils": {
             "hashes": [
@@ -1016,111 +1045,112 @@
         },
         "regex": {
             "hashes": [
-                "sha256:0694219a1d54336fd0445ea382d49d36882415c0134ee1e8332afd1529f0baa5",
-                "sha256:086dd15e9435b393ae06f96ab69ab2d333f5d65cbe65ca5a3ef0ec9564dfe770",
-                "sha256:094ba386bb5c01e54e14434d4caabf6583334090865b23ef58e0424a6286d3dc",
-                "sha256:09da66917262d9481c719599116c7dc0c321ffcec4b1f510c4f8a066f8768105",
-                "sha256:0ecf44ddf9171cd7566ef1768047f6e66975788258b1c6c6ca78098b95cf9a3d",
-                "sha256:0fda75704357805eb953a3ee15a2b240694a9a514548cd49b3c5124b4e2ad01b",
-                "sha256:11a963f8e25ab5c61348d090bf1b07f1953929c13bd2309a0662e9ff680763c9",
-                "sha256:150c39f5b964e4d7dba46a7962a088fbc91f06e606f023ce57bb347a3b2d4630",
-                "sha256:1b9d811f72210fa9306aeb88385b8f8bcef0dfbf3873410413c00aa94c56c2b6",
-                "sha256:1e0eabac536b4cc7f57a5f3d095bfa557860ab912f25965e08fe1545e2ed8b4c",
-                "sha256:22a86d9fff2009302c440b9d799ef2fe322416d2d58fc124b926aa89365ec482",
-                "sha256:22f3470f7524b6da61e2020672df2f3063676aff444db1daa283c2ea4ed259d6",
-                "sha256:263ef5cc10979837f243950637fffb06e8daed7f1ac1e39d5910fd29929e489a",
-                "sha256:283fc8eed679758de38fe493b7d7d84a198b558942b03f017b1f94dda8efae80",
-                "sha256:29171aa128da69afdf4bde412d5bedc335f2ca8fcfe4489038577d05f16181e5",
-                "sha256:298dc6354d414bc921581be85695d18912bea163a8b23cac9a2562bbcd5088b1",
-                "sha256:2aae8101919e8aa05ecfe6322b278f41ce2994c4a430303c4cd163fef746e04f",
-                "sha256:2f4e475a80ecbd15896a976aa0b386c5525d0ed34d5c600b6d3ebac0a67c7ddf",
-                "sha256:34e4af5b27232f68042aa40a91c3b9bb4da0eeb31b7632e0091afc4310afe6cb",
-                "sha256:37f8e93a81fc5e5bd8db7e10e62dc64261bcd88f8d7e6640aaebe9bc180d9ce2",
-                "sha256:3a17d3ede18f9cedcbe23d2daa8a2cd6f59fe2bf082c567e43083bba3fb00347",
-                "sha256:3b1de218d5375cd6ac4b5493e0b9f3df2be331e86520f23382f216c137913d20",
-                "sha256:43f7cd5754d02a56ae4ebb91b33461dc67be8e3e0153f593c509e21d219c5060",
-                "sha256:4558410b7a5607a645e9804a3e9dd509af12fb72b9825b13791a37cd417d73a5",
-                "sha256:4719bb05094d7d8563a450cf8738d2e1061420f79cfcc1fa7f0a44744c4d8f73",
-                "sha256:4bfc2b16e3ba8850e0e262467275dd4d62f0d045e0e9eda2bc65078c0110a11f",
-                "sha256:518440c991f514331f4850a63560321f833979d145d7d81186dbe2f19e27ae3d",
-                "sha256:51f4b32f793812714fd5307222a7f77e739b9bc566dc94a18126aba3b92b98a3",
-                "sha256:531ac6cf22b53e0696f8e1d56ce2396311254eb806111ddd3922c9d937151dae",
-                "sha256:5cd05d0f57846d8ba4b71d9c00f6f37d6b97d5e5ef8b3c3840426a475c8f70f4",
-                "sha256:5dd58946bce44b53b06d94aa95560d0b243eb2fe64227cba50017a8d8b3cd3e2",
-                "sha256:60080bb3d8617d96f0fb7e19796384cc2467447ef1c491694850ebd3670bc457",
-                "sha256:636ba0a77de609d6510235b7f0e77ec494d2657108f777e8765efc060094c98c",
-                "sha256:67d3ccfc590e5e7197750fcb3a2915b416a53e2de847a728cfa60141054123d4",
-                "sha256:68191f80a9bad283432385961d9efe09d783bcd36ed35a60fb1ff3f1ec2efe87",
-                "sha256:7502534e55c7c36c0978c91ba6f61703faf7ce733715ca48f499d3dbbd7657e0",
-                "sha256:7aa47c2e9ea33a4a2a05f40fcd3ea36d73853a2aae7b4feab6fc85f8bf2c9704",
-                "sha256:7d2af3f6b8419661a0c421584cfe8aaec1c0e435ce7e47ee2a97e344b98f794f",
-                "sha256:7e316026cc1095f2a3e8cc012822c99f413b702eaa2ca5408a513609488cb62f",
-                "sha256:88ad44e220e22b63b0f8f81f007e8abbb92874d8ced66f32571ef8beb0643b2b",
-                "sha256:88d1f7bef20c721359d8675f7d9f8e414ec5003d8f642fdfd8087777ff7f94b5",
-                "sha256:89723d2112697feaa320c9d351e5f5e7b841e83f8b143dba8e2d2b5f04e10923",
-                "sha256:8a0ccf52bb37d1a700375a6b395bff5dd15c50acb745f7db30415bae3c2b0715",
-                "sha256:8c2c19dae8a3eb0ea45a8448356ed561be843b13cbc34b840922ddf565498c1c",
-                "sha256:905466ad1702ed4acfd67a902af50b8db1feeb9781436372261808df7a2a7bca",
-                "sha256:9852b76ab558e45b20bf1893b59af64a28bd3820b0c2efc80e0a70a4a3ea51c1",
-                "sha256:98a2636994f943b871786c9e82bfe7883ecdaba2ef5df54e1450fa9869d1f756",
-                "sha256:9aa1a67bbf0f957bbe096375887b2505f5d8ae16bf04488e8b0f334c36e31360",
-                "sha256:9eda5f7a50141291beda3edd00abc2d4a5b16c29c92daf8d5bd76934150f3edc",
-                "sha256:a6d1047952c0b8104a1d371f88f4ab62e6275567d4458c1e26e9627ad489b445",
-                "sha256:a9b6d73353f777630626f403b0652055ebfe8ff142a44ec2cf18ae470395766e",
-                "sha256:a9cc99d6946d750eb75827cb53c4371b8b0fe89c733a94b1573c9dd16ea6c9e4",
-                "sha256:ad83e7545b4ab69216cef4cc47e344d19622e28aabec61574b20257c65466d6a",
-                "sha256:b014333bd0217ad3d54c143de9d4b9a3ca1c5a29a6d0d554952ea071cff0f1f8",
-                "sha256:b43523d7bc2abd757119dbfb38af91b5735eea45537ec6ec3a5ec3f9562a1c53",
-                "sha256:b521dcecebc5b978b447f0f69b5b7f3840eac454862270406a39837ffae4e697",
-                "sha256:b77e27b79448e34c2c51c09836033056a0547aa360c45eeeb67803da7b0eedaf",
-                "sha256:b7a635871143661feccce3979e1727c4e094f2bdfd3ec4b90dfd4f16f571a87a",
-                "sha256:b7fca9205b59c1a3d5031f7e64ed627a1074730a51c2a80e97653e3e9fa0d415",
-                "sha256:ba1b30765a55acf15dce3f364e4928b80858fa8f979ad41f862358939bdd1f2f",
-                "sha256:ba99d8077424501b9616b43a2d208095746fb1284fc5ba490139651f971d39d9",
-                "sha256:c25a8ad70e716f96e13a637802813f65d8a6760ef48672aa3502f4c24ea8b400",
-                "sha256:c3c4a78615b7762740531c27cf46e2f388d8d727d0c0c739e72048beb26c8a9d",
-                "sha256:c40281f7d70baf6e0db0c2f7472b31609f5bc2748fe7275ea65a0b4601d9b392",
-                "sha256:c7ad32824b7f02bb3c9f80306d405a1d9b7bb89362d68b3c5a9be53836caebdb",
-                "sha256:cb3fe77aec8f1995611f966d0c656fdce398317f850d0e6e7aebdfe61f40e1cd",
-                "sha256:cc038b2d8b1470364b1888a98fd22d616fba2b6309c5b5f181ad4483e0017861",
-                "sha256:cc37b9aeebab425f11f27e5e9e6cf580be7206c6582a64467a14dda211abc232",
-                "sha256:cc6bb9aa69aacf0f6032c307da718f61a40cf970849e471254e0e91c56ffca95",
-                "sha256:d126361607b33c4eb7b36debc173bf25d7805847346dd4d99b5499e1fef52bc7",
-                "sha256:d15b274f9e15b1a0b7a45d2ac86d1f634d983ca40d6b886721626c47a400bf39",
-                "sha256:d166eafc19f4718df38887b2bbe1467a4f74a9830e8605089ea7a30dd4da8887",
-                "sha256:d498eea3f581fbe1b34b59c697512a8baef88212f92e4c7830fcc1499f5b45a5",
-                "sha256:d6f7e255e5fa94642a0724e35406e6cb7001c09d476ab5fce002f652b36d0c39",
-                "sha256:d78bd484930c1da2b9679290a41cdb25cc127d783768a0369d6b449e72f88beb",
-                "sha256:d865984b3f71f6d0af64d0d88f5733521698f6c16f445bb09ce746c92c97c586",
-                "sha256:d902a43085a308cef32c0d3aea962524b725403fd9373dea18110904003bac97",
-                "sha256:d94a1db462d5690ebf6ae86d11c5e420042b9898af5dcf278bd97d6bda065423",
-                "sha256:da695d75ac97cb1cd725adac136d25ca687da4536154cdc2815f576e4da11c69",
-                "sha256:db2a0b1857f18b11e3b0e54ddfefc96af46b0896fb678c85f63fb8c37518b3e7",
-                "sha256:df26481f0c7a3f8739fecb3e81bc9da3fcfae34d6c094563b9d4670b047312e1",
-                "sha256:e14b73607d6231f3cc4622809c196b540a6a44e903bcfad940779c80dffa7be7",
-                "sha256:e2610e9406d3b0073636a3a2e80db05a02f0c3169b5632022b4e81c0364bcda5",
-                "sha256:e692296c4cc2873967771345a876bcfc1c547e8dd695c6b89342488b0ea55cd8",
-                "sha256:e693e233ac92ba83a87024e1d32b5f9ab15ca55ddd916d878146f4e3406b5c91",
-                "sha256:e81469f7d01efed9b53740aedd26085f20d49da65f9c1f41e822a33992cb1590",
-                "sha256:e8c7e08bb566de4faaf11984af13f6bcf6a08f327b13631d41d62592681d24fe",
-                "sha256:ed19b3a05ae0c97dd8f75a5d8f21f7723a8c33bbc555da6bbe1f96c470139d3c",
-                "sha256:efb2d82f33b2212898f1659fb1c2e9ac30493ac41e4d53123da374c3b5541e64",
-                "sha256:f44dd4d68697559d007462b0a3a1d9acd61d97072b71f6d1968daef26bc744bd",
-                "sha256:f72cbae7f6b01591f90814250e636065850c5926751af02bb48da94dfced7baa",
-                "sha256:f7bc09bc9c29ebead055bcba136a67378f03d66bf359e87d0f7c759d6d4ffa31",
-                "sha256:ff100b203092af77d1a5a7abe085b3506b7eaaf9abf65b73b7d6905b6cb76988"
+                "sha256:02a02d2bb04fec86ad61f3ea7f49c015a0681bf76abb9857f945d26159d2968c",
+                "sha256:02e28184be537f0e75c1f9b2f8847dc51e08e6e171c6bde130b2687e0c33cf60",
+                "sha256:040df6fe1a5504eb0f04f048e6d09cd7c7110fef851d7c567a6b6e09942feb7d",
+                "sha256:068376da5a7e4da51968ce4c122a7cd31afaaec4fccc7856c92f63876e57b51d",
+                "sha256:06eb1be98df10e81ebaded73fcd51989dcf534e3c753466e4b60c4697a003b67",
+                "sha256:072623554418a9911446278f16ecb398fb3b540147a7828c06e2011fa531e773",
+                "sha256:086a27a0b4ca227941700e0b31425e7a28ef1ae8e5e05a33826e17e47fbfdba0",
+                "sha256:08986dce1339bc932923e7d1232ce9881499a0e02925f7402fb7c982515419ef",
+                "sha256:0a86e7eeca091c09e021db8eb72d54751e527fa47b8d5787caf96d9831bd02ad",
+                "sha256:0c32f75920cf99fe6b6c539c399a4a128452eaf1af27f39bce8909c9a3fd8cbe",
+                "sha256:0d7f453dca13f40a02b79636a339c5b62b670141e63efd511d3f8f73fba162b3",
+                "sha256:1062b39a0a2b75a9c694f7a08e7183a80c63c0d62b301418ffd9c35f55aaa114",
+                "sha256:13291b39131e2d002a7940fb176e120bec5145f3aeb7621be6534e46251912c4",
+                "sha256:149f5008d286636e48cd0b1dd65018548944e495b0265b45e1bffecce1ef7f39",
+                "sha256:164d8b7b3b4bcb2068b97428060b2a53be050085ef94eca7f240e7947f1b080e",
+                "sha256:167ed4852351d8a750da48712c3930b031f6efdaa0f22fa1933716bfcd6bf4a3",
+                "sha256:1c4de13f06a0d54fa0d5ab1b7138bfa0d883220965a29616e3ea61b35d5f5fc7",
+                "sha256:202eb32e89f60fc147a41e55cb086db2a3f8cb82f9a9a88440dcfc5d37faae8d",
+                "sha256:220902c3c5cc6af55d4fe19ead504de80eb91f786dc102fbd74894b1551f095e",
+                "sha256:2b3361af3198667e99927da8b84c1b010752fa4b1115ee30beaa332cabc3ef1a",
+                "sha256:2c89a8cc122b25ce6945f0423dc1352cb9593c68abd19223eebbd4e56612c5b7",
+                "sha256:2d548dafee61f06ebdb584080621f3e0c23fff312f0de1afc776e2a2ba99a74f",
+                "sha256:2e34b51b650b23ed3354b5a07aab37034d9f923db2a40519139af34f485f77d0",
+                "sha256:32f9a4c643baad4efa81d549c2aadefaeba12249b2adc5af541759237eee1c54",
+                "sha256:3a51ccc315653ba012774efca4f23d1d2a8a8f278a6072e29c7147eee7da446b",
+                "sha256:3cde6e9f2580eb1665965ce9bf17ff4952f34f5b126beb509fee8f4e994f143c",
+                "sha256:40291b1b89ca6ad8d3f2b82782cc33807f1406cf68c8d440861da6304d8ffbbd",
+                "sha256:41758407fc32d5c3c5de163888068cfee69cb4c2be844e7ac517a52770f9af57",
+                "sha256:4181b814e56078e9b00427ca358ec44333765f5ca1b45597ec7446d3a1ef6e34",
+                "sha256:4f51f88c126370dcec4908576c5a627220da6c09d0bff31cfa89f2523843316d",
+                "sha256:50153825ee016b91549962f970d6a4442fa106832e14c918acd1c8e479916c4f",
+                "sha256:5056b185ca113c88e18223183aa1a50e66507769c9640a6ff75859619d73957b",
+                "sha256:5071b2093e793357c9d8b2929dfc13ac5f0a6c650559503bb81189d0a3814519",
+                "sha256:525eab0b789891ac3be914d36893bdf972d483fe66551f79d3e27146191a37d4",
+                "sha256:52fb28f528778f184f870b7cf8f225f5eef0a8f6e3778529bdd40c7b3920796a",
+                "sha256:5478c6962ad548b54a591778e93cd7c456a7a29f8eca9c49e4f9a806dcc5d638",
+                "sha256:5670bce7b200273eee1840ef307bfa07cda90b38ae56e9a6ebcc9f50da9c469b",
+                "sha256:5704e174f8ccab2026bd2f1ab6c510345ae8eac818b613d7d73e785f1310f839",
+                "sha256:59dfe1ed21aea057a65c6b586afd2a945de04fc7db3de0a6e3ed5397ad491b07",
+                "sha256:5e7e351589da0850c125f1600a4c4ba3c722efefe16b297de54300f08d734fbf",
+                "sha256:63b13cfd72e9601125027202cad74995ab26921d8cd935c25f09c630436348ff",
+                "sha256:658f90550f38270639e83ce492f27d2c8d2cd63805c65a13a14d36ca126753f0",
+                "sha256:684d7a212682996d21ca12ef3c17353c021fe9de6049e19ac8481ec35574a70f",
+                "sha256:69ab78f848845569401469da20df3e081e6b5a11cb086de3eed1d48f5ed57c95",
+                "sha256:6f44ec28b1f858c98d3036ad5d7d0bfc568bdd7a74f9c24e25f41ef1ebfd81a4",
+                "sha256:70b7fa6606c2881c1db9479b0eaa11ed5dfa11c8d60a474ff0e095099f39d98e",
+                "sha256:764e71f22ab3b305e7f4c21f1a97e1526a25ebdd22513e251cf376760213da13",
+                "sha256:7ab159b063c52a0333c884e4679f8d7a85112ee3078fe3d9004b2dd875585519",
+                "sha256:805e6b60c54bf766b251e94526ebad60b7de0c70f70a4e6210ee2891acb70bf2",
+                "sha256:8447d2d39b5abe381419319f942de20b7ecd60ce86f16a23b0698f22e1b70008",
+                "sha256:86fddba590aad9208e2fa8b43b4c098bb0ec74f15718bb6a704e3c63e2cef3e9",
+                "sha256:89d75e7293d2b3e674db7d4d9b1bee7f8f3d1609428e293771d1a962617150cc",
+                "sha256:93c0b12d3d3bc25af4ebbf38f9ee780a487e8bf6954c115b9f015822d3bb8e48",
+                "sha256:94d87b689cdd831934fa3ce16cc15cd65748e6d689f5d2b8f4f4df2065c9fa20",
+                "sha256:9714398225f299aa85267fd222f7142fcb5c769e73d7733344efc46f2ef5cf89",
+                "sha256:982e6d21414e78e1f51cf595d7f321dcd14de1f2881c5dc6a6e23bbbbd68435e",
+                "sha256:997d6a487ff00807ba810e0f8332c18b4eb8d29463cfb7c820dc4b6e7562d0cf",
+                "sha256:a03e02f48cd1abbd9f3b7e3586d97c8f7a9721c436f51a5245b3b9483044480b",
+                "sha256:a36fdf2af13c2b14738f6e973aba563623cb77d753bbbd8d414d18bfaa3105dd",
+                "sha256:a6ba92c0bcdf96cbf43a12c717eae4bc98325ca3730f6b130ffa2e3c3c723d84",
+                "sha256:a7c2155f790e2fb448faed6dd241386719802296ec588a8b9051c1f5c481bc29",
+                "sha256:a93c194e2df18f7d264092dc8539b8ffb86b45b899ab976aa15d48214138e81b",
+                "sha256:abfa5080c374a76a251ba60683242bc17eeb2c9818d0d30117b4486be10c59d3",
+                "sha256:ac10f2c4184420d881a3475fb2c6f4d95d53a8d50209a2500723d831036f7c45",
+                "sha256:ad182d02e40de7459b73155deb8996bbd8e96852267879396fb274e8700190e3",
+                "sha256:b2837718570f95dd41675328e111345f9b7095d821bac435aac173ac80b19983",
+                "sha256:b489578720afb782f6ccf2840920f3a32e31ba28a4b162e13900c3e6bd3f930e",
+                "sha256:b583904576650166b3d920d2bcce13971f6f9e9a396c673187f49811b2769dc7",
+                "sha256:b85c2530be953a890eaffde05485238f07029600e8f098cdf1848d414a8b45e4",
+                "sha256:b97c1e0bd37c5cd7902e65f410779d39eeda155800b65fc4d04cc432efa9bc6e",
+                "sha256:ba9b72e5643641b7d41fa1f6d5abda2c9a263ae835b917348fc3c928182ad467",
+                "sha256:bb26437975da7dc36b7efad18aa9dd4ea569d2357ae6b783bf1118dabd9ea577",
+                "sha256:bb8f74f2f10dbf13a0be8de623ba4f9491faf58c24064f32b65679b021ed0001",
+                "sha256:bde01f35767c4a7899b7eb6e823b125a64de314a8ee9791367c9a34d56af18d0",
+                "sha256:bec9931dfb61ddd8ef2ebc05646293812cb6b16b60cf7c9511a832b6f1854b55",
+                "sha256:c36f9b6f5f8649bb251a5f3f66564438977b7ef8386a52460ae77e6070d309d9",
+                "sha256:cdf58d0e516ee426a48f7b2c03a332a4114420716d55769ff7108c37a09951bf",
+                "sha256:d1cee317bfc014c2419a76bcc87f071405e3966da434e03e13beb45f8aced1a6",
+                "sha256:d22326fcdef5e08c154280b71163ced384b428343ae16a5ab2b3354aed12436e",
+                "sha256:d3660c82f209655a06b587d55e723f0b813d3a7db2e32e5e7dc64ac2a9e86fde",
+                "sha256:da8f5fc57d1933de22a9e23eec290a0d8a5927a5370d24bda9a6abe50683fe62",
+                "sha256:df951c5f4a1b1910f1a99ff42c473ff60f8225baa1cdd3539fe2819d9543e9df",
+                "sha256:e5364a4502efca094731680e80009632ad6624084aff9a23ce8c8c6820de3e51",
+                "sha256:ea1bfda2f7162605f6e8178223576856b3d791109f15ea99a9f95c16a7636fb5",
+                "sha256:f02f93b92358ee3f78660e43b4b0091229260c5d5c408d17d60bf26b6c900e86",
+                "sha256:f056bf21105c2515c32372bbc057f43eb02aae2fda61052e2f7622c801f0b4e2",
+                "sha256:f1ac758ef6aebfc8943560194e9fd0fa18bcb34d89fd8bd2af18183afd8da3a2",
+                "sha256:f2a19f302cd1ce5dd01a9099aaa19cae6173306d1302a43b627f62e21cf18ac0",
+                "sha256:f654882311409afb1d780b940234208a252322c24a93b442ca714d119e68086c",
+                "sha256:f65557897fc977a44ab205ea871b690adaef6b9da6afda4790a2484b04293a5f",
+                "sha256:f9d1e379028e0fc2ae3654bac3cbbef81bf3fd571272a42d56c24007979bafb6",
+                "sha256:fdabbfc59f2c6edba2a6622c647b716e34e8e3867e0ab975412c5c2f79b82da2",
+                "sha256:fdd6028445d2460f33136c55eeb1f601ab06d74cb3347132e1c24250187500d9",
+                "sha256:ff590880083d60acc0433f9c3f713c51f7ac6ebb9adf889c79a261ecf541aa91"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==2023.12.25"
+            "markers": "python_version >= '3.8'",
+            "version": "==2024.11.6"
         },
         "selenium": {
             "hashes": [
-                "sha256:128d099e66284437e7128d2279176ec7a06e6ec7426e167f5d34987166bd8f46",
-                "sha256:3a8d9f23dc636bd3840dd56f00c2739e32ec0c1e34a821dd553e15babef24477"
+                "sha256:1db3f3a0cd5bb07624fa8a3905a6fdde1595a42185a0617077c361dc53d104fb",
+                "sha256:7640f3f08ae7f4e450f895678e8a10a55eb4e4ca18311ed675ecc4684b96b683"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==4.23.1"
+            "version": "==4.26.1"
         },
         "six": {
             "hashes": [
@@ -1147,11 +1177,11 @@
         },
         "tomli": {
             "hashes": [
-                "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
-                "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"
+                "sha256:3f646cae2aec94e17d04973e4249548320197cfabdf130015d023de4b74d8ab8",
+                "sha256:a5c57c3d1c56f5ccdf89f6523458f60ef716e210fc47c4cfb188c5ba473e0391"
             ],
             "markers": "python_version < '3.11'",
-            "version": "==2.0.1"
+            "version": "==2.1.0"
         },
         "tomlkit": {
             "hashes": [
@@ -1163,19 +1193,19 @@
         },
         "tqdm": {
             "hashes": [
-                "sha256:90279a3770753eafc9194a0364852159802111925aa30eb3f9d85b0e805ac7cd",
-                "sha256:e1020aef2e5096702d8a025ac7d16b1577279c9d63f8375b63083e9a5f0fcbad"
+                "sha256:0cd8af9d56911acab92182e88d763100d4788bdf421d251616040cc4d44863be",
+                "sha256:fe5a6f95e6fe0b9755e9469b77b9c3cf850048224ecaa8293d7d2d31f97d869a"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==4.66.5"
+            "version": "==4.67.0"
         },
         "trio": {
             "hashes": [
-                "sha256:0346c3852c15e5c7d40ea15972c4805689ef2cb8b5206f794c9c19450119f3a4",
-                "sha256:c5237e8133eb0a1d72f09a971a55c28ebe69e351c783fc64bc37db8db8bbe1d0"
+                "sha256:1dcc95ab1726b2da054afea8fd761af74bad79bd52381b84eae408e983c76831",
+                "sha256:68eabbcf8f457d925df62da780eff15ff5dc68fd6b367e2dde59f7aaf2a0b884"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.26.2"
+            "version": "==0.27.0"
         },
         "trio-websocket": {
             "hashes": [
@@ -1195,11 +1225,11 @@
         },
         "urllib3": {
             "hashes": [
-                "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
-                "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
+                "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
+                "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.2.2"
+            "version": "==2.2.3"
         },
         "websocket-client": {
             "hashes": [
diff --git a/VERSION.txt b/VERSION.txt
index 6ba1e98e..ecda9f00 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-0.1-ebab62b9
\ No newline at end of file
+0.1-c58e97d5
\ No newline at end of file
diff --git a/dev-tools/update_pipenv.sh b/dev-tools/update_pipenv.sh
index af31c913..ecbb4cd5 100755
--- a/dev-tools/update_pipenv.sh
+++ b/dev-tools/update_pipenv.sh
@@ -22,7 +22,7 @@ fi
 
 # 2. update pipfile
 if [[ "${INSTALL}" == "dev" ]]; then
-  MYSQLCLIENT_LDFLAGS='-L/usr/mysql/lib -lmysqlclient -lssl -lcrypto -lresolv' MYSQLCLIENT_CFLAGS='-I/usr/include/mysql/' PIPENV_VENV_IN_PROJECT=1 pipenv update --dev
+  MYSQLCLIENT_LDFLAGS='-L/usr/mysql/lib -lmysqlclient -lssl -lcrypto -lresolv' MYSQLCLIENT_CFLAGS='-I/usr/include/mysql/' PIPENV_VENV_IN_PROJECT=1 pipenv update --dev -v
 else
   echo "This is not a developer setup...still trying to update"
   MYSQLCLIENT_LDFLAGS='-L/usr/mysql/lib -lmysqlclient -lssl -lcrypto -lresolv' MYSQLCLIENT_CFLAGS='-I/usr/include/mysql/' PIPENV_VENV_IN_PROJECT=1 pipenv update
diff --git a/embark/tracker/tables.py b/embark/tracker/tables.py
index 9429260a..cc9479df 100644
--- a/embark/tracker/tables.py
+++ b/embark/tracker/tables.py
@@ -32,7 +32,6 @@ def render_properties(self, value, record):
             '{}'
             '</div', record.id, record.id, record.id, record.id, value
         )
-    
 
     class Meta:
         model = SoftwareInfo
diff --git a/embark/users/models.py b/embark/users/models.py
index 5861742e..110946d4 100644
--- a/embark/users/models.py
+++ b/embark/users/models.py
@@ -32,7 +32,6 @@ class User(AbstractUser):
     team_role = models.IntegerField(choices=Role.choices(), default=Role.VIEWER)
     is_active_member = models.BooleanField(default=True, help_text='Whether this team member is active or not')
 
-
     class Meta:
         permissions = (
             ("non_minimal", "Can access more functionalities of embark"),