Commit ad3f8ae5 authored by Tres Seaver's avatar Tres Seaver

Removed DWIM'y attempt to filter acquired-but-not-acceessible results

from 'guarded_getattr'.
parent ed9f6f9a
...@@ -144,6 +144,9 @@ Zope Changes ...@@ -144,6 +144,9 @@ Zope Changes
Bugs fixed Bugs fixed
- Removed DWIM'y attempt to filter acquired-but-not-aceessible
results from 'guarded_getattr'.
- Collector #1267: applied patch to fix segmentation faults on - Collector #1267: applied patch to fix segmentation faults on
x86_64 systems x86_64 systems
......
...@@ -554,10 +554,6 @@ def guarded_getattr(inst, name, default=_marker): ...@@ -554,10 +554,6 @@ def guarded_getattr(inst, name, default=_marker):
return v return v
validate = SecurityManagement.getSecurityManager().validate validate = SecurityManagement.getSecurityManager().validate
# Filter out the objects we can't access.
if hasattr(inst, 'aq_acquire'):
return inst.aq_acquire(name, aq_validate, validate)
# Or just try to get the attribute directly.
if validate(inst, inst, name, v): if validate(inst, inst, name, v):
return v return v
raise Unauthorized, name raise Unauthorized, name
...@@ -2159,18 +2159,6 @@ guarded_getattr(PyObject *inst, PyObject *name, PyObject *default_, ...@@ -2159,18 +2159,6 @@ guarded_getattr(PyObject *inst, PyObject *name, PyObject *default_,
} }
/* /*
# Filter out the objects we can't access.
if hasattr(inst, 'aq_acquire'):
return inst.aq_acquire(name, aq_validate, validate)
*/
if (aq_isWrapper(inst))
{
Py_DECREF(v);
return aq_Acquire(inst, name, aq_validate, validate, 1, NULL, 0);
}
/*
# Or just try to get the attribute directly.
if validate(inst, inst, name, v): if validate(inst, inst, name, v):
return v return v
*/ */
......
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