django-restit 4.2.127__py3-none-any.whl → 4.2.130__py3-none-any.whl

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.127.dist-info → django_restit-4.2.130.dist-info}/METADATA

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

{django_restit-4.2.127.dist-info → django_restit-4.2.130.dist-info}/RECORD

@@ -30,7 +30,7 @@ account/models/device.py,sha256=0AFeLMGk4im4KZVd3eGSyRbK4eQEXiFM2cdY8GUzihs,5934
 account/models/feeds.py,sha256=vI7fG4ASY1M0Zjke24RdnfDcuWeATl_yR_25jPmT64g,2011
 account/models/group.py,sha256=KnLj0cOJBg1JYo33wL-7NehD4_PCsLyEjLdX6GZJZAo,22308
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
-account/models/member.py,sha256=JziyYNC13SFWX07Thtoe2V_YlrKNn2RHJZcRk15Zh-s,54205
+account/models/member.py,sha256=7JCf7HULo_CLqKLGbHFvFOVYSkKbVkDuUPjq0C1u2Ak,54450
 account/models/membership.py,sha256=90EpAhOsGaqphDAkONP6j_qQ0OWSRaQsI8H7E7fgMkE,9249
 account/models/notify.py,sha256=TOkuVBLAsbzT58FOxII_G3Cj_IDQx16vyehyEsNrDcY,15306
 account/models/passkeys.py,sha256=TJxITUi4DT4_1tW2K7ZlOcRjJuMVl2NtKz7pKQU8-Tw,1516
@@ -114,7 +114,7 @@ incident/migrations/0015_rule_title_template_alter_incident_state.py,sha256=FPUD
 incident/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/models/__init__.py,sha256=NMphuhb0RTMf7Ov4QkNv7iv6_I8Wtr3xQ54yjX_a31M,209
 incident/models/event.py,sha256=LNKYdqOj_CO4aGvc2dNmy3K-S52Udi_gZ4-wintbs1s,7901
-incident/models/incident.py,sha256=0S4HlNCgs0M0b_p7bxcO7rdHoRCSp9x4BFftc_xhLP8,20931
+incident/models/incident.py,sha256=_pzAyUC-RgwrCF-hOIOUDLhdG9koTqZK8pOltBZx48o,21143
 incident/models/ossec.py,sha256=eUDRGawzuLWobKEVGKfdZisDnyjS_Hlxi0T_GCSLCCI,2252
 incident/models/rules.py,sha256=aRkJ0ZnTv87nAUC1sHVkPExfb3OJ8fgHQIhnCIpIbhQ,7001
 incident/models/ticket.py,sha256=S3kqGQpYLE6Y4M9IKu_60sgW-f592xNr8uufqHnvDoU,2302
@@ -173,7 +173,7 @@ medialib/fixtures/medialib_test_fixture.json,sha256=7M7zvGI2S5G3ENV8OQ3Ks4149lEi
 medialib/forms.py,sha256=nrE6QTPNPiIeX7Nx4l9DEmAQeQXqFyCg1C3JEDBYJfE,5442
 medialib/migrations/0001_initial.py,sha256=H3JliH5aw7tiHef8MhrJr_9rGetqgA7UjTF-eKziRSM,20518
 medialib/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-medialib/models.py,sha256=eFT19hkG28OxSlrw2VFh3i9yiQGObPSY5Y76QmSORYk,52201
+medialib/models.py,sha256=CrTS5znW8JMuj8gaAnJ5boYvN-deF8zyOuCmW3cFQVE,52228
 medialib/ocr.py,sha256=zlP7-NBiXhW7jR9pljmEPl5xzLVZpLN5QLAELQgU0Fk,1189
 medialib/pdf.py,sha256=l28WwM0JKbT9boV-b_9TFh9jhvGcrquR8GqC8wfEaLk,1275
 medialib/qrcode.py,sha256=vHyA5egXOX70EFiUDgr1njI9zcF6bXQJ_hKAQrppRow,545
@@ -376,7 +376,7 @@ pushit/utils.py,sha256=IeTCGa-164nmB1jIsK1lu1O1QzUhS3BKfuXHGjCW-ck,2121
 rest/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
 rest/README.md,sha256=V3ETc-cJu8PZIbKr9xSe_pA4JEUpC8Dhw4bQeVCDJPw,5460
 rest/RemoteEvents.py,sha256=nL46U7AuxIrlw2JunphR1tsXyqi-ep_gD9CYGpYbNgE,72
