add protection against bad timestamps in senml packs

diwise · Jun 26, 2024 · 9a181c1 · 9a181c1
1 parent e868f48
commit 9a181c1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/internal/pkg/application/functions/functions_test.go b/internal/pkg/application/functions/functions_test.go
@@ -216,12 +216,12 @@ func TestAddToHistory(t *testing.T) {
 
 	f, _ := reg.Find(ctx, MatchSensor(sensorId))
 
-	_ = f[0].Handle(ctx, newMessageAccepted(1.67, time.Now().Add(1*time.Hour)), msgctx)
-	_ = f[0].Handle(ctx, newMessageAccepted(2.67, time.Now().Add(2*time.Hour)), msgctx)
-	_ = f[0].Handle(ctx, newMessageAccepted(3.67, time.Now().Add(3*time.Hour)), msgctx)
-	_ = f[0].Handle(ctx, newMessageAccepted(4.67, time.Now().Add(4*time.Hour)), msgctx)
-	_ = f[0].Handle(ctx, newMessageAccepted(5.67, time.Now().Add(5*time.Hour)), msgctx)
-	_ = f[0].Handle(ctx, newMessageAccepted(6.67, time.Now().Add(6*time.Hour)), msgctx)
+	_ = f[0].Handle(ctx, newMessageAccepted(1.67, time.Now().Add(-6*time.Hour)), msgctx)
+	_ = f[0].Handle(ctx, newMessageAccepted(2.67, time.Now().Add(-5*time.Hour)), msgctx)
+	_ = f[0].Handle(ctx, newMessageAccepted(3.67, time.Now().Add(-4*time.Hour)), msgctx)
+	_ = f[0].Handle(ctx, newMessageAccepted(4.67, time.Now().Add(-3*time.Hour)), msgctx)
+	_ = f[0].Handle(ctx, newMessageAccepted(5.67, time.Now().Add(-2*time.Hour)), msgctx)
+	_ = f[0].Handle(ctx, newMessageAccepted(6.67, time.Now().Add(-1*time.Hour)), msgctx)
 
 	h, _ := f[0].History(ctx, "", 0)
 	is.Equal(6, len(h))

diff --git a/internal/pkg/application/functions/waterqualities/waterqualities.go b/internal/pkg/application/functions/waterqualities/waterqualities.go
@@ -2,6 +2,7 @@ package waterqualities
 
 import (
 	"context"
+	"fmt"
 	"math"
 	"time"
 
@@ -37,6 +38,10 @@ func (wq *waterquality) Handle(ctx context.Context, e *events.MessageAccepted, o
 	r, tempOk := e.Pack.GetRecord(senml.FindByName(SensorValue))
 	ts, timeOk := e.Pack.GetTime(senml.FindByName(SensorValue))
 
+	if ts.After(time.Now().Add(5 * time.Second)) {
+		return false, fmt.Errorf("invalid timestamp %s in waterquality pack: %w", ts.Format(time.RFC3339), events.ErrBadTimestamp)
+	}
+
 	if tempOk && timeOk && r.Value != nil && ts.After(wq.Timestamp) {
 		temp := math.Round(*r.Value*10) / 10
 		oldTemp := wq.Temperature

diff --git a/pkg/messaging/events/events.go b/pkg/messaging/events/events.go
@@ -115,6 +115,7 @@ func (m MessageAccepted) Error() error {
 	return nil
 }
 
+var ErrBadTimestamp = fmt.Errorf("bad timestamp")
 var ErrNoMatch = fmt.Errorf("event mismatch")
 
 func Matches(m MessageAccepted, objectURN string) bool {