Skip to content

fix: restrict numeric date fields to ASCII digits CVE-2026-60074 #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robrwo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: restrict numeric date fields to ASCII digits CVE-2026-60074 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion lib/Date/Manip/Base.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,15 @@ sub check {
my($self,$date) = @_;
my($y,$m,$d,$h,$mn,$s) = @$date;

# The range tests below numify each field, and numifying truncates a
# string at the first character which is not an ASCII digit, so a
# field such as "202\x{664}" would pass them as 202. Require ASCII
# digits.

foreach my $val ($y,$m,$d) {
return 0 if (! defined($val) || $val !~ /^[0-9]+$/);
}

return 0 if (! $self->check_time([$h,$mn,$s]) ||
$y<1 || $y>9999 ||
$m<1 || $m>12);
Expand All @@ -617,7 +626,7 @@ sub check_time {
my($self,$hms) = @_;
my($h,$mn,$s) = @$hms;

return 0 if ("$h:$mn:$s" !~ /^\d\d?:\d\d?:\d\d?$/o ||
return 0 if ("$h:$mn:$s" !~ /^[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}$/o ||
$h > 24 || $mn > 59 || $s > 59 ||
($h == 24 && ($mn || $s)));
return 1;
Expand Down
84 changes: 42 additions & 42 deletions lib/Date/Manip/Date.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,30 +837,30 @@ BEGIN {
###

if ($f eq 'Y') {
$re .= '(?<y>\d\d\d\d)';
$re .= '(?<y>[0-9]{4})';

} elsif ($f eq 'y') {
$re .= '(?<y>\d\d)';
$re .= '(?<y>[0-9]{2})';

} elsif ($f eq 'm') {
$re .= '(?<m>\d\d)';
$re .= '(?<m>[0-9]{2})';

} elsif ($f eq 'f') {
$re .= '(?:(?<m>\d\d)| ?(?<m>\d))';
$re .= '(?:(?<m>[0-9]{2})| ?(?<m>[0-9]))';

} elsif (exists $mon_form{$f}) {
my $abb = $$dmb{'data'}{'rx'}{'month_abb'}[0];
my $nam = $$dmb{'data'}{'rx'}{'month_name'}[0];
$re .= "(?:(?<mon_name>$nam)|(?<mon_abb>$abb))";

} elsif ($f eq 'j') {
$re .= '(?<doy>\d\d\d)';
$re .= '(?<doy>[0-9]{3})';

} elsif ($f eq 'd') {
$re .= '(?<d>\d\d)';
$re .= '(?<d>[0-9]{2})';

} elsif ($f eq 'e') {
$re .= '(?:(?<d>\d\d)| ?(?<d>\d))';
$re .= '(?:(?<d>[0-9]{2})| ?(?<d>[0-9]))';

} elsif (exists $day_form{$f}) {
my $abb = $$dmb{'data'}{'rx'}{'day_abb'}[0];
Expand All @@ -876,41 +876,41 @@ BEGIN {
$re .= "(?<nth>$nth)"

} elsif ($f eq 'H' || $f eq 'I') {
$re .= '(?<h>\d\d)';
$re .= '(?<h>[0-9]{2})';

} elsif ($f eq 'k' || $f eq 'i') {
$re .= '(?:(?<h>\d\d)| ?(?<h>\d))';
$re .= '(?:(?<h>[0-9]{2})| ?(?<h>[0-9]))';

} elsif ($f eq 'p') {
my $ampm = $$dmb{data}{rx}{ampm}[0];
$re .= "(?<ampm>$ampm)";

} elsif ($f eq 'M') {
$re .= '(?<mn>\d\d)';
$re .= '(?<mn>[0-9]{2})';

} elsif ($f eq 'S') {
$re .= '(?<s>\d\d)';
$re .= '(?<s>[0-9]{2})';

} elsif (exists $z_form{$f}) {
$re .= $dmt->_zrx('zrx');

} elsif ($f eq 's') {
$re .= '(?<epochs>\d+)';
$re .= '(?<epochs>[0-9]+)';

} elsif ($f eq 'o') {
$re .= '(?<epocho>\d+)';
$re .= '(?<epocho>[0-9]+)';

} elsif ($f eq 'G') {
$re .= '(?<g>\d\d\d\d)';
$re .= '(?<g>[0-9]{4})';

} elsif ($f eq 'W') {
$re .= '(?<w>\d\d)';
$re .= '(?<w>[0-9]{2})';

} elsif ($f eq 'L') {
$re .= '(?<l>\d\d\d\d)';
$re .= '(?<l>[0-9]{4})';

} elsif ($f eq 'U') {
$re .= '(?<u>\d\d)';
$re .= '(?<u>[0-9]{2})';

} elsif ($f eq 'c') {
$format = '%a %b %e %H:%M:%S %Y' . $format;
Expand Down Expand Up @@ -1168,15 +1168,15 @@ sub _iso8601_rx {

if ($rx eq 'cdate' || $rx eq 'tdate') {

my $y4 = '(?<y>\d\d\d\d)';
my $y2 = '(?<y>\d\d)';
my $y4 = '(?<y>[0-9]{4})';
my $y2 = '(?<y>[0-9]{2})';
my $m = '(?<m>0[1-9]|1[0-2])';
my $d = '(?<d>0[1-9]|[12][0-9]|3[01])';
my $doy = '(?<doy>00[1-9]|0[1-9][0-9]|[1-2][0-9][0-9]|3[0-5][0-9]|36[0-6])';
my $w = '(?<w>0[1-9]|[1-4][0-9]|5[0-3])';
my $dow = '(?<dow>[1-7])';
my $yod = '(?<yod>\d)';
my $cc = '(?<c>\d\d)';
my $yod = '(?<yod>[0-9])';
my $cc = '(?<c>[0-9]{2})';

my @cdaterx =
(
Expand Down Expand Up @@ -1238,9 +1238,9 @@ sub _iso8601_rx {
my $h24b = '(?<h24>24(?:00){0,2})';
my $h = '(?<h>[0-9])';

my $fh = '(?:[\.,](?<fh>\d*))'; # fractional hours (keep)
my $fm = '(?:[\.,](?<fm>\d*))'; # fractional seconds (keep)
my $fs = '(?:[\.,]\d*)'; # fractional hours (discard)
my $fh = '(?:[\.,](?<fh>[0-9]*))'; # fractional hours (keep)
my $fm = '(?:[\.,](?<fm>[0-9]*))'; # fractional seconds (keep)
my $fs = '(?:[\.,][0-9]*)'; # fractional hours (discard)

my $zrx = $dmt->_zrx('zrx');

Expand Down Expand Up @@ -1445,9 +1445,9 @@ sub _other_rx {
$f1 = "[.,]";
$f2 = "[.,:]";
}
my $fh = "(?:$f1(?<fh>\\d*))"; # fractional hours (keep)
my $fm = "(?:$f1(?<fm>\\d*))"; # fractional minutes (keep)
my $fs = "(?:$f2\\d*)"; # fractional seconds
my $fh = "(?:$f1(?<fh>[0-9]*))"; # fractional hours (keep)
my $fm = "(?:$f1(?<fm>[0-9]*))"; # fractional minutes (keep)
my $fs = "(?:${f2}[0-9]*)"; # fractional seconds

# AM/PM

Expand Down Expand Up @@ -1533,10 +1533,10 @@ sub _other_rx {

# Do NOT replace <m> and <d> with a regular expression to
# match 1-12 since the DateFormat config may reverse the two.
my $y4 = '(?<y>\d\d\d\d)';
my $y2 = '(?<y>\d\d)';
my $m = '(?<m>\d\d?)';
my $d = '(?<d>\d\d?)';
my $y4 = '(?<y>[0-9]{4})';
my $y2 = '(?<y>[0-9]{2})';
my $m = '(?<m>[0-9]{1,2})';
my $d = '(?<d>[0-9]{1,2})';
my $sep = '(?<sep>[\s\.\/\-])';

my @daterx =
Expand All @@ -1555,11 +1555,11 @@ sub _other_rx {
my $abb = $$dmb{'data'}{'rx'}{'month_abb'}[0];
my $nam = $$dmb{'data'}{'rx'}{'month_name'}[0];

my $y4 = '(?<y>\d\d\d\d)';
my $y2 = '(?<y>\d\d)';
my $m = '(?<m>\d\d?)';
my $d = '(?<d>\d\d?)';
my $dd = '(?<d>\d\d)';
my $y4 = '(?<y>[0-9]{4})';
my $y2 = '(?<y>[0-9]{2})';
my $m = '(?<m>[0-9]{1,2})';
my $d = '(?<d>[0-9]{1,2})';
my $dd = '(?<d>[0-9]{2})';
my $mmm = "(?:(?<mmm>$abb)|(?<month>$nam))";
my $sep = '(?<sep>[\s\.\/\-])';

Expand Down Expand Up @@ -1610,7 +1610,7 @@ sub _other_rx {
my $abb = $$dmb{'data'}{'rx'}{'month_abb'}[0];
my $nam = $$dmb{'data'}{'rx'}{'month_name'}[0];

my $y4 = '(?<y>\d\d\d\d)';
my $y4 = '(?<y>[0-9]{4})';
my $mmm = "(?:(?<mmm>$abb)|(?<month>$nam))";
my $sep = '(?<sep>[\s\.\/\-])';

Expand Down Expand Up @@ -1656,11 +1656,11 @@ sub _other_rx {
my $special = $$dmb{'data'}{'rx'}{'offset_time'}[0];

$special = "(?<special>$special)";
my $secs = "(?<epoch>[-+]?\\d+)";
my $secs = "(?<epoch>[-+]?[0-9]+)";
my $abb = $$dmb{'data'}{'rx'}{'month_abb'}[0];
my $mmm = "(?<mmm>$abb)";
my $y4 = '(?<y>\d\d\d\d)';
my $dd = '(?<d>\d\d)';
my $y4 = '(?<y>[0-9]{4})';
my $dd = '(?<d>[0-9]{2})';
my $h24 = '(?<h>2[0-3]|[01][0-9])'; # 00-23
my $mn = '(?<mn>[0-5][0-9])'; # 00-59
my $ss = '(?<s>[0-5][0-9])'; # 00-59
Expand Down Expand Up @@ -1697,7 +1697,7 @@ sub _other_rx {
my $nth_wom = $$dmb{'data'}{'rx'}{'nth_wom'}[0];
my $special = $$dmb{'data'}{'rx'}{'offset_date'}[0];

my $y = '(?:(?<y>\d\d\d\d)|(?<y>\d\d))';
my $y = '(?:(?<y>[0-9]{4})|(?<y>[0-9]{2}))';
my $mmm = "(?:(?<mmm>$abb)|(?<month>$nam))";
$next = "(?<next>$next)";
$last = "(?<last>$last)";
Expand Down Expand Up @@ -1732,7 +1732,7 @@ sub _other_rx {
# nth day in MMM [YYYY]

"${nth}\\s+${wf}\\s*$y?", # DoW Nth week [YYYY]
"${wf}\\s+(?<n>\\d+)\\s*$y?", # DoW week N [YYYY]
"${wf}\\s+(?<n>[0-9]+)\\s*$y?", # DoW week N [YYYY]

"${special}", # today, tomorrow
"${special}\\s+${wf}", # today week
Expand Down