Raise exception for unexpected timestamp for OldJSON and SenML

eclipse-leshan · Jun 7, 2024 · 31dccaa · 31dccaa
1 parent 491017d
commit 31dccaa
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/json/LwM2mNodeJsonDecoder.java b/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/json/LwM2mNodeJsonDecoder.java
@@ -92,6 +92,9 @@ public <T extends LwM2mNode> T decode(byte[] content, LwM2mPath path, LwM2mModel
             if (timestampedNodes.size() == 0) {
                 return null;
             } else {
+                TimestampedLwM2mNode timestampedNode = timestampedNodes.get(0);
+                validateNoTimestampedValue(timestampedNode, path);
+
                 // return the most recent value
                 return (T) timestampedNodes.get(0).getNode();
             }
@@ -112,6 +115,12 @@ public List<TimestampedLwM2mNode> decodeTimestampedData(byte[] content, LwM2mPat
         }
     }
 
+    protected void validateNoTimestampedValue(TimestampedLwM2mNode timestampedNode, LwM2mPath path) {
+        if (timestampedNode.getTimestamp() != null) {
+            throw new CodecException("Unable to decode node[path:%s] : value should not be timestamped", path);
+        }
+    }
+
     private List<TimestampedLwM2mNode> parseJSON(JsonRootObject jsonObject, LwM2mPath requestPath, LwM2mModel model,
             Class<? extends LwM2mNode> nodeClass) throws CodecException {
 

diff --git a/...an-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLDecoder.java b/...an-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLDecoder.java
@@ -104,9 +104,7 @@ public <T extends LwM2mNode> T decode(byte[] content, LwM2mPath path, LwM2mModel
                     throw new CodecException("Invalid path [%s] for resource, it should start by %s",
                             resolvedRecord.getPath(), path);
                 }
-                if (resolvedRecord.getTimeStamp() != null) {
-                    throw new CodecException("Unable to decode node[path:%s] : value should not be timestamped", path);
-                }
+                validateNoTimestampedRecord(resolvedRecord);
                 resolvedRecords.add(resolvedRecord);
             }
 
@@ -141,6 +139,7 @@ public Map<LwM2mPath, LwM2mNode> decodeNodes(byte[] content, List<LwM2mPath> pat
                         // Meaning that a given path could have no corresponding value.
                         nodes.put(path, null);
                     } else {
+                        validateNoTimestampedRecord(records);
                         LwM2mNode node = parseRecords(recordsByPath.get(path), path, model,
                                 DefaultLwM2mDecoder.nodeClassFromPath(path));
                         nodes.put(path, node);
@@ -153,6 +152,7 @@ public Map<LwM2mPath, LwM2mNode> decodeNodes(byte[] content, List<LwM2mPath> pat
                 for (SenMLRecord record : pack.getRecords()) {
                     LwM2mResolvedSenMLRecord resolvedRecord = resolver.resolve(record);
                     LwM2mPath path = resolvedRecord.getPath();
+                    validateNoTimestampedRecord(resolvedRecord);
                     LwM2mNode node = parseRecords(Arrays.asList(resolvedRecord), path, model,
                             DefaultLwM2mDecoder.nodeClassFromPath(path));
                     nodes.put(path, node);
@@ -165,6 +165,19 @@ public Map<LwM2mPath, LwM2mNode> decodeNodes(byte[] content, List<LwM2mPath> pat
         }
     }
 
+    protected void validateNoTimestampedRecord(Collection<LwM2mResolvedSenMLRecord> resolvedRecords) {
+        for (LwM2mResolvedSenMLRecord resolvedRecord : resolvedRecords) {
+            validateNoTimestampedRecord(resolvedRecord);
+        }
+    }
+
+    protected void validateNoTimestampedRecord(LwM2mResolvedSenMLRecord resolvedRecord) {
+        if (resolvedRecord.getTimeStamp() != null) {
+            throw new CodecException("Unable to decode node[path:%s] : value should not be timestamped",
+                    resolvedRecord.getPath());
+        }
+    }
+
     @Override
     public List<TimestampedLwM2mNode> decodeTimestampedData(byte[] content, LwM2mPath path, LwM2mModel model,
             Class<? extends LwM2mNode> nodeClass) throws CodecException {