From 6a87fc88f7e178d41eea0b379dc230a113465e8a Mon Sep 17 00:00:00 2001
From: Deluan <deluan@navidrome.org>
Date: Tue, 2 Nov 2021 10:26:43 -0400
Subject: [PATCH] Ignores invalid timestamps in requests (use current time)

Fix this issue: https://www.reddit.com/r/navidrome/comments/ql3imf/scrobbling_fails_when_using_substreamer/
---
 utils/request_helpers.go      | 9 +++++++--
 utils/request_helpers_test.go | 7 +++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/utils/request_helpers.go b/utils/request_helpers.go
index 74210c32d..1fe454609 100644
--- a/utils/request_helpers.go
+++ b/utils/request_helpers.go
@@ -5,6 +5,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/navidrome/navidrome/log"
 )
 
 func ParamString(r *http.Request, param string) string {
@@ -28,9 +30,12 @@ func ParamTimes(r *http.Request, param string) []time.Time {
 	times := make([]time.Time, len(pStr))
 	for i, t := range pStr {
 		ti, err := strconv.ParseInt(t, 10, 64)
-		if err == nil {
-			times[i] = ToTime(ti)
+		if err != nil {
+			log.Warn(r.Context(), "Ignoring invalid time param", "time", t, err)
+			times[i] = time.Now()
+			continue
 		}
+		times[i] = ToTime(ti)
 	}
 	return times
 }
diff --git a/utils/request_helpers_test.go b/utils/request_helpers_test.go
index e6d46e4a1..ffd964ce7 100644
--- a/utils/request_helpers_test.go
+++ b/utils/request_helpers_test.go
@@ -92,6 +92,13 @@ var _ = Describe("Request Helpers", func() {
 		It("returns all param occurrences as []time.Time", func() {
 			Expect(ParamTimes(r, "t")).To(Equal([]time.Time{d1, d2}))
 		})
+		It("returns current time as default if param is invalid", func() {
+			now := time.Now()
+			r = httptest.NewRequest("GET", "/ping?t=null", nil)
+			times := ParamTimes(r, "t")
+			Expect(times).To(HaveLen(1))
+			Expect(times[0]).To(BeTemporally(">=", now))
+		})
 	})
 
 	Describe("ParamInt", func() {