mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-09-27 14:00:21 +00:00
Code Issues Projects Releases Wiki Activity

Fixes errors in permissions

Browse source
This commit is contained in:
Mouse Reeve 2022-07-07 14:01:51 -07:00
parent 948f2964ac
commit a972c58f3b
6 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/models/base_model.py
View file

@ -132,7 +132,7 @@ class BookWyrmModel(models.Model):
return return
# but generally moderators can delete other people's stuff # but generally moderators can delete other people's stuff
if self.user == viewer or viewer.has_perm("moderate_post"): if self.user == viewer or viewer.has_perm("bookwyrm.moderate_post"):
return return
raise PermissionDenied() raise PermissionDenied()

2
bookwyrm/models/link.py
View file

@ -84,7 +84,7 @@ class LinkDomain(BookWyrmModel):
) )
def raise_not_editable(self, viewer): def raise_not_editable(self, viewer):
if viewer.has_perm("moderate_post"): if viewer.has_perm("bookwyrm.moderate_post"):
return return
raise PermissionDenied() raise PermissionDenied()

6
bookwyrm/models/notification.py
View file

@ -222,8 +222,12 @@ def notify_user_on_import_complete(
@receiver(models.signals.post_save, sender=Report) @receiver(models.signals.post_save, sender=Report)
@transaction.atomic @transaction.atomic
# pylint: disable=unused-argument # pylint: disable=unused-argument
def notify_admins_on_report(sender, instance, *args, **kwargs): def notify_admins_on_report(sender, instance, created, *args, **kwargs):
"""something is up, make sure the admins know""" """something is up, make sure the admins know"""
if not created:
# otherwise you'll get a notification when you resolve a report
return
# moderators and superusers should be notified # moderators and superusers should be notified
admins = User.objects.filter( admins = User.objects.filter(
models.Q(user_permissions__name__in=["moderate_user", "moderate_post"]) models.Q(user_permissions__name__in=["moderate_user", "moderate_post"])

1
bookwyrm/views/admin/link_domains.py
View file

@ -45,6 +45,7 @@ class LinkDomain(View):
@require_POST @require_POST
@login_required @login_required
@permission_required("bookwyrm.moderate_user")
def update_domain_status(request, domain_id, status): def update_domain_status(request, domain_id, status):
"""This domain seems fine""" """This domain seems fine"""
domain = get_object_or_404(models.LinkDomain, id=domain_id) domain = get_object_or_404(models.LinkDomain, id=domain_id)

8
bookwyrm/views/admin/reports.py
View file

@ -83,7 +83,7 @@ class ReportAdmin(View):
@login_required @login_required
@permission_required("bookwyrm_moderate_user") @permission_required("bookwyrm.moderate_user")
def suspend_user(_, user_id): def suspend_user(_, user_id):
"""mark an account as inactive""" """mark an account as inactive"""
user = get_object_or_404(models.User, id=user_id) user = get_object_or_404(models.User, id=user_id)
@ -95,7 +95,7 @@ def suspend_user(_, user_id):
@login_required @login_required
@permission_required("bookwyrm_moderate_user") @permission_required("bookwyrm.moderate_user")
def unsuspend_user(_, user_id): def unsuspend_user(_, user_id):
"""mark an account as inactive""" """mark an account as inactive"""
user = get_object_or_404(models.User, id=user_id) user = get_object_or_404(models.User, id=user_id)
@ -107,7 +107,7 @@ def unsuspend_user(_, user_id):
@login_required @login_required
@permission_required("bookwyrm_moderate_user") @permission_required("bookwyrm.moderate_user")
def moderator_delete_user(request, user_id): def moderator_delete_user(request, user_id):
"""permanently delete a user""" """permanently delete a user"""
user = get_object_or_404(models.User, id=user_id) user = get_object_or_404(models.User, id=user_id)
@ -132,7 +132,7 @@ def moderator_delete_user(request, user_id):
@login_required @login_required
@permission_required("bookwyrm_moderate_post") @permission_required("bookwyrm.moderate_post")
def resolve_report(_, report_id): def resolve_report(_, report_id):
"""mark a report as (un)resolved""" """mark a report as (un)resolved"""
report = get_object_or_404(models.Report, id=report_id) report = get_object_or_404(models.Report, id=report_id)

2
bookwyrm/views/admin/user_admin.py
View file

@ -62,7 +62,7 @@ class UserAdminList(View):
@method_decorator(login_required, name="dispatch") @method_decorator(login_required, name="dispatch")
@method_decorator( @method_decorator(
permission_required("bookwyrm.moderate_users", raise_exception=True), permission_required("bookwyrm.moderate_user", raise_exception=True),
name="dispatch", name="dispatch",
) )
class UserAdmin(View): class UserAdmin(View):