Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-14 14:55:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Ensure each charset is attempted only once during media preview. (#11089)

Browse source 
There's no point in trying more than once since it is guaranteed to
continually fail.
This commit is contained in:
Patrick Cloke 2021-10-14 14:51:44 -04:00 • committed by GitHub
parent e2f0b49b3f
commit efd0074ab7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

43
tests/test_preview.py
View file

@ -307,7 +307,7 @@ class CalcOgTestCase(unittest.TestCase):
self.assertEqual(og, {"og:title": "ÿÿ Foo", "og:description": "Some text."})
def test_windows_1252(self):
"""A body which uses windows-1252, but doesn't declare that."""
"""A body which uses cp1252, but doesn't declare that."""
html = b"""
<html>
<head><title>\xf3</title></head>
@ -333,7 +333,7 @@ class MediaEncodingTestCase(unittest.TestCase):
""",
"text/html",
)
self.assertEqual(list(encodings), ["ascii", "utf-8", "windows-1252"])
self.assertEqual(list(encodings), ["ascii", "utf-8", "cp1252"])
# A less well-formed version.
encodings = get_html_media_encodings(
@ -345,7 +345,7 @@ class MediaEncodingTestCase(unittest.TestCase):
""",
"text/html",
)
self.assertEqual(list(encodings), ["ascii", "utf-8", "windows-1252"])
self.assertEqual(list(encodings), ["ascii", "utf-8", "cp1252"])
def test_meta_charset_underscores(self):
"""A character encoding contains underscore."""
@ -358,7 +358,7 @@ class MediaEncodingTestCase(unittest.TestCase):
""",
"text/html",
)
self.assertEqual(list(encodings), ["Shift_JIS", "utf-8", "windows-1252"])
self.assertEqual(list(encodings), ["shift_jis", "utf-8", "cp1252"])
def test_xml_encoding(self):
"""A character encoding is found via the meta tag."""
@ -370,7 +370,7 @@ class MediaEncodingTestCase(unittest.TestCase):
""",
"text/html",
)
self.assertEqual(list(encodings), ["ascii", "utf-8", "windows-1252"])
self.assertEqual(list(encodings), ["ascii", "utf-8", "cp1252"])
def test_meta_xml_encoding(self):
"""Meta tags take precedence over XML encoding."""
@ -384,7 +384,7 @@ class MediaEncodingTestCase(unittest.TestCase):
""",
"text/html",
)
self.assertEqual(list(encodings), ["UTF-16", "ascii", "utf-8", "windows-1252"])
self.assertEqual(list(encodings), ["utf-16", "ascii", "utf-8", "cp1252"])
def test_content_type(self):
"""A character encoding is found via the Content-Type header."""
@ -399,9 +399,36 @@ class MediaEncodingTestCase(unittest.TestCase):
)
for header in headers:
encodings = get_html_media_encodings(b"", header)
self.assertEqual(list(encodings), ["ascii", "utf-8", "windows-1252"])
self.assertEqual(list(encodings), ["ascii", "utf-8", "cp1252"])
def test_fallback(self):
"""A character encoding cannot be found in the body or header."""
encodings = get_html_media_encodings(b"", "text/html")
self.assertEqual(list(encodings), ["utf-8", "windows-1252"])
self.assertEqual(list(encodings), ["utf-8", "cp1252"])
def test_duplicates(self):
"""Ensure each encoding is only attempted once."""
encodings = get_html_media_encodings(
b"""
<?xml version="1.0" encoding="utf8"?>
<html>
<head><meta charset="UTF-8">
</head>
</html>
""",
'text/html; charset="UTF_8"',
)
self.assertEqual(list(encodings), ["utf-8", "cp1252"])
def test_unknown_invalid(self):
"""A character encoding should be ignored if it is unknown or invalid."""
encodings = get_html_media_encodings(
b"""
<html>
<head><meta charset="invalid">
</head>
</html>
""",
'text/html; charset="invalid"',
)
self.assertEqual(list(encodings), ["utf-8", "cp1252"])