paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 00:18:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

markdown: Catch OverflowErrors in global times.

Browse Source 
This also matches the except in the block above.
This commit is contained in:
Alex Vandiver
2024-12-06 14:38:44 +00:00
committed by Tim Abbott
parent 89bc073b5b
commit d2464ff52b
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/markdown.ts
View File

@@ -1,4 +1,4 @@
import {isValid} from "date-fns"; import {getUnixTime, isValid} from "date-fns";
import katex from "katex"; import katex from "katex";
import _ from "lodash"; import _ from "lodash";
import assert from "minimalistic-assert"; import assert from "minimalistic-assert";
@@ -580,7 +580,7 @@ function handleTimestamp(time_string: string): string {
} }
const escaped_time = _.escape(time_string); const escaped_time = _.escape(time_string);
if (!isValid(timeobject)) { if (!isValid(timeobject) || getUnixTime(timeobject) < 0) {
// Unsupported time format: rerender accordingly. // Unsupported time format: rerender accordingly.
// We do not show an error on these formats in local echo because // We do not show an error on these formats in local echo because

2
zerver/lib/markdown/__init__.py
View File

@@ -1455,7 +1455,7 @@ class Timestamp(markdown.inlinepatterns.Pattern):
if timestamp.tzinfo: if timestamp.tzinfo:
try: try:
timestamp = timestamp.astimezone(timezone.utc) timestamp = timestamp.astimezone(timezone.utc)
except ValueError: except (ValueError, OverflowError):
error_element = Element("span") error_element = Element("span")
error_element.set("class", "timestamp-error") error_element.set("class", "timestamp-error")
error_element.text = markdown.util.AtomicString( error_element.text = markdown.util.AtomicString(

7
zerver/tests/fixtures/markdown_test_cases.json vendored
View File

@@ -845,6 +845,13 @@
"marked_expected_output": "<p><span>1969-12-31T00:00:00+32:00</span></p>", "marked_expected_output": "<p><span>1969-12-31T00:00:00+32:00</span></p>",
"text_content": "Invalid time format: 1969-12-31T00:00:00+32:00" "text_content": "Invalid time format: 1969-12-31T00:00:00+32:00"
}, },
{
"name": "timestamp_overflow",
"input": "<time:0001-01-01T01:00:00+02:00>",
"expected_output": "<p><span class=\"timestamp-error\">Invalid time format: 0001-01-01T01:00:00+02:00</span></p>",
"marked_expected_output": "<p><span>0001-01-01T01:00:00+02:00</span></p>",
"text_content": "Invalid time format: 0001-01-01T01:00:00+02:00"
},
{ {
"name": "timestamp_unix", "name": "timestamp_unix",
"input": "Let's meet at <time:1496701800>.", "input": "Let's meet at <time:1496701800>.",