django-restit 4.2.128__tar.gz → 4.2.130__tar.gz

{django_restit-4.2.128 → django_restit-4.2.130}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.128
+Version: 4.2.130
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.128 → django_restit-4.2.130}/account/models/member.py

@@ -10,6 +10,7 @@ import time
 import re
 import hashlib
 import uuid
+from objict import objict
 
 from auditlog.models import PersistentLog
 from sessionlog.models import SessionLog
@@ -387,6 +388,12 @@ class Member(User, RestModel, MetaDataModel):
             return False
         return self.getProperty(perm, 0, "permissions", bool)
 
+    def getPermissions(self):
+        return objict.fromdict(self.getProperties("permissions"))
+
+    def listPermissions(self):
+        return [k for k, v in self.getProperties("permissions").items() if v in [1, "1"]]
+
     def hasGroupPerm(self, group, perm):
         if group is None:
             return False

{django_restit-4.2.128 → django_restit-4.2.130}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.2.128"
+version = "4.2.130"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"

{django_restit-4.2.128 → django_restit-4.2.130}/rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.128"
+__version__ = "4.2.130"

django_restit-4.2.130/wiki/migrations/0003_page_perms.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-08-13 04:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wiki', '0002_alter_pagemedia_entry'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='page',
+            name='perms',
+            field=models.CharField(db_index=True, default=None, max_length=255, null=True),
+        ),
+    ]

{django_restit-4.2.128 → django_restit-4.2.130}/wiki/models/page.py

@@ -1,11 +1,17 @@
 from django.db import models as dm
 from rest import models as rm
+from rest import settings
+from rest import helpers as rh
 from medialib import models as medialib
 import re
 import mistune
 from wiki.renderers import WikiRenderer
 from wiki.renderers.mistune import task_list
 
+WIKI_PAGE_VIEW_PERMS = settings.get("WIKI_PAGE_VIEW_PERMS", ["view_wiki", "edit_wiki"])
+WIKI_PAGE_EDIT_PERMS = settings.get("WIKI_PAGE_EDIT_PERMS", ["edit_wiki"])
+
+
 class Page(dm.Model, rm.RestModel, rm.MetaDataModel):
     """
     Blog (a collection of articles)
@@ -14,7 +20,8 @@ class Page(dm.Model, rm.RestModel, rm.MetaDataModel):
         SEARCH_FIELDS = ["title", "body"]
         SEARCH_TERMS = ["title", "body"]
         QUERY_FIELDS = ["all_fields", "parent__path"]
-        VIEW_PERMS = ["view_wiki", "edit_wiki"]
+        VIEW_PERMS = WIKI_PAGE_VIEW_PERMS
+        EDIT_PERMS = WIKI_PAGE_EDIT_PERMS
         UNIQUE_LOOKUP = ["path"]
         DEFAULT_SORT = "-order"
         CAN_DELETE = True
@@ -30,6 +37,7 @@ class Page(dm.Model, rm.RestModel, rm.MetaDataModel):
                     "order",
                     "path",
                     "slug",
+                    "perms"
                 ],
             },
             "default": {
@@ -103,6 +111,7 @@ class Page(dm.Model, rm.RestModel, rm.MetaDataModel):
     title = dm.CharField(max_length=255)
     path = dm.CharField(max_length=255, db_index=True)
     slug = dm.SlugField(db_index=True)
+    perms = dm.CharField(max_length=255, db_index=True, null=True, default=None)
 
     body = dm.TextField(blank=True)
 
@@ -144,6 +153,35 @@ class Page(dm.Model, rm.RestModel, rm.MetaDataModel):
             if qset.count():
                 self.slug = f"{sanitized_slug}_{qset.count()+1}"
 
+    def on_rest_can_get(self, request):
+        if request is None:
+            return True
+        if self.perms:
+            perms = [p.strip() for p in self.perms.split(',')]
+        elif self.parent and self.parent.perms:
+            perms = [p.strip() for p in self.parent.perms.split(',')]
+        else:
+            perms = getattr(self.RestMeta, "VIEW_PERMS", None)
+        if perms:
+            if "public" in perms:
+                return True
+            if "owner" in perms and self.checkIsOwner(request.member):
+                return True
+            # we need to check if this user has permission
+            group_field = "group"
+            status, error, code = rh.requestHasPerms(request, perms, getattr(self, group_field, None))
+            if not status:
+                return False
+        return True
+
+    @classmethod
+    def on_rest_list_ready(cls, request, qset=None):
+        out = []
+        for page in qset:
+            if page.on_rest_can_get(request):
+                out.append(page)
+        return out
+
     def on_rest_pre_save(self, request):
         if not self.slug:
             self.set_slug(self.title)
@@ -206,7 +244,8 @@ class PageMetaData(rm.MetaDataBase):
 
 class PageMedia(dm.Model, rm.RestModel):
     class RestMeta:
-        VIEW_PERMS = ["view_wiki", "edit_wiki"]
+        VIEW_PERMS = WIKI_PAGE_VIEW_PERMS
+        EDIT_PERMS = WIKI_PAGE_EDIT_PERMS
         GRAPHS = {
             "basic": {
                 "graphs": {