From d38e5b3170183a8d9788bdf4c0f0ac1597dda6de Mon Sep 17 00:00:00 2001
From: Marcel van der Veldt <marcel.vanderveldt@nabucasa.com>
Date: Sat, 4 Nov 2023 20:12:29 +0100
Subject: [PATCH] Add temporary guard for infinite loop in resub logic (#428)

---
 matter_server/common/models.py            |  1 +
 matter_server/server/device_controller.py | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/matter_server/common/models.py b/matter_server/common/models.py
index 1c0d2223..678c1ea9 100644
--- a/matter_server/common/models.py
+++ b/matter_server/common/models.py
@@ -80,6 +80,7 @@ class MatterNodeData:
     attribute_subscriptions: set[tuple[int | str, int | str, int | str]] = field(
         default_factory=set
     )
+    last_subscription_attempt: float = 0
 
 
 @dataclass
diff --git a/matter_server/server/device_controller.py b/matter_server/server/device_controller.py
index 10926646..811a1583 100644
--- a/matter_server/server/device_controller.py
+++ b/matter_server/server/device_controller.py
@@ -8,6 +8,7 @@
 from functools import partial
 import logging
 import random
+import time
 from typing import TYPE_CHECKING, Any, Callable, Iterable, Type, TypeVar, cast
 
 from chip.ChipDeviceCtrl import CommissionableNode
@@ -731,6 +732,26 @@ def resubscription_attempted(
             nextResubscribeIntervalMsec: int,
         ) -> None:
             # pylint: disable=unused-argument, invalid-name
+            cur_timestamp = time.time()
+            if (
+                nextResubscribeIntervalMsec > 30000
+                and (cur_timestamp - node.last_subscription_attempt) < 2
+            ):
+                # Guard for a (possible) bug in the sdk where the resubscription gets into
+                # an endloop loop where this callback is hit multiple times per second.
+                node_logger.error(
+                    "Infinite loop detected in resubscription, "
+                    "start manual resubscription logic."
+                )
+                # cancel subscription and add this node to our node polling job
+                sub.Shutdown()
+                self._subscriptions.pop(node_id)
+                assert self.server.loop
+                self.server.loop.create_task(
+                    self._check_interview_and_subscription(node_id, MAX_POLL_INTERVAL)
+                )
+                return
+            node.last_subscription_attempt = cur_timestamp
             node_logger.info(
                 "Previous subscription failed with Error: %s, re-subscribing in %s ms...",
                 terminationError,