Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
138
Merge Requests
138
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
796a8c9d
Commit
796a8c9d
authored
Feb 19, 2024
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restricted py3
parent
fee9c49e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
25 deletions
+51
-25
bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testRestrictedPythonSecurity.py
...rtal_components/test.erp5.testRestrictedPythonSecurity.py
+28
-19
product/ERP5Type/Collections.py
product/ERP5Type/Collections.py
+18
-4
product/ERP5Type/Six.py
product/ERP5Type/Six.py
+3
-2
product/ERP5Type/patches/Restricted.py
product/ERP5Type/patches/Restricted.py
+2
-0
No files found.
bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testRestrictedPythonSecurity.py
View file @
796a8c9d
...
@@ -31,6 +31,7 @@ import tempfile
...
@@ -31,6 +31,7 @@ import tempfile
import
textwrap
import
textwrap
import
unittest
import
unittest
import
uuid
import
uuid
import
six
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
from
Products.ERP5Type.tests.utils
import
createZODBPythonScript
from
Products.ERP5Type.tests.utils
import
createZODBPythonScript
...
@@ -121,41 +122,41 @@ class TestRestrictedPythonSecurity(ERP5TypeTestCase):
...
@@ -121,41 +122,41 @@ class TestRestrictedPythonSecurity(ERP5TypeTestCase):
return decimal.Decimal.from_float(3.3)
return decimal.Decimal.from_float(3.3)
'''
)
'''
)
def
test_urlparse
(
self
):
def
test_
six_moves_
urlparse
(
self
):
self
.
createAndRunScript
(
'''
self
.
createAndRunScript
(
'''
import
url
parse
import
six.moves.urllib.
parse
return
url
parse.urlparse("http://example.com/pa/th/?q=s").path
return
six.moves.urllib.
parse.urlparse("http://example.com/pa/th/?q=s").path
'''
,
'''
,
expected
=
'/pa/th/'
expected
=
'/pa/th/'
)
)
# access computed attributes (property) is also OK
# access computed attributes (property) is also OK
self
.
createAndRunScript
(
'''
self
.
createAndRunScript
(
'''
import
url
parse
import
six.moves.urllib.
parse
return
url
parse.urlparse("http://example.com/pa/th/?q=s").hostname
return
six.moves.urllib.
parse.urlparse("http://example.com/pa/th/?q=s").hostname
'''
,
'''
,
expected
=
'example.com'
expected
=
'example.com'
)
)
self
.
createAndRunScript
(
'''
self
.
createAndRunScript
(
'''
import
url
parse
import
six.moves.urllib.
parse
return
url
parse.urlsplit("http://example.com/pa/th/?q=s").path
return
six.moves.urllib.
parse.urlsplit("http://example.com/pa/th/?q=s").path
'''
,
'''
,
expected
=
'/pa/th/'
expected
=
'/pa/th/'
)
)
self
.
createAndRunScript
(
'''
self
.
createAndRunScript
(
'''
import
url
parse
import
six.moves.urllib.
parse
return
url
parse.urldefrag("http://example.com/#frag")[1]
return
six.moves.urllib.
parse.urldefrag("http://example.com/#frag")[1]
'''
,
'''
,
expected
=
'frag'
expected
=
'frag'
)
)
self
.
createAndRunScript
(
'''
self
.
createAndRunScript
(
'''
import
url
parse
import
six.moves.urllib.
parse
return
url
parse.parse_qs("q=s")
return
six.moves.urllib.
parse.parse_qs("q=s")
'''
,
'''
,
expected
=
{
'q'
:
[
's'
]}
expected
=
{
'q'
:
[
's'
]}
)
)
self
.
createAndRunScript
(
'''
self
.
createAndRunScript
(
'''
import
url
parse
import
six.moves.urllib.
parse
return
url
parse.parse_qsl("q=s")
return
six.moves.urllib.
parse.parse_qsl("q=s")
'''
,
'''
,
expected
=
[(
'q'
,
's'
)]
expected
=
[(
'q'
,
's'
)]
)
)
...
@@ -342,11 +343,11 @@ class TestRestrictedPythonSecurity(ERP5TypeTestCase):
...
@@ -342,11 +343,11 @@ class TestRestrictedPythonSecurity(ERP5TypeTestCase):
except StopIteration:
except StopIteration:
break
break
except Exception as e:
except Exception as e:
result.append(
repr(e
))
result.append(
str(type(e)
))
return result
return result
'''
,
'''
,
kwargs
=
{
'generator'
:
generator_with_not_allowed_objects
()},
kwargs
=
{
'generator'
:
generator_with_not_allowed_objects
()},
expected
=
[
"one"
,
"Unauthorized()"
,
2
],
expected
=
[
"one"
,
str
(
Unauthorized
)
,
2
],
)
)
def
test_json
(
self
):
def
test_json
(
self
):
...
@@ -967,14 +968,22 @@ def test_suite():
...
@@ -967,14 +968,22 @@ def test_suite():
self
.
assertUnauth
(
'subprocess'
,
())
self
.
assertUnauth
(
'subprocess'
,
())
AccessControl
.
tests
.
testModuleSecurity
.
ModuleSecurityTests
.
test_unprotected_module
=
test_unprotected_module
AccessControl
.
tests
.
testModuleSecurity
.
ModuleSecurityTests
.
test_unprotected_module
=
test_unprotected_module
add_tests
(
suite
,
AccessControl
.
tests
.
testModuleSecurity
)
add_tests
(
suite
,
AccessControl
.
tests
.
testModuleSecurity
)
import
AccessControl.tests.testOwned
if
six
.
PY2
:
add_tests
(
suite
,
AccessControl
.
tests
.
testOwned
)
import
AccessControl.tests.testOwned
# pylint:disable=no-name-in-module,import-error
add_tests
(
suite
,
AccessControl
.
tests
.
testOwned
)
else
:
import
AccessControl.tests.test_owner
# pylint:disable=no-name-in-module,import-error
add_tests
(
suite
,
AccessControl
.
tests
.
test_owner
)
import
AccessControl.tests.testPermissionMapping
import
AccessControl.tests.testPermissionMapping
add_tests
(
suite
,
AccessControl
.
tests
.
testPermissionMapping
)
add_tests
(
suite
,
AccessControl
.
tests
.
testPermissionMapping
)
import
AccessControl.tests.testPermissionRole
import
AccessControl.tests.testPermissionRole
add_tests
(
suite
,
AccessControl
.
tests
.
testPermissionRole
)
add_tests
(
suite
,
AccessControl
.
tests
.
testPermissionRole
)
import
AccessControl.tests.testRole
if
six
.
PY2
:
add_tests
(
suite
,
AccessControl
.
tests
.
testRole
)
import
AccessControl.tests.testRole
# pylint:disable=no-name-in-module,import-error
add_tests
(
suite
,
AccessControl
.
tests
.
testRole
)
else
:
import
AccessControl.tests.test_rolemanager
# pylint:disable=no-name-in-module,import-error
add_tests
(
suite
,
AccessControl
.
tests
.
test_rolemanager
)
import
AccessControl.tests.testSecurityManager
import
AccessControl.tests.testSecurityManager
add_tests
(
suite
,
AccessControl
.
tests
.
testSecurityManager
)
add_tests
(
suite
,
AccessControl
.
tests
.
testSecurityManager
)
import
AccessControl.tests.testZCML
import
AccessControl.tests.testZCML
...
...
product/ERP5Type/Collections.py
View file @
796a8c9d
...
@@ -29,11 +29,25 @@ Restricted collections module.
...
@@ -29,11 +29,25 @@ Restricted collections module.
From restricted python, use "import collections" (see patches/Restricted.py).
From restricted python, use "import collections" (see patches/Restricted.py).
"""
"""
import
six
from
collections
import
(
from
collections
import
(
Counter
,
defaultdict
,
deque
,
OrderedDict
,
namedtuple
as
_namedtuple
)
Counter
,
defaultdict
,
deque
,
OrderedDict
,
namedtuple
as
_namedtuple
)
if
six
.
PY2
:
def
namedtuple
(
typename
,
field_names
,
verbose
=
False
,
rename
=
False
):
ret
=
_namedtuple
(
typename
,
field_names
,
verbose
,
rename
)
ret
.
__allow_access_to_unprotected_subobjects__
=
1
return
ret
else
:
def
namedtuple
(
typename
,
field_names
,
rename
=
False
,
defaults
=
None
,
module
=
None
):
ret
=
_namedtuple
(
typename
,
field_names
,
rename
=
rename
,
defaults
=
defaults
,
module
=
module
)
ret
.
__allow_access_to_unprotected_subobjects__
=
1
return
ret
def
namedtuple
(
typename
,
field_names
,
verbose
=
False
,
rename
=
False
):
ret
=
_namedtuple
(
typename
,
field_names
,
verbose
,
rename
)
ret
.
__allow_access_to_unprotected_subobjects__
=
1
return
ret
product/ERP5Type/Six.py
View file @
796a8c9d
...
@@ -48,5 +48,6 @@ from AccessControl.ZopeGuards import SafeIter
...
@@ -48,5 +48,6 @@ from AccessControl.ZopeGuards import SafeIter
iterkeys
=
lambda
d
:
SafeIter
(
_six
.
iterkeys
(
d
),
d
)
iterkeys
=
lambda
d
:
SafeIter
(
_six
.
iterkeys
(
d
),
d
)
itervalues
=
lambda
d
:
SafeIter
(
_six
.
itervalues
(
d
),
d
)
itervalues
=
lambda
d
:
SafeIter
(
_six
.
itervalues
(
d
),
d
)
from
AccessControl.ZopeGuards
import
safe_builtins
as
_safe_builtins
if
PY2
:
_safe_builtins
[
'xrange'
]
=
_six
.
moves
.
xrange
from
AccessControl.ZopeGuards
import
safe_builtins
as
_safe_builtins
_safe_builtins
[
'xrange'
]
=
_six
.
moves
.
xrange
product/ERP5Type/patches/Restricted.py
View file @
796a8c9d
...
@@ -385,6 +385,8 @@ import six.moves.urllib.parse
...
@@ -385,6 +385,8 @@ import six.moves.urllib.parse
allow_module
(
'six.moves.urllib.parse'
)
allow_module
(
'six.moves.urllib.parse'
)
allow_type
(
six
.
moves
.
urllib
.
parse
.
ParseResult
)
allow_type
(
six
.
moves
.
urllib
.
parse
.
ParseResult
)
allow_type
(
six
.
moves
.
urllib
.
parse
.
SplitResult
)
allow_type
(
six
.
moves
.
urllib
.
parse
.
SplitResult
)
# BBB this is different type on python3
allow_type
(
type
(
six
.
moves
.
urllib
.
parse
.
urldefrag
(
''
)))
ModuleSecurityInfo
(
'six.moves.urllib.parse'
).
declarePublic
(
ModuleSecurityInfo
(
'six.moves.urllib.parse'
).
declarePublic
(
'urlencode'
,
'urlencode'
,
'quote'
,
'unquote'
,
'quote'
,
'unquote'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment