Commit c6ab26d4 authored by Serhiy Storchaka's avatar Serhiy Storchaka

Issue #22885: Fixed arbitrary code execution vulnerability in the dumbdbm

module.  Original patch by Claudiu Popa.
parent 8a1724bf
...@@ -21,6 +21,7 @@ is read when the database is opened, and some updates rewrite the whole index) ...@@ -21,6 +21,7 @@ is read when the database is opened, and some updates rewrite the whole index)
""" """
import ast as _ast
import os as _os import os as _os
import __builtin__ import __builtin__
import UserDict import UserDict
...@@ -85,7 +86,7 @@ class _Database(UserDict.DictMixin): ...@@ -85,7 +86,7 @@ class _Database(UserDict.DictMixin):
with f: with f:
for line in f: for line in f:
line = line.rstrip() line = line.rstrip()
key, pos_and_siz_pair = eval(line) key, pos_and_siz_pair = _ast.literal_eval(line)
self._index[key] = pos_and_siz_pair self._index[key] = pos_and_siz_pair
# Write the index dict to the directory file. The original directory # Write the index dict to the directory file. The original directory
......
...@@ -160,6 +160,14 @@ class DumbDBMTestCase(unittest.TestCase): ...@@ -160,6 +160,14 @@ class DumbDBMTestCase(unittest.TestCase):
self.assertEqual(expected, got) self.assertEqual(expected, got)
f.close() f.close()
def test_eval(self):
with open(_fname + '.dir', 'w') as stream:
stream.write("str(__import__('sys').stdout.write('Hacked!')), 0\n")
with test_support.captured_stdout() as stdout:
with self.assertRaises(ValueError):
dumbdbm.open(_fname).close()
self.assertEqual(stdout.getvalue(), '')
def tearDown(self): def tearDown(self):
_delete_files() _delete_files()
......
...@@ -18,6 +18,9 @@ Core and Builtins ...@@ -18,6 +18,9 @@ Core and Builtins
Library Library
------- -------
- Issue #22885: Fixed arbitrary code execution vulnerability in the dumbdbm
module. Original patch by Claudiu Popa.
- Issue #21849: Fixed xmlrpclib serialization of non-ASCII unicode strings in - Issue #21849: Fixed xmlrpclib serialization of non-ASCII unicode strings in
the multiprocessing module. the multiprocessing module.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment