Use timestamp as date in header

Author: d4x1

validator/datevalidate.go

@@ -38,28 +38,20 @@ func NewDateValidator() *DateValidator {
 
 // Validate return error when checking if header date is valid or not
 func (v *DateValidator) Validate(r *http.Request) error {
-	timestampStr := r.Header.Get("timestamp")
-	if timestampStr != "" {
-		timestamp, err := strconv.ParseInt(timestampStr, 10, 64)
-		if err == nil {
-			clientTimestamp := time.Unix(timestamp, 0)
-			serverTime := time.Now()
-			start := serverTime.Add(-v.TimeGap)
-			stop := serverTime.Add(v.TimeGap)
-			if clientTimestamp.Before(start) || clientTimestamp.After(stop) {
-				return ErrDateNotInRange
-			}
-			return nil
-		}
+	timestampStr := r.Header.Get("date")
+	if timestampStr == "" {
+		return errors.New("date header is required")
 	}
-	t, err := http.ParseTime(r.Header.Get("date"))
+
+	timestamp, err := strconv.ParseInt(timestampStr, 10, 64)
 	if err != nil {
-		return newPublicError(fmt.Sprintf("Could not parse date header. Error: %s", err.Error()))
+		return newPublicError(fmt.Sprintf("Could not parse date header to timestamp. Error: %s", err.Error()))
 	}
+	clientTimestamp := time.Unix(timestamp, 0)
 	serverTime := time.Now()
 	start := serverTime.Add(-v.TimeGap)
 	stop := serverTime.Add(v.TimeGap)
-	if t.Before(start) || t.After(stop) {
+	if clientTimestamp.Before(start) || clientTimestamp.After(stop) {
 		return ErrDateNotInRange
 	}
 	return nil