Relax date validation for 1 digit seconds

hhrutter · hhrutter · commit cea548149bee · 2025-05-30T18:12:43.000+02:00
diff --git a/pkg/pdfcpu/types/date.go b/pkg/pdfcpu/types/date.go
@@ -78,7 +78,7 @@ func parseTimezoneHours(s string, o byte) (int, bool) {
 		return 0, false
 	}
 
-	// Opininated hack.
+	// Opinionated hack.
 	tzh = tzh % 24
 
 	if o == 'Z' && tzh != 0 {
@@ -106,15 +106,19 @@ func parseTimezoneMinutes(s string, o byte) (int, bool) {
 	return tzm, true
 }
 
-func validateTimezoneSeparator(c byte) bool {
+func timezoneSeparator(c byte) bool {
 	return c == '+' || c == '-' || c == 'Z'
 }
 
-func parseTimezone(s string, relaxed bool) (h, m int, ok bool) {
+// func validateTimezoneSeparator(c byte) bool {
+// 	return c == '+' || c == '-' || c == 'Z'
+// }
 
-	o := s[14]
+func parseTimezone(s string, off int, relaxed bool) (h, m int, ok bool) {
 
-	if !validateTimezoneSeparator(o) {
+	o := s[off] // 14
+
+	if !timezoneSeparator(o) {
 		// Ignore timezone on corrupt timezone separator if relaxed.
 		return 0, 0, relaxed
 	}
@@ -125,15 +129,17 @@ func parseTimezone(s string, relaxed bool) (h, m int, ok bool) {
 	// 		"YYYYMMDDHHmmSSZ'"
 	// 		"YYYYMMDDHHmmSSZ'0"
 
+	off++
+
 	if o == 'Z' {
-		t := s[15:]
+		t := s[off:]
 		if t == "" || relaxed && (t == "'" || t == "'0") {
 			return 0, 0, true
 		}
 	}
 
 	// HH'mm
-	s = s[15:]
+	s = s[off:]
 	if s[0] == '-' {
 		s = s[1:]
 	}
@@ -291,24 +297,31 @@ func parseMinute(s string) (min int, finished, ok bool) {
 	return min, false, true
 }
 
-func parseSecond(s string) (sec int, finished, ok bool) {
+func parseSecond(s string) (sec int, finished bool, off int, ok bool) {
+
+	off = 14
+
 	second := s[12:14]
+	if len(second) == 2 && timezoneSeparator(second[1]) {
+		second = second[:1]
+		off = 13
+	}
 
 	sec, err := strconv.Atoi(second)
 	if err != nil {
-		return 0, false, false
+		return 0, false, off, false
 	}
 
 	if sec > 59 {
-		return 0, false, false
+		return 0, false, off, false
 	}
 
 	// "YYYYMMDDHHmmSS"
 	if len(s) == 14 {
-		return sec, true, true
+		return sec, true, off, true
 	}
 
-	return sec, false, true
+	return sec, false, off, true
 }
 
 func digestPopularOutOfSpecDates(s string) (time.Time, bool) {
@@ -406,7 +419,7 @@ func DateTime(s string, relaxed bool) (time.Time, bool) {
 		return d, true
 	}
 
-	sec, finished, ok := parseSecond(s)
+	sec, finished, off, ok := parseSecond(s)
 	if !ok {
 		return d, false
 	}
@@ -417,7 +430,7 @@ func DateTime(s string, relaxed bool) (time.Time, bool) {
 	}
 
 	// Process timezone
-	tzh, tzm, ok := parseTimezone(s, relaxed)
+	tzh, tzm, ok := parseTimezone(s, off, relaxed)
 	if !ok {
 		return d, false
 	}
diff --git a/pkg/pdfcpu/types/date_test.go b/pkg/pdfcpu/types/date_test.go
@@ -104,6 +104,9 @@ func TestParseDateTime(t *testing.T) {
 	s = "D:20210515103719-02'00"
 	doParseDateTimeOK(s, t)
 
+	s = "D:2025022513222+01'00'"
+	doParseDateTimeOK(s, t)
+
 	s = "D:20170430155901+66'A9"
 	doParseDateTimeFail(s, t)
 
