Commit 3fb70d4b authored by Sidnei da Silva's avatar Sidnei da Silva

- Launchpad #282677: fixed implementation of guarded_map and provided

  tests and implementation for guarded_zip (RestrictedPython).
parent 46204f0a
...@@ -8,6 +8,10 @@ Zope Changes ...@@ -8,6 +8,10 @@ Zope Changes
Bugs fixed Bugs fixed
- Launchpad #282677: fixed implementation of guarded_map and
provided tests and implementation for guarded_zip
(RestrictedPython).
- Lauchpad #143736,#271395: fixed AttributeError' on _ltid in TempStorage - Lauchpad #143736,#271395: fixed AttributeError' on _ltid in TempStorage
- 'AccessControl.ZopeGuards.guarded_import' mapped some Unauthorized - 'AccessControl.ZopeGuards.guarded_import' mapped some Unauthorized
......
...@@ -255,10 +255,18 @@ def guarded_map(f, *seqs): ...@@ -255,10 +255,18 @@ def guarded_map(f, *seqs):
safe_seqs = [] safe_seqs = []
for seqno in range(len(seqs)): for seqno in range(len(seqs)):
seq = guarded_getitem(seqs, seqno) seq = guarded_getitem(seqs, seqno)
safe_seqs.append(seq) safe_seqs.append(guarded_iter(seq))
return map(f, *safe_seqs) return map(f, *safe_seqs)
safe_builtins['map'] = guarded_map safe_builtins['map'] = guarded_map
def guarded_zip(*seqs):
safe_seqs = []
for seqno in range(len(seqs)):
seq = guarded_getitem(seqs, seqno)
safe_seqs.append(guarded_iter(seq))
return zip(*safe_seqs)
safe_builtins['zip'] = guarded_zip
def guarded_import(mname, globals=None, locals=None, fromlist=None): def guarded_import(mname, globals=None, locals=None, fromlist=None):
if fromlist is None: if fromlist is None:
fromlist = () fromlist = ()
......
...@@ -19,6 +19,7 @@ $Id$ ...@@ -19,6 +19,7 @@ $Id$
""" """
import os, sys import os, sys
import operator
import unittest import unittest
from zope.testing import doctest from zope.testing import doctest
import ZODB import ZODB
...@@ -28,7 +29,7 @@ from AccessControl import Unauthorized ...@@ -28,7 +29,7 @@ from AccessControl import Unauthorized
from AccessControl.ZopeGuards \ from AccessControl.ZopeGuards \
import guarded_getattr, get_dict_get, get_dict_pop, get_list_pop, \ import guarded_getattr, get_dict_get, get_dict_pop, get_list_pop, \
get_iter, guarded_min, guarded_max, safe_builtins, guarded_enumerate, \ get_iter, guarded_min, guarded_max, safe_builtins, guarded_enumerate, \
guarded_sum, guarded_apply guarded_sum, guarded_apply, guarded_map, guarded_zip
try: try:
__file__ __file__
...@@ -236,6 +237,22 @@ class TestListGuards(GuardTestCase): ...@@ -236,6 +237,22 @@ class TestListGuards(GuardTestCase):
class TestBuiltinFunctionGuards(GuardTestCase): class TestBuiltinFunctionGuards(GuardTestCase):
def test_zip_fails(self):
sm = SecurityManager(1) # rejects
old = self.setSecurityManager(sm)
self.assertRaises(Unauthorized, guarded_zip, [1,2,3], [3,2,1])
self.assertRaises(Unauthorized, guarded_zip, [1,2,3], [1])
self.setSecurityManager(old)
def test_map_fails(self):
sm = SecurityManager(1) # rejects
old = self.setSecurityManager(sm)
self.assertRaises(Unauthorized, guarded_map, str,
[1,2,3])
self.assertRaises(Unauthorized, guarded_map, lambda x,y: x+y,
[1,2,3], [3,2,1])
self.setSecurityManager(old)
def test_min_fails(self): def test_min_fails(self):
sm = SecurityManager(1) # rejects sm = SecurityManager(1) # rejects
old = self.setSecurityManager(sm) old = self.setSecurityManager(sm)
...@@ -263,6 +280,21 @@ class TestBuiltinFunctionGuards(GuardTestCase): ...@@ -263,6 +280,21 @@ class TestBuiltinFunctionGuards(GuardTestCase):
self.assertRaises(Unauthorized, guarded_sum, [1,2,3]) self.assertRaises(Unauthorized, guarded_sum, [1,2,3])
self.setSecurityManager(old) self.setSecurityManager(old)
def test_zip_succeeds(self):
sm = SecurityManager() # accepts
old = self.setSecurityManager(sm)
self.assertEqual(guarded_zip([1,2,3], [3,2,1]), [(1,3),(2,2),(3,1)])
self.assertEqual(guarded_zip([1,2,3], [1]), [(1,1)])
self.setSecurityManager(old)
def test_map_succeeds(self):
sm = SecurityManager() # accepts
old = self.setSecurityManager(sm)
self.assertEqual(guarded_map(str, [1,2,3]), ['1','2','3'])
self.assertEqual(guarded_map(lambda x,y: x+y, [1,2,3], [3,2,1]),
[4,4,4])
self.setSecurityManager(old)
def test_min_succeeds(self): def test_min_succeeds(self):
sm = SecurityManager() # accepts sm = SecurityManager() # accepts
old = self.setSecurityManager(sm) old = self.setSecurityManager(sm)
......
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