From 46dca971e119c031f63cd5fab40390d6cf9576a0 Mon Sep 17 00:00:00 2001
From: Dmytro Skarzhynets <d.skarzh@protonmail.com>
Date: Fri, 2 Feb 2024 11:19:20 +0200
Subject: [PATCH] Add check to ensure that received inactivity time is not
 outdated relative to current activity time

---
 .../state/DefaultDeviceStateService.java      |  8 ++++-
 .../state/DefaultDeviceStateServiceTest.java  | 32 +++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
index b400b4f65a..30c59b3da8 100644
--- a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
@@ -327,10 +327,16 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         DeviceStateData stateData = getOrFetchDeviceStateData(deviceId);
         long currentLastInactivityAlarmTime = stateData.getState().getLastInactivityAlarmTime();
         if (lastInactivityTime <= currentLastInactivityAlarmTime) {
-            log.trace("[{}][{}] On device inactivity: received outdated last inactivity ts [{}]. Skipping this event. Current last inactivity ts [{}].",
+            log.trace("[{}][{}] On device inactivity: received last inactivity ts [{}] is less than current last inactivity ts [{}]. Skipping this event.",
                     tenantId.getId(), deviceId.getId(), lastInactivityTime, currentLastInactivityAlarmTime);
             return;
         }
+        long currentLastActivityTime = stateData.getState().getLastActivityTime();
+        if (lastInactivityTime <= currentLastActivityTime) {
+            log.trace("[{}][{}] On device inactivity: received last inactivity ts [{}] is less or equal to current last activity ts [{}]. Skipping this event.",
+                    tenantId.getId(), deviceId.getId(), lastInactivityTime, currentLastActivityTime);
+            return;
+        }
         log.trace("[{}][{}] On device inactivity: processing inactivity event with ts [{}].", tenantId.getId(), deviceId.getId(), lastInactivityTime);
         reportInactivity(lastInactivityTime, deviceId, stateData);
     }
diff --git a/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java b/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java
index 0ec73af701..8db79a8553 100644
--- a/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java
@@ -333,19 +333,45 @@ public class DefaultDeviceStateServiceTest {
 
     @ParameterizedTest
     @MethodSource("provideOutdatedTimestamps")
-    public void givenOutdatedLastInactivityTime_whenOnDeviceInactivity_thenSkipsThisEvent(long outdatedLastActivityTime, long currentLastActivityTime) {
+    public void givenReceivedInactivityTimeIsLessThanOrEqualToCurrentInactivityTime_whenOnDeviceInactivity_thenSkipsThisEvent(
+            long outdatedLastInactivityTime, long currentLastInactivityTime
+    ) {
+        // GIVEN
+        doReturn(false).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId);
+
+        var deviceStateData = DeviceStateData.builder()
+                .tenantId(tenantId)
+                .deviceId(deviceId)
+                .state(DeviceState.builder().lastInactivityAlarmTime(currentLastInactivityTime).build())
+                .build();
+        service.deviceStates.put(deviceId, deviceStateData);
+
+        // WHEN
+        service.onDeviceInactivity(tenantId, deviceId, outdatedLastInactivityTime);
+
+        // THEN
+        then(clusterService).shouldHaveNoInteractions();
+        then(notificationRuleProcessor).shouldHaveNoInteractions();
+        then(telemetrySubscriptionService).shouldHaveNoInteractions();
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideOutdatedTimestamps")
+    public void givenReceivedInactivityTimeIsLessThanOrEqualToCurrentActivityTime_whenOnDeviceInactivity_thenSkipsThisEvent(
+            long outdatedLastInactivityTime, long currentLastActivityTime
+    ) {
         // GIVEN
         doReturn(false).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId);
 
         var deviceStateData = DeviceStateData.builder()
                 .tenantId(tenantId)
                 .deviceId(deviceId)
-                .state(DeviceState.builder().lastInactivityAlarmTime(currentLastActivityTime).build())
+                .state(DeviceState.builder().lastActivityTime(currentLastActivityTime).build())
                 .build();
         service.deviceStates.put(deviceId, deviceStateData);
 
         // WHEN
-        service.onDeviceInactivity(tenantId, deviceId, outdatedLastActivityTime);
+        service.onDeviceInactivity(tenantId, deviceId, outdatedLastInactivityTime);
 
         // THEN
         then(clusterService).shouldHaveNoInteractions();