Metaclasses with metaclasses with a __dict__ descriptor can no longer trigger code execution with inspect.getattr_static.

Closes issue 11829.
This commit is contained in:
Michael Foord 2011-12-22 01:13:37 +00:00
parent 65a3f4b8c5
commit 3ba95f8bd9
3 changed files with 25 additions and 4 deletions

View File

@ -1161,6 +1161,7 @@ def getattr_static(obj, attr, default=_sentinel):
if obj is klass: if obj is klass:
# for types we check the metaclass too # for types we check the metaclass too
for entry in _static_getmro(type(klass)): for entry in _static_getmro(type(klass)):
if _shadowed_dict(type(entry)) is _sentinel:
try: try:
return entry.__dict__[attr] return entry.__dict__[attr]
except KeyError: except KeyError:

View File

@ -1088,6 +1088,23 @@ def test_module(self):
self.assertIsNot(inspect.getattr_static(sys, "version", sentinel), self.assertIsNot(inspect.getattr_static(sys, "version", sentinel),
sentinel) sentinel)
def test_metaclass_with_metaclass_with_dict_as_property(self):
class MetaMeta(type):
@property
def __dict__(self):
self.executed = True
return dict(spam=42)
class Meta(type, metaclass=MetaMeta):
executed = False
class Thing(metaclass=Meta):
pass
with self.assertRaises(AttributeError):
inspect.getattr_static(Thing, "spam")
self.assertFalse(Thing.executed)
class TestGetGeneratorState(unittest.TestCase): class TestGetGeneratorState(unittest.TestCase):
def setUp(self): def setUp(self):

View File

@ -97,6 +97,9 @@ Core and Builtins
Library Library
------- -------
- Issue #11829: Fix code execution holes in inspect.getattr_static for
metaclasses with metaclasses. Patch by Andreas Stührk.
- Issue #1785: Fix inspect and pydoc with misbehaving descriptors. - Issue #1785: Fix inspect and pydoc with misbehaving descriptors.
- Issue #11813: Fix inspect.getattr_static for modules. Patch by Andreas - Issue #11813: Fix inspect.getattr_static for modules. Patch by Andreas