Fix SendRequest validation (not directly linked to this PR ...)

eclipse-leshan · Sep 3, 2024 · 05d6d10 · 05d6d10
1 parent 7554715
commit 05d6d10
Showing 1 changed file with 28 additions and 23 deletions.
diff --git a/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/SendRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/SendRequest.java
@@ -15,6 +15,7 @@
  *******************************************************************************/
 package org.eclipse.leshan.core.request;
 
+import java.time.Instant;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -71,37 +72,41 @@ public SendRequest(ContentFormat format, TimestampedLwM2mNodes timestampedNodes,
             throw new InvalidRequestException("Content format MUST be SenML_CBOR or SenML_JSON but was " + format);
         }
         // Validate Nodes
-        validateNodes(timestampedNodes.getFlattenNodes());
+        validateNodes(timestampedNodes);
 
         this.format = format;
     }
 
-    private void validateNodes(Map<LwM2mPath, LwM2mNode> nodes) {
-        if (nodes == null || nodes.size() == 0) {
+    private void validateNodes(TimestampedLwM2mNodes timestampedNodes) {
+        if (timestampedNodes == null || timestampedNodes.isEmpty() || timestampedNodes.getFlattenNodes().isEmpty()) {
             throw new InvalidRequestException(
                     "SendRequest MUST NOT have empty payload (at least 1 node should be present)");
         }
-        for (Entry<LwM2mPath, LwM2mNode> entry : nodes.entrySet()) {
-            LwM2mPath path = entry.getKey();
-            LwM2mNode node = entry.getValue();
-            if (path == null) {
-                throw new InvalidRequestException("Invalid key for entry (null, %s) : path MUST NOT be null", node);
-            }
-            if (node == null) {
-                throw new InvalidRequestException("Invalid value for entry (%s, null) :  node MUST NOT be null ", path);
-            }
 
-            if (path.isObject() && node instanceof LwM2mObject)
-                return;
-            if (path.isObjectInstance() && node instanceof LwM2mObjectInstance)
-                return;
-            if (path.isResource() && node instanceof LwM2mSingleResource)
-                return;
-            if (path.isResourceInstance() && node instanceof LwM2mResourceInstance)
-                return;
-
-            throw new InvalidRequestException("Invalid value : path (%s) should not refer to a %s value", path,
-                    node.getClass().getSimpleName());
+        for (Instant t : timestampedNodes.getTimestamps()) {
+            for (Entry<LwM2mPath, LwM2mNode> entry : timestampedNodes.getNodesAt(t).entrySet()) {
+                LwM2mPath path = entry.getKey();
+                LwM2mNode node = entry.getValue();
+                if (path == null) {
+                    throw new InvalidRequestException("Invalid key for entry (null, %s) : path MUST NOT be null", node);
+                }
+                if (node == null) {
+                    throw new InvalidRequestException("Invalid value for entry (%s, null) :  node MUST NOT be null ",
+                            path);
+                }
+
+                if (path.isObject() && node instanceof LwM2mObject)
+                    return;
+                if (path.isObjectInstance() && node instanceof LwM2mObjectInstance)
+                    return;
+                if (path.isResource() && node instanceof LwM2mSingleResource)
+                    return;
+                if (path.isResourceInstance() && node instanceof LwM2mResourceInstance)
+                    return;
+
+                throw new InvalidRequestException("Invalid value : path (%s) should not refer to a %s value", path,
+                        node.getClass().getSimpleName());
+            }
         }
     }