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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
erp5
Commits
3fbddb7f
Commit
3fbddb7f
authored
Dec 16, 2015
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
permissions guard check should also respect caller's proxy roles like roles guard.
parent
77fa7de1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
20 deletions
+24
-20
product/ERP5Type/patches/PythonScript.py
product/ERP5Type/patches/PythonScript.py
+24
-20
No files found.
product/ERP5Type/patches/PythonScript.py
View file @
3fbddb7f
...
...
@@ -10,13 +10,13 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
from
Products.CMFCore.utils
import
_checkPermission
from
Products.DCWorkflow.Guard
import
Guard
from
Products.PythonScripts.PythonScript
import
PythonScript
from
App.special_dtml
import
DTMLFile
from
Products.ERP5Type
import
_dtmldir
from
AccessControl
import
ClassSecurityInfo
,
getSecurityManager
from
AccessControl.class_init
import
InitializeClass
from
AccessControl.PermissionRole
import
rolesForPermissionOn
from
OFS.misc_
import
p_
from
App.ImageFile
import
ImageFile
from
Acquisition
import
aq_base
,
aq_parent
...
...
@@ -109,26 +109,31 @@ def checkGuard(guard, ob):
# returns 1 if guard passes against ob, else 0.
# TODO : implement TALES evaluation by defining an appropriate
# context.
sm
=
None
if
guard
.
permissions
:
for
p
in
guard
.
permissions
:
if
_checkPermission
(
p
,
ob
):
break
else
:
return
0
if
guard
.
roles
:
if
sm
is
None
:
u_roles
=
None
def
getRoles
():
sm
=
getSecurityManager
()
u
=
sm
.
getUser
()
def
getRoles
():
stack
=
sm
.
_context
.
stack
if
stack
and
len
(
stack
)
>
1
:
eo
=
stack
[
-
2
]
# -1 is the current script.
proxy_roles
=
getattr
(
eo
,
'_proxy_roles'
,
None
)
if
proxy_roles
:
roles
=
proxy_roles
return
proxy_roles
return
u
.
getRolesInContext
(
ob
)
roles
=
u
.
getRolesInContext
(
ob
)
return
roles
if
guard
.
permissions
:
# Require at least one role for required roles for the given permission.
if
u_roles
is
None
:
u_roles
=
getRoles
()
for
p
in
guard
.
permissions
:
if
set
(
rolesForPermissionOn
(
p
,
ob
)).
intersection
(
u_roles
):
break
else
:
return
0
if
guard
.
roles
:
# Require at least one of the given roles.
if
u_roles
is
None
:
u_roles
=
getRoles
()
for
role
in
guard
.
roles
:
if
role
in
u_roles
:
...
...
@@ -137,7 +142,6 @@ def checkGuard(guard, ob):
return
0
if
guard
.
groups
:
# Require at least one of the specified groups.
if
sm
is
None
:
sm
=
getSecurityManager
()
u
=
sm
.
getUser
()
b
=
aq_base
(
u
)
...
...
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