Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
25d55347
Verified
Commit
25d55347
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Support django-guardian's ObjectPermissionChecker
parent
3922b4c8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!540
Resolve "Use django-guardian's prefetch mechanism for object permissions"
Pipeline
#6558
passed
4 years ago
Stage: test
Stage: build
Stage: publish
Stage: docker
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/core/mixins.py
+5
-0
5 additions, 0 deletions
aleksis/core/mixins.py
aleksis/core/util/predicates.py
+17
-2
17 additions, 2 deletions
aleksis/core/util/predicates.py
with
22 additions
and
2 deletions
aleksis/core/mixins.py
+
5
−
0
View file @
25d55347
...
...
@@ -21,6 +21,7 @@ from django.views.generic.edit import DeleteView, ModelFormMixin
import
reversion
from
guardian.admin
import
GuardedModelAdmin
from
guardian.core
import
ObjectPermissionChecker
from
jsonstore.fields
import
IntegerField
,
JSONFieldMixin
from
material.base
import
Layout
,
LayoutNode
from
rules.contrib.admin
import
ObjectPermissionsModelAdmin
...
...
@@ -332,6 +333,10 @@ class ExtensibleModel(models.Model, metaclass=_ExtensibleModelBase):
"""
Dynamically add a new permission to a model.
"""
cls
.
extra_permissions
.
append
((
name
,
verbose_name
))
def
set_object_permission_checker
(
self
,
checker
:
ObjectPermissionChecker
):
"""
Annotate a ``ObjectPermissionChecker`` for use with permission system.
"""
self
.
_permission_checker
=
checker
def
save
(
self
,
*
args
,
**
kwargs
):
"""
Ensure all functionality of our extensions that needs saving gets it.
"""
# For auto-created remote syncable fields
...
...
This diff is collapsed.
Click to expand it.
aleksis/core/util/predicates.py
+
17
−
2
View file @
25d55347
from
typing
import
Optional
from
django.contrib.auth.backends
import
ModelBackend
from
django.contrib.auth.models
import
User
from
django.db.models
import
Model
...
...
@@ -7,6 +9,7 @@ from guardian.backends import ObjectPermissionBackend
from
guardian.shortcuts
import
get_objects_for_user
from
rules
import
predicate
from
..mixins
import
ExtensibleModel
from
..models
import
Group
from
.core_helpers
import
get_content_type_by_perm
,
get_site_preferences
from
.core_helpers
import
has_person
as
has_person_helper
...
...
@@ -25,8 +28,20 @@ def check_global_permission(user: User, perm: str) -> bool:
return
ModelBackend
().
has_perm
(
user
,
perm
)
def
check_object_permission
(
user
:
User
,
perm
:
str
,
obj
:
Model
)
->
bool
:
"""
Check whether a user has a permission on a object.
"""
def
check_object_permission
(
user
:
User
,
perm
:
str
,
obj
:
Model
,
checker_obj
:
Optional
[
ExtensibleModel
]
=
None
)
->
bool
:
"""
Check whether a user has a permission on an object.
You can provide a custom ``ObjectPermissionChecker`` for prefetching object permissions
by annotating an extensible model with ``set_object_permission_checker``.
This can be the provided object (``obj``) or a special object
which is only used to get the checker class (``checker_obj``).
"""
if
not
checker_obj
:
checker_obj
=
obj
if
hasattr
(
checker_obj
,
"
_permission_checker
"
):
return
checker_obj
.
_permission_checker
.
has_perm
(
perm
,
obj
)
return
ObjectPermissionBackend
().
has_perm
(
user
,
perm
,
obj
)
...
...
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