Deprecate crm_time_period_t, and some other cleanups

cts/cli/regression.dates.exp

@@ -1,10 +1,10 @@
 =#=#=#= Begin test: Invalid period - [] =#=#=#=
-crm_time_parse_period 	error: No ISO 8601 time period given
+parse_period 	error: No ISO 8601 time period given
 iso8601: Invalid interval specified: 
 =#=#=#= End test: Invalid period - [] - Invalid parameter (2) =#=#=#=
 * Passed: iso8601               - Invalid period - []
 =#=#=#= Begin test: Invalid period - [2019-01-01 00:00:00Z] =#=#=#=
-crm_time_parse_period 	error: '2019-01-01 00:00:00Z' is not a valid ISO 8601 time period because it has no duration or ending time
+parse_period 	error: '2019-01-01 00:00:00Z' is not a valid ISO 8601 time period because it has no duration or ending time
 iso8601: Invalid interval specified: 2019-01-01 00:00:00Z
 =#=#=#= End test: Invalid period - [2019-01-01 00:00:00Z] - Invalid parameter (2) =#=#=#=
 * Passed: iso8601               - Invalid period - [2019-01-01 00:00:00Z]
@@ -14,7 +14,7 @@ iso8601: Invalid interval specified: 2019-01-01 00:00:00Z/
 =#=#=#= End test: Invalid period - [2019-01-01 00:00:00Z/] - Invalid parameter (2) =#=#=#=
 * Passed: iso8601               - Invalid period - [2019-01-01 00:00:00Z/]
 =#=#=#= Begin test: Invalid period - [PT2S/P1M] =#=#=#=
-crm_time_parse_period 	error: 'PT2S/P1M' is not a valid ISO 8601 time period because it has two durations
+parse_period 	error: 'PT2S/P1M' is not a valid ISO 8601 time period because it has two durations
 iso8601: Invalid interval specified: PT2S/P1M
 =#=#=#= End test: Invalid period - [PT2S/P1M] - Invalid parameter (2) =#=#=#=
 * Passed: iso8601               - Invalid period - [PT2S/P1M]
@@ -69,15 +69,30 @@ iso8601: Invalid interval specified: 2019-01-01 00:00:00Z/P
 =#=#=#= End test: Invalid period - [2019-01-01 00:00:00Z/P] - Invalid parameter (2) =#=#=#=
 * Passed: iso8601               - Invalid period - [2019-01-01 00:00:00Z/P]
 =#=#=#= Begin test: Invalid period - [P1Z/2019-02-20 00:00:00Z] =#=#=#=
-crm_time_parse_duration 	error: 'P1Z/2019-02-20 00:00:00Z' is not a valid ISO 8601 time duration because 'Z' is not a valid time unit
+parse_duration_element 	error: 'P1Z/2019-02-20 00:00:00Z' is not a valid ISO 8601 duration because 'Z' is not a valid time unit
 iso8601: Invalid interval specified: P1Z/2019-02-20 00:00:00Z
 =#=#=#= End test: Invalid period - [P1Z/2019-02-20 00:00:00Z] - Invalid parameter (2) =#=#=#=
 * Passed: iso8601               - Invalid period - [P1Z/2019-02-20 00:00:00Z]
 =#=#=#= Begin test: Invalid period - [P1YM/2019-02-20 00:00:00Z] =#=#=#=
-crm_time_parse_duration 	error: 'P1YM/2019-02-20 00:00:00Z' is not a valid ISO 8601 time duration because no valid integer at 'M/2019-02-20 00:00:00Z'
+parse_duration_element 	error: 'P1YM/2019-02-20 00:00:00Z' is not a valid ISO 8601 duration because no valid integer at 'M/2019-02-20 00:00:00Z'
 iso8601: Invalid interval specified: P1YM/2019-02-20 00:00:00Z
 =#=#=#= End test: Invalid period - [P1YM/2019-02-20 00:00:00Z] - Invalid parameter (2) =#=#=#=
 * Passed: iso8601               - Invalid period - [P1YM/2019-02-20 00:00:00Z]
+=#=#=#= Begin test: Invalid period - [0000-10-01T00:00:00Z/P1M] =#=#=#=
+parse_date 	error: '0000-10-01T00:00:00Z/P1M' is not a valid ISO 8601 date/time specification because '0' is not a valid year
+iso8601: Invalid interval specified: 0000-10-01T00:00:00Z/P1M
+=#=#=#= End test: Invalid period - [0000-10-01T00:00:00Z/P1M] - Invalid parameter (2) =#=#=#=
+* Passed: iso8601               - Invalid period - [0000-10-01T00:00:00Z/P1M]
+=#=#=#= Begin test: Invalid period - [-0001-10-01T00:00:00Z/P1M] =#=#=#=
+parse_date 	error: '-0001-10-01T00:00:00Z/P1M' is not a valid ISO 8601 date/time specification because '4294967295' is not a valid year
+iso8601: Invalid interval specified: -0001-10-01T00:00:00Z/P1M
+=#=#=#= End test: Invalid period - [-0001-10-01T00:00:00Z/P1M] - Invalid parameter (2) =#=#=#=
+* Passed: iso8601               - Invalid period - [-0001-10-01T00:00:00Z/P1M]
+=#=#=#= Begin test: Invalid period - [10000-10-01T00:00:00Z/P1M] =#=#=#=
+parse_period 	error: 'P1M' is not a valid ISO 8601 time period because the start is invalid (must be between 0001-01-01T00:00:00 and 9999-12-31T23:59:59)
+iso8601: Invalid interval specified: 10000-10-01T00:00:00Z/P1M
+=#=#=#= End test: Invalid period - [10000-10-01T00:00:00Z/P1M] - Invalid parameter (2) =#=#=#=
+* Passed: iso8601               - Invalid period - [10000-10-01T00:00:00Z/P1M]
 =#=#=#= Begin test: '2005-040/2005-043' period =#=#=#=
 Period: 2005-02-09 00:00:00Z to 2005-02-12 00:00:00Z
 =#=#=#= End test: '2005-040/2005-043' period - OK (0) =#=#=#=

cts/cts-cli.in

@@ -9,7 +9,7 @@
 # We know this is a very long file.
 # pylint: disable=too-many-lines
 
-__copyright__ = "Copyright 2024-2025 the Pacemaker project contributors"
+__copyright__ = "Copyright 2024-2026 the Pacemaker project contributors"
 __license__ = "GNU General Public License version 2 or later (GPLv2+) WITHOUT ANY WARRANTY"
 
 import argparse
@@ -252,7 +252,6 @@ def sanitize_output(s):
         (r'crm_feature_set="[^"]*" ', r''),
         (r'@crm_feature_set=[0-9.]+, ', r''),
         (r'\(crm_time_parse_duration@.*\.c:[0-9]+\)', r'crm_time_parse_duration'),
-        (r'\(crm_time_parse_period@.*\.c:[0-9]+\)', r'crm_time_parse_period'),
         (r'\(parse_hms@.*\.c:[0-9]+\)', r'parse_hms'),
         (re.escape(cts_cli_data), r'CTS_CLI_DATA'),
         (r' default="[^"]*"', r' default=""'),
@@ -261,6 +260,8 @@ def sanitize_output(s):
         (r'last_update time=".*"', r'last_update time=""'),
         (r' last-rc-change=[\'"][-+A-Za-z0-9: ]*[\'"],?', r''),
         (r'\(parse_date@.*\.c:[0-9]+\)', r'parse_date'),
+        (r'\(parse_duration_element@.*\.c:[0-9]+\)', r'parse_duration_element'),
+        (r'\(parse_period@.*\.c:[0-9]+\)', r'parse_period'),
         (r'\((pcmk__.*)@.*\.c:[0-9]+\)', r'\1'),
         (r'.*Relax-NG validity error : ', r''),
         (r'request=".*cibadmin', r'request="cibadmin'),
@@ -1115,6 +1116,9 @@ class DatesRegressionTest(RegressionTest):
             "2019-01-01 00:00:00Z/P",           # Duration with no values
             "P1Z/2019-02-20 00:00:00Z",         # Invalid duration unit
             "P1YM/2019-02-20 00:00:00Z",        # No number for duration unit
+            "0000-10-01T00:00:00Z/P1M",         # Zero year
+            "-0001-10-01T00:00:00Z/P1M",        # Negative year
+            "10000-10-01T00:00:00Z/P1M",        # Year greater than 9999
         ]
 
         # Ensure invalid period specifications are rejected

include/crm/common/iso8601.h

@@ -38,16 +38,6 @@ extern "C" {
  */
 typedef struct crm_time_s crm_time_t;
 
-/*!
- * \deprecated Use \c crm_time_period_t instead of
- *             <tt>struct crm_time_period_s</tt>.
- */
-typedef struct crm_time_period_s {
-    crm_time_t *start;
-    crm_time_t *end;
-    crm_time_t *diff;
-} crm_time_period_t;
-
 /* Creates a new date/time object conforming to ISO 8601, for example:
  *   Ordinal:   2010-01 12:00:00 +10:00
  *   Gregorian: 2010-01-01 12:00:00 +10:00
@@ -82,8 +72,6 @@ char *crm_time_as_string(const crm_time_t *dt, int flags);
 crm_time_t *crm_time_parse_duration(const char *duration_str);
 crm_time_t *crm_time_calculate_duration(const crm_time_t *dt,
                                         const crm_time_t *value);
-crm_time_period_t *crm_time_parse_period(const char *period_str);
-void crm_time_free_period(crm_time_period_t *period);
 
 int crm_time_compare(const crm_time_t *a, const crm_time_t *b);
 

include/crm/common/iso8601_compat.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2025 the Pacemaker project contributors
+ * Copyright 2004-2026 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -29,6 +29,13 @@ extern "C" {
  *             release.
  */
 
+//! \deprecated Do not use
+typedef struct crm_time_period_s {
+    crm_time_t *start;
+    crm_time_t *end;
+    crm_time_t *diff;
+} crm_time_period_t;
+
 //! \deprecated Do not use
 bool crm_time_leapyear(int year);
 
@@ -66,6 +73,12 @@ void crm_time_log_alias(int log_level, const char *file, const char *function,
                         int line, const char *prefix,
                         const crm_time_t *date_time, int flags);
 
+//! \deprecated Do not use
+void crm_time_free_period(crm_time_period_t *period);
+
+//! \deprecated Do not use
+crm_time_period_t *crm_time_parse_period(const char *period_str);
+
 #ifdef __cplusplus
 }
 #endif

include/crm/common/iso8601_internal.h

@@ -27,6 +27,7 @@
 extern "C" {
 #endif
 
+bool pcmk__time_valid_year(int year);
 void pcmk__time_get_ywd(const crm_time_t *dt, uint32_t *y, uint32_t *w,
                         uint32_t *d);
 char *pcmk__time_format_hr(const char *format, const crm_time_t *dt, int usec);
@@ -63,6 +64,8 @@ struct crm_time_s {
     bool duration;
 };
 
+bool valid_time(const crm_time_t *dt);
+
 #ifdef __cplusplus
 }
 #endif

lib/common/fuzzers/iso8601_fuzzer.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-2025 the Pacemaker project contributors
+ * Copyright 2024-2026 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -21,8 +21,6 @@ int
 LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 {
     char *ns = NULL;
-    crm_time_period_t *period = NULL;
-
     struct timespec tv = { 0, };
     crm_time_t *now = NULL;
     char *result = NULL;
@@ -34,9 +32,6 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
     ns = pcmk__assert_alloc(size + 1, sizeof(char));
     memcpy(ns, data, size);
 
-    period = crm_time_parse_period(ns);
-    crm_time_free_period(period);
-
     qb_util_timespec_from_epoch_get(&tv);
     now = pcmk__copy_timet(tv.tv_sec);
     result = pcmk__time_format_hr(ns, now,