-rest/__init__.py,sha256=ygG-NeRcCAJ8gBYrZLd4VwZpJx1sCziFjqMBZ6BtA0E,122
+rest/__init__.py,sha256=SVzE--w6i3jhZDS773pK0TONhXDz7k3o4fmQrPAa99w,122
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -481,10 +481,11 @@ telephony/rpc.py,sha256=PXPDFvgoXkCKlfMzIbt6lYZPay3fcveNj2X4Pjby7p4,3473
 wiki/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 wiki/migrations/0001_initial.py,sha256=9jvUyjrbJrbDilRnwzQUPhPV8Xi_olEPBk_N0nycvM0,3606
 wiki/migrations/0002_alter_pagemedia_entry.py,sha256=9CUnfvBmj0D4akCkux7HFuXgw9B9avE8V-iMCm5cjds,485
+wiki/migrations/0003_page_perms.py,sha256=qJBLI7t5mgiDTKCR9qhticmbhgo2KKYq7WbHaxH1Ykw,423
 wiki/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wiki/models/__init__.py,sha256=jE-9r_Hqpyo7ysKu9BschXOn5Zg34wUt894GwJpxA28,132
 wiki/models/faq.py,sha256=nvcEFerllQKT61kIYlasvZzRKwpXyfmQpiqkpHP1V1o,1745
-wiki/models/page.py,sha256=7_HAbvHtWIQpttiMoxrm8-Mfik6kUW6F47xkXZN2Omk,7311
+wiki/models/page.py,sha256=06wyZsDX57B-d_wZhSNcrNAOv-ERHlKveJ15MZc9haQ,8751
 wiki/models/revision.py,sha256=St5-vz8SGvogsDL6jTWqHLE23PS5mp9iA0DUt3hWTsU,729
 wiki/periodic.py,sha256=t-UgXJIug-OLslJM_r03-5WrNKj39TxrvfuNFjVAhDs,334
 wiki/renderers/__init__.py,sha256=lLEoJvjU3ezXwBGcjleKk_kMyNeMD9MpfBlEiKayEiM,461
@@ -511,7 +512,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.127.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.127.dist-info/METADATA,sha256=cbupivkuLy-AxJkmDvZXSbRKAANbAAnhRCu5-JAGaWo,7663
-django_restit-4.2.127.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.127.dist-info/RECORD,,
+django_restit-4.2.130.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.130.dist-info/METADATA,sha256=9xgoIJG_Or13Bbw9zbbFb5sByRnWrAdkF2pKjC_0jTU,7663
+django_restit-4.2.130.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.130.dist-info/RECORD,,

incident/models/incident.py

@@ -33,6 +33,8 @@ INCIDENT_STATES = [
     (INCIDENT_STATE_PENDING, "pending"),
 ]
 
+INCIDENT_STATE_DISPLAYS = {k:v for k,v in INCIDENT_STATES}
+
 INCIDENT_EMAIL_FROM = settings.get("INCIDENT_EMAIL_FROM", None)
 if INCIDENT_EMAIL_FROM is None:
     INCIDENT_EMAIL_FROM = f"{settings.SITE_LABEL} INCIDENT <incident@{settings.EMAIL_DEFAULT_DOMAIN}>"
@@ -391,6 +393,9 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
             notes = []
             for k, v in self._changed__.items():
                 nv = self.getFieldValue(k)
+                if k == "state":
+                    v = INCIDENT_STATE_DISPLAYS.get(v, v)
+                    nv = INCIDENT_STATE_DISPLAYS.get(nv, nv)
                 notes.append(f"{k} changed from {v} to {nv}")
             note = "\n<br>".join(notes)
 

medialib/models.py

@@ -519,7 +519,8 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
                 self.deleteRenditions()
             except Exception as err:
                 logger.exception(err)
-        raise Exception(err)
+        # raise Exception(err)
+        # Generate Event
 
     def guessKind(self):
         filename = self.name

rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.127"
+__version__ = "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),
+        ),
+    ]

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": {