Skip to content

gh-103186: assert in tests that UnsafeMailcapInput warnings are provided #103217

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
merged 9 commits into from
Apr 6, 2023
Merged

gh-103186: assert in tests that UnsafeMailcapInput warnings are provided #103217

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a18d5f0
Suppress warnings for test cases for unsafe input
TabLand Apr 3, 2023
f479570
Merge branch 'python:main' into fix-issue-103186-test_mailcap
TabLand Apr 3, 2023
f412f07
Run patchcheck.py
arhadthedev Apr 6, 2023
605d93f
Rework unsafe input warnings into a new test
TabLand Apr 6, 2023
12e8373
Style improvements
TabLand Apr 6, 2023
80d0ef7
Formatting improvements
TabLand Apr 6, 2023
8bd668d
Further formatting improvements
TabLand Apr 6, 2023
820564d
Formatting improvements
TabLand Apr 6, 2023
bf5f22d
Trim new test function code to less than 80 chars[F
TabLand Apr 6, 2023
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
19 changes: 15 additions & 4 deletions Lib/test/test_mailcap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ def test_subst(self):
(["", "audio/*", "foo.txt"], ""),
(["echo foo", "audio/*", "foo.txt"], "echo foo"),
(["echo %s", "audio/*", "foo.txt"], "echo foo.txt"),
(["echo %t", "audio/*", "foo.txt"], None),
(["echo %t", "audio/wav", "foo.txt"], "echo audio/wav"),
(["echo \\%t", "audio/*", "foo.txt"], "echo %t"),
(["echo foo", "audio/*", "foo.txt", plist], "echo foo"),
Expand Down Expand Up @@ -210,9 +209,6 @@ def test_findmatch(self):
([c, "audio/basic"],
{"key": "description", "filename": fname},
('"An audio fragment"', audio_basic_entry)),
([c, "audio/*"],
{"filename": fname},
(None, None)),
([c, "audio/wav"],
{"filename": fname},
("/usr/local/bin/showaudio audio/wav", audio_entry)),
Expand Down Expand Up @@ -245,6 +241,21 @@ def test_test(self):
]
self._run_cases(cases)

def test_unsafe_mailcap_input(self):
plist = ["total=*"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also only used in one place.

with self.assertWarnsRegex(mailcap.UnsafeMailcapInput,
'Refusing to substitute parameter.*into a shell command'):
self.assertEqual(mailcap.subst("echo %{total}", "audio/wav", "foo.txt", plist), None)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is also > 80 chars


with self.assertWarnsRegex(mailcap.UnsafeMailcapInput,
'Refusing to substitute MIME type.*into a shell'):
self.assertEqual(mailcap.subst("echo %t", "audio/*", "foo.txt"), None)

with self.assertWarnsRegex(mailcap.UnsafeMailcapInput,
'Refusing to use mailcap with filename.*Use a safe temporary filename.'):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'Refusing to use mailcap with filename.*Use a safe temporary filename.'):
'Refusing to use mailcap with filename.*'
'Use a safe temporary filename.'):

self.assertEqual(mailcap.findmatch(MAILCAPDICT,
"audio/wav", filename="foo*.txt"), (None, None))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't want to break the first arg into two lines and then continue with the second arg on the same line.

You can assign the return value of findmatch to a variable and then compare the variable to expected value.
Otherwise, add a newline before the (None, None) and indent it like "mailcap.findmatch".


def _run_cases(self, cases):
for c in cases:
self.assertEqual(mailcap.findmatch(*c[0], **c[1]), c[2])
Expand Down