Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
djangoldp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
djangoldp-packages
djangoldp
Commits
e391a6cb
Commit
e391a6cb
authored
5 years ago
by
Calum Mackervoy
Committed by
Jean-Baptiste Pasquier
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Bugfiexs with user_permissions
parent
b26ae824
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
djangoldp/permissions.py
+9
-9
9 additions, 9 deletions
djangoldp/permissions.py
djangoldp/tests/tests_guardian.py
+13
-1
13 additions, 1 deletion
djangoldp/tests/tests_guardian.py
with
22 additions
and
10 deletions
djangoldp/permissions.py
+
9
−
9
View file @
e391a6cb
from
django.core.exceptions
import
PermissionDenied
from
django.db.models.base
import
ModelBase
from
rest_framework.permissions
import
DjangoObjectPermissions
from
guardian.shortcuts
import
get_perms
from
guardian.shortcuts
import
get_
user_
perms
class
LDPPermissions
(
DjangoObjectPermissions
):
...
...
@@ -42,33 +42,33 @@ class LDPPermissions(DjangoObjectPermissions):
if
'
inherit
'
in
owner_perms
:
owner_perms
=
owner_perms
+
list
(
set
(
authenticated_perms
)
-
set
(
owner_perms
))
# return permissions
# return permissions
- using set to avoid duplicates
# apply Django-Guardian (object-level) permissions
perms
=
[]
perms
=
set
()
if
obj
is
not
None
and
not
user
.
is_anonymous
:
guardian_perms
=
get_perms
(
user
,
obj
)
guardian_perms
=
get_
user_
perms
(
user
,
obj
)
model_name
=
model
.
_meta
.
model_name
# remove model name from the permissions
forbidden_string
=
"
_
"
+
model_name
perms
=
[
p
.
replace
(
forbidden_string
,
''
)
for
p
in
guardian_perms
]
perms
=
set
(
[
p
.
replace
(
forbidden_string
,
''
)
for
p
in
guardian_perms
]
)
# apply anon, owner and auth permissions
if
user
.
is_anonymous
:
perms
=
perms
+
anonymous_perms
perms
=
perms
.
union
(
set
(
anonymous_perms
))
else
:
if
obj
and
hasattr
(
model
.
_meta
,
'
owner_field
'
)
and
(
getattr
(
obj
,
getattr
(
model
.
_meta
,
'
owner_field
'
))
==
user
or
(
hasattr
(
user
,
'
urlid
'
)
and
getattr
(
obj
,
getattr
(
model
.
_meta
,
'
owner_field
'
))
==
user
.
urlid
)
or
getattr
(
obj
,
getattr
(
model
.
_meta
,
'
owner_field
'
))
==
user
.
id
):
perms
=
perms
+
owner_perms
perms
=
perms
.
union
(
set
(
owner_perms
))
else
:
perms
=
perms
+
authenticated_perms
perms
=
perms
.
union
(
set
(
authenticated_perms
))
return
perms
return
list
(
perms
)
def
filter_user_perms
(
self
,
user
,
obj_or_model
,
permissions
):
# Only used on Model.get_permissions to translate permissions to LDP
...
...
This diff is collapsed.
Click to expand it.
djangoldp/tests/tests_guardian.py
+
13
−
1
View file @
e391a6cb
...
...
@@ -3,7 +3,7 @@ from django.contrib.auth import get_user_model
from
rest_framework.test
import
APIClient
,
APITestCase
from
guardian.shortcuts
import
assign_perm
from
.models
import
PermissionlessDummy
from
.models
import
PermissionlessDummy
,
Dummy
from
djangoldp.permissions
import
LDPPermissions
...
...
@@ -90,3 +90,15 @@ class TestsGuardian(APITestCase):
permissions
=
LDPPermissions
()
result
=
permissions
.
user_permissions
(
self
.
user
,
self
.
dummy
)
self
.
assertIn
(
'
custom_permission
'
,
result
)
# test that duplicate permissions aren't returned
def
test_no_duplicate_permissions
(
self
):
self
.
setUpLoggedInUser
()
dummy
=
Dummy
.
objects
.
create
(
some
=
'
test
'
,
slug
=
'
test
'
)
model_name
=
Dummy
.
_meta
.
model_name
assign_perm
(
'
view_
'
+
model_name
,
self
.
user
,
dummy
)
permissions
=
LDPPermissions
()
result
=
permissions
.
user_permissions
(
self
.
user
,
dummy
)
self
.
assertEqual
(
result
.
count
(
'
view
'
),
1
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment