[Zope-Checkins] CVS: Zope/lib/python/Products/PageTemplates - Expressions.py:1.43.44.2 ZRPythonExpr.py:1.10.68.1 ZPythonExpr.py:NONE

[Tres Seaver]

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv30073/lib/python/Products/PageTemplates

Modified Files:
      Tag: Zope-2_7-branch
	Expressions.py ZRPythonExpr.py 
Removed Files:
      Tag: Zope-2_7-branch
	ZPythonExpr.py 
Log Message:


  Merge security audit work for the 2.7 branch:

    - Collector #1140: setting the access control implementation from
      the configuration file didn't work.  The ZOPE_SECURITY_POLICY
      environment variable is no longer honored.

    - Browsers that do not escape html in query strings such as 
      Internet Explorer 5.5 could potentially send a script tag in a 
      query string to the ZSearch interface for cross-site scripting.

    - FilteredSets (used within TopicIndex) are defined via an expression,
      which was naievely eval'ed.

    - The ZTUtils SimpleTree decompressed tree state data from the 
      request without checking for final size, which could allow for 
      certain types of DoS attacks.

    - Inadequate security assertions on administrative "find" methods 
      could potentially be abused.

    - Some improper security assertions on DTMLDocument objects could 
      potentially allow access to members that should be protected.

    - Class security was not properly intialized for PythonScripts, 
      potentially allowing access to variables that should be protected. 
      It turned out that most of the security assertions were in fact 
      activated as a side effect of other code, but this fix is still 
      appropriate to ensure that all security declarations are properly 
      applied.

    - The dtml-tree tag used an "eval" of user-supplied data; its 
      efforts to prevent abuse were ineffective.

    - XML-RPC marshalling of class instances used the instance 
      __dict__ to marshal the object, and could include attributes 
      prefixed with an underscore name. These attributes are considered 
      private in Zope and should generally not be disclosed.

    - Some property types were stored in a mutable data type (list) which 
      could potentially allow untrusted code to effect changes on those 
      properties without going through appropriate security checks in 
      particular scenarios.

    - Inadequate type checking could allow unicode values passed to 
      RESPONSE.write() to be passed into deeper layers of asyncore, 
      where an exception would eventually be generated at a level that 
      would cause the Zserver main loop to terminate.

    - The variables bound to page templates and Python scripts such as 
      "context" and "container" were not checked adequately, allowing 
      a script to potentially access those objects without ensuring the 
      necessary permissions on the part of the executing user.

    - Iteration over sequences could in some cases fail to check access 
      to an object obtained from the sequence. Subsequent checks (such 
      as for attributes access) of such an object would still be 
      performed, but it should not have been possible to obtain the 
      object in the first place.

    - List and dictionary instance methods such as the get method of 
      dictionary objects were not security aware and could return an 
      object without checking access to that object. Subsequent checks 
      (such as for attributes access) of such an object would still be 
      performed, but it should not have been possible to obtain the 
      object in the first place.

    - Use of 'import as. in Python scripts could potentially rebind 
      names in ways that could be used to avoid appropriate security 
      checks.

    - A number of newer built-ins (min, max, enumerate, iter, sum)
      were either unavailable in untrusted code or did not perform
      adequate security checking.

    - Unpacking via function calls, variable assignment, exception 
      variables and other contexts did not perform adequate security 
      checks, potentially allowing access to objects that should have 
      been protected.

    - DTMLMethods with proxy rights could incorrectly transfer those 
      rights via acquisition when traversing to a parent object.



=== Zope/lib/python/Products/PageTemplates/Expressions.py 1.43.44.1 => 1.43.44.2 ===
--- Zope/lib/python/Products/PageTemplates/Expressions.py:1.43.44.1	Tue Nov  4 14:37:04 2003
+++ Zope/lib/python/Products/PageTemplates/Expressions.py	Thu Jan  8 18:33:49 2004
@@ -54,12 +54,7 @@
         from AccessControl import Unauthorized
     except ImportError:
         Unauthorized = "Unauthorized"
-    if hasattr(AccessControl, 'full_read_guard'):
-        from ZRPythonExpr import PythonExpr, _SecureModuleImporter, \
-             call_with_ns
-    else:
-        from ZPythonExpr import PythonExpr, _SecureModuleImporter, \
-             call_with_ns
+    from ZRPythonExpr import PythonExpr, _SecureModuleImporter, call_with_ns
 else:
     from PythonExpr import getSecurityManager, PythonExpr
     guarded_getattr = getattr
@@ -312,7 +307,7 @@
             # Skip directly to item access
             o = object[name]
             # Check access to the item.
-            if not validate(object, object, name, o):
+            if not validate(object, object, None, o):
                 raise Unauthorized, name
             object = o
             continue
@@ -367,7 +362,7 @@
                     raise
                 else:
                     # Check access to the item.
-                    if not validate(object, object, name, o):
+                    if not validate(object, object, None, o):
                         raise Unauthorized, name
         object = o
 


=== Zope/lib/python/Products/PageTemplates/ZRPythonExpr.py 1.10 => 1.10.68.1 ===
--- Zope/lib/python/Products/PageTemplates/ZRPythonExpr.py:1.10	Wed Aug 14 18:17:24 2002
+++ Zope/lib/python/Products/PageTemplates/ZRPythonExpr.py	Thu Jan  8 18:33:49 2004
@@ -18,19 +18,18 @@
 
 __version__='$Revision$'[11:-2]
 
-from AccessControl import full_read_guard, full_write_guard, \
-     safe_builtins, getSecurityManager
-from AccessControl.ZopeGuards import guarded_getattr, guarded_getitem
+from AccessControl import safe_builtins
+from AccessControl.ZopeGuards import guarded_getattr, get_safe_globals
 from RestrictedPython import compile_restricted_eval
 from TALES import CompilerError
 
 from PythonExpr import PythonExpr
 
 class PythonExpr(PythonExpr):
-    _globals = {'__debug__': __debug__,
-                '__builtins__': safe_builtins,
-                '_getattr_': guarded_getattr,
-                '_getitem_': guarded_getitem,}
+    _globals = get_safe_globals()
+    _globals['_getattr_'] = guarded_getattr
+    _globals['__debug__' ] = __debug__
+
     def __init__(self, name, expr, engine):
         self.expr = expr = expr.strip().replace('\n', ' ')
         code, err, warn, use = compile_restricted_eval(expr, str(self))

=== Removed File Zope/lib/python/Products/PageTemplates/ZPythonExpr.py ===