Skip to content

Backport $toMillis security fixes to v1 (CVE-2026-52746) #825

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

Merged
mattbaileyuk merged 2 commits into from
Jul 30, 2026
+14 −1
Merged

Backport $toMillis security fixes to v1 (CVE-2026-52746) #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8df51e1
fix $toMillis() with more than 3 digit fractional seconds (#782)
andrew-coleman Apr 30, 2026
66beb9d
fix iso8601 regex pattern (#793)
andrew-coleman May 14, 2026
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
7 changes: 6 additions & 1 deletion src/datetime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,11 @@ const dateTime = (function () {
}
return offsetHours * 60 + offsetMinutes;
};
} else if (part.component === 'f') {
res.regex = '[0-9]+';
res.parse = function(value) {
return parseFloat('0.' + value.substring(0, 3)) * 1000;
};
} else if (part.integerFormat) {
part.integerFormat.n = part.n;
res = generateRegex(part.integerFormat);
Expand Down Expand Up @@ -1296,7 +1301,7 @@ const dateTime = (function () {
}

// Regular expression to match an ISO 8601 formatted timestamp
var iso8601regex = new RegExp('^\\d{4}(-[01]\\d)*(-[0-3]\\d)*(T[0-2]\\d:[0-5]\\d:[0-5]\\d)*(\\.\\d+)?([+-][0-2]\\d:?[0-5]\\d|Z)?$');
var iso8601regex = new RegExp('^\\d{4}(-[01]\\d)?(-[0-3]\\d)?(T[0-2]\\d:[0-5]\\d:[0-5]\\d)?(\\.\\d+)?([+-][0-2]\\d:?[0-5]\\d|Z)?$');

/**
* Converts an ISO 8601 timestamp to milliseconds since the epoch
Expand Down
8 changes: 8 additions & 0 deletions test/test-suite/groups/function-tomillis/parseDateTime.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,5 +366,13 @@
"expr": "$toMillis('2020-09-09 12:00:00 +0530', '[Y0001]-[M01]-[D01] [H01]:[m01]:[s01] [Z0001]') ~> $fromMillis() ",
"data": {},
"result": "2020-09-09T06:30:00.000Z"
},
{
"function": "#toMillis",
"category": "timezones",
"description": "should correctly parse fractional seconds of more than 3 digits, and truncate to millis",
"expr": "$toMillis('2026-04-08T19:05:04.01987', '[Y0001]-[M01]-[D01]T[H01]:[m01]:[s01].[f1]') ~> $fromMillis() ",
"data": {},
"result": "2026-04-08T19:05:04.019Z"
}
]
Loading