From 82335a90cbb0aa68511a81ca8bcc391594560132 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Mon, 22 Jul 2024 23:12:30 +0200
Subject: [PATCH] Don't regard update information without a valid URL (#829)

---
 matter_server/server/device_controller.py     |  2 +-
 matter_server/server/ota/dcl.py               |  3 +++
 tests/server/ota/fixtures/4442-67-197888.json | 19 +++++++++++++++++++
 tests/server/ota/fixtures/4442-67-197910.json | 19 +++++++++++++++++++
 tests/server/ota/fixtures/4442-67-198340.json | 19 +++++++++++++++++++
 tests/server/ota/fixtures/4442-67.json        | 12 ++++++++++++
 tests/server/ota/test_dcl.py                  | 16 ++++++++++++++++
 7 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 tests/server/ota/fixtures/4442-67-197888.json
 create mode 100644 tests/server/ota/fixtures/4442-67-197910.json
 create mode 100644 tests/server/ota/fixtures/4442-67-198340.json
 create mode 100644 tests/server/ota/fixtures/4442-67.json

diff --git a/matter_server/server/device_controller.py b/matter_server/server/device_controller.py
index 9d4d48f8..adfec8f1 100644
--- a/matter_server/server/device_controller.py
+++ b/matter_server/server/device_controller.py
@@ -1024,7 +1024,7 @@ async def _check_node_update(
             node_logger.info("No new update found.")
             return None, None
 
-        if "otaUrl" not in update:
+        if "otaUrl" not in update or update["otaUrl"].strip().length == 0:
             raise UpdateCheckError("Update found, but no OTA URL provided.")
 
         node_logger.info(
diff --git a/matter_server/server/ota/dcl.py b/matter_server/server/ota/dcl.py
index 12686abc..e52b5546 100644
--- a/matter_server/server/ota/dcl.py
+++ b/matter_server/server/ota/dcl.py
@@ -62,6 +62,9 @@ async def _check_update_version(
     if version_candidate["softwareVersionValid"] is False:
         return None
 
+    if version_candidate["otaUrl"].strip() == "":
+        return None
+
     # Check minApplicableSoftwareVersion/maxApplicableSoftwareVersion
     min_sw_version = version_candidate["minApplicableSoftwareVersion"]
     max_sw_version = version_candidate["maxApplicableSoftwareVersion"]
diff --git a/tests/server/ota/fixtures/4442-67-197888.json b/tests/server/ota/fixtures/4442-67-197888.json
new file mode 100644
index 00000000..29ae9a15
--- /dev/null
+++ b/tests/server/ota/fixtures/4442-67-197888.json
@@ -0,0 +1,19 @@
+{
+  "modelVersion": {
+    "vid": 4442,
+    "pid": 67,
+    "softwareVersion": 197888,
+    "softwareVersionString": "3.5.0",
+    "cdVersionNumber": 1,
+    "firmwareInformation": "",
+    "softwareVersionValid": true,
+    "otaUrl": "",
+    "otaFileSize": "0",
+    "otaChecksum": "",
+    "otaChecksumType": 0,
+    "minApplicableSoftwareVersion": 0,
+    "maxApplicableSoftwareVersion": 197888,
+    "releaseNotesUrl": "",
+    "creator": "cosmos1sggrrmw05e6alve8umwdaszade5qxyt53kthud"
+  }
+}
diff --git a/tests/server/ota/fixtures/4442-67-197910.json b/tests/server/ota/fixtures/4442-67-197910.json
new file mode 100644
index 00000000..78d91243
--- /dev/null
+++ b/tests/server/ota/fixtures/4442-67-197910.json
@@ -0,0 +1,19 @@
+{
+  "modelVersion": {
+    "vid": 4442,
+    "pid": 67,
+    "softwareVersion": 197910,
+    "softwareVersionString": "3.5.22",
+    "cdVersionNumber": 1,
+    "firmwareInformation": "",
+    "softwareVersionValid": true,
+    "otaUrl": "",
+    "otaFileSize": "0",
+    "otaChecksum": "",
+    "otaChecksumType": 0,
+    "minApplicableSoftwareVersion": 0,
+    "maxApplicableSoftwareVersion": 197910,
+    "releaseNotesUrl": "",
+    "creator": "cosmos1sggrrmw05e6alve8umwdaszade5qxyt53kthud"
+  }
+}
diff --git a/tests/server/ota/fixtures/4442-67-198340.json b/tests/server/ota/fixtures/4442-67-198340.json
new file mode 100644
index 00000000..ec52379b
--- /dev/null
+++ b/tests/server/ota/fixtures/4442-67-198340.json
@@ -0,0 +1,19 @@
+{
+  "modelVersion": {
+    "vid": 4442,
+    "pid": 67,
+    "softwareVersion": 198340,
+    "softwareVersionString": "3.6.196",
+    "cdVersionNumber": 1,
+    "firmwareInformation": "",
+    "softwareVersionValid": true,
+    "otaUrl": "https://nl67-firmware.s3.amazonaws.com/3.6.196_r8.matter",
+    "otaFileSize": "755976",
+    "otaChecksum": "46pqTh87M5fNhvR/zzt1M0RNQcVa8bApOCat7aKQ3KA=",
+    "otaChecksumType": 1,
+    "minApplicableSoftwareVersion": 198317,
+    "maxApplicableSoftwareVersion": 198340,
+    "releaseNotesUrl": "",
+    "creator": "cosmos1sggrrmw05e6alve8umwdaszade5qxyt53kthud"
+  }
+}
diff --git a/tests/server/ota/fixtures/4442-67.json b/tests/server/ota/fixtures/4442-67.json
new file mode 100644
index 00000000..21597eb6
--- /dev/null
+++ b/tests/server/ota/fixtures/4442-67.json
@@ -0,0 +1,12 @@
+{
+  "modelVersions": {
+    "vid": 4442,
+    "pid": 67,
+    "softwareVersions": [
+      197120,
+      197888,
+      197910,
+      198340
+    ]
+  }
+}
diff --git a/tests/server/ota/test_dcl.py b/tests/server/ota/test_dcl.py
index 9d2bbee5..eb507aba 100644
--- a/tests/server/ota/test_dcl.py
+++ b/tests/server/ota/test_dcl.py
@@ -72,3 +72,19 @@ async def test_check_updates_specific_version(aioresponse):
     result = await check_for_update(MagicMock(), 4447, 8194, 1000, 1011)
 
     assert result == data["modelVersion"]
+
+
+async def test_check_no_update_if_url_empty(aioresponse):
+    """Test the case checks if latest version gets picked version."""
+    # Call the function with a current software version of 1000 and request 1011 as update
+    data = _load_fixture("4442-67.json")
+    aioresponse.get(url="/dcl/model/versions/4442/67", payload=data)
+    data = _load_fixture("4442-67-197888.json")
+    aioresponse.get(url="/dcl/model/versions/4442/67/197888", payload=data)
+    data = _load_fixture("4442-67-197910.json")
+    aioresponse.get(url="/dcl/model/versions/4442/67/197910", payload=data)
+    data = _load_fixture("4442-67-198340.json")
+    aioresponse.get(url="/dcl/model/versions/4442/67/198340", payload=data)
+    result = await check_for_update(MagicMock(), 4442, 67, 197120)
+
+    assert result is None