Skip to content

gh-75223: Reject undotted extensions in mimetypes.add_type #2895

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

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
+25 −0
Draft

gh-75223: Reject undotted extensions in mimetypes.add_type #2895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2e6a0e5
Add a test for mimetypes.add_type
OddBloke Jul 26, 2017
1485be9
bpo-31040: Reject undotted extensions in mimetypes.add_type
OddBloke Jul 26, 2017
f0c1bf7
Address the review
arhadthedev Apr 15, 2023
0d9bec2
Merge branch 'main' into fix-for-31040
arhadthedev Apr 15, 2023
2f23267
Merge branch 'main' into fix-for-31040
hugovk Nov 6, 2024
ef5cf14
Assert output first, expected result second; link to method in news
hugovk Nov 16, 2024
bac8d5d
Assert adding MIME type with empty extension emits no warning
hugovk Nov 16, 2024
e177398
Assert exception message when adding MIME type with undotted extension
hugovk Nov 16, 2024
094f69b
Remove unused import
hugovk Nov 16, 2024
cbc5421
Fix Sphinx reference; replace bpo with gh-issue
hugovk Nov 16, 2024
41d4e89
Replace with more useful test case
hugovk Nov 16, 2024
50179cf
Improve wording: avoid triple negative
hugovk Nov 16, 2024
352811b
Fix news filename
hugovk Nov 16, 2024
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
5 changes: 5 additions & 0 deletions Lib/mimetypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ def add_type(self, type, ext, strict=True):
If strict is true, information will be added to
list of standard types, else to the list of non-standard
types.

Valid extensions are empty or start with a '.'.
Raise a ValueError for invalid extensions.
"""
if ext and not ext.startswith('.'):
raise ValueError("Extensions should start with a '.' or be empty")
self.types_map[strict][ext] = type
exts = self.types_map_inv[strict].setdefault(type, [])
if ext not in exts:
Expand Down
19 changes: 19 additions & 0 deletions Lib/test/test_mimetypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import os
import sys
import unittest.mock
import warnings

from test import support
from test.support import os_helper
Expand Down Expand Up @@ -305,6 +306,24 @@ def test_keywords_args_api(self):
self.assertEqual(self.db.guess_extension(
type='image/jpg', strict=False), '.jpg')

def test_added_types_are_used(self):
mimetypes.add_type('testing/default-type', '')
mime_type, _ = mimetypes.guess_type('')
self.assertEqual(mime_type, 'testing/default-type')

mime_type, _ = mimetypes.guess_type('test.myext')
self.assertEqual(mime_type, None)

mimetypes.add_type('testing/type', '.myext')
mime_type, _ = mimetypes.guess_type('test.myext')
self.assertEqual(mime_type, 'testing/type')

def test_add_type_with_undotted_extension_raises_exception(self):
with self.assertRaisesRegex(
ValueError, "Extensions should start with a '.' or be empty"
):
mimetypes.add_type('testing/type', 'undotted')


@unittest.skipUnless(sys.platform.startswith("win"), "Windows only")
class Win32MimeTypesTestCase(unittest.TestCase):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2019-09-10-09-28-52.gh-issue-75223.VyAJS9.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Reject undotted extensions in :meth:`mimetypes.MimeTypes.add_type`.
Loading