django-restit 4.2.88__py3-none-any.whl → 4.2.90__py3-none-any.whl

account/rpc/group.py

@@ -110,5 +110,20 @@ def rest_on_member_feed(request, pk=None):
 @rd.urlGET('group/stats/kinds')
 @rd.login_required
 def rest_on_group_stats(request):
-    out = rh.countOccurences(Group.objects.filter(is_active=True), "kind")
+    params = request.DATA.asDict()
+    if not params.group:
+        if not request.member.hasPerm(["view_all_groups", "manage_groups"]):
+            return rv.restPermissionDenied()
+        out = rh.countOccurences(Group.objects.filter(is_active=True), "kind")
+        return rv.restResult(request, dict(data=out))
+    # local
+    group = Group.objects.filter(pk=params.group).first()
+    if not group:
+        return rv.restPermissionDenied(request)
+    if not request.member.hasPerm(["view_all_groups", "manage_groups"]):
+        if not request.member.hasGroupPerm(group, ["reports", "reporting"]):
+            return rv.restPermissionDenied(request)
+    qset = group.getAllChildren(True, True, True).filter(is_active=True)
+    out = rh.countOccurences(qset, "kind")
     return rv.restResult(request, dict(data=out))
+    

{django_restit-4.2.88.dist-info → django_restit-4.2.90.dist-info}/METADATA

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

{django_restit-4.2.88.dist-info → django_restit-4.2.90.dist-info}/RECORD

@@ -42,7 +42,7 @@ account/periodic.py,sha256=-u0n-7QTJgDOkasGhBAPwHAwjpqWGA-MZLEFkVTqCGU,874
 account/rpc/__init__.py,sha256=SGF0M_-H0dKh3b1apSX29BotNWAvITYccGQVC0MIjL8,336
 account/rpc/auth.py,sha256=p62tyihWvSY2zn7eaVxKcCG9qLnnZBIkwdRH81sS5_Y,16615
 account/rpc/device.py,sha256=mB14a6qvJIBnCa9ivLhPXwEt5Gk2foyqsKBtZxC506k,3070
-account/rpc/group.py,sha256=Iiefop0XmnuTZtZJTSyXbIAa7jD1cRLfreHMZWdhteE,4230
+account/rpc/group.py,sha256=riymUK6ttv8G6SG6K-v7UCvM40WQy3HaGSeF_sEiaU0,4929
 account/rpc/member.py,sha256=VNRSD38mmTUCbq3cCSy3qRyquzeVEwW_8zzrtS0-vAA,1817
 account/rpc/notify.py,sha256=Q2YWejP36egeF060Hih5uX4Psv_B8NWlLLPi7iDYlIw,3344
 account/rpc/oauth.py,sha256=ISLVsR5HvKALANokaOFRvF4FTRxWtXPvVnZAYANKxpo,2864
@@ -112,7 +112,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=Dw6fUi2tbLeA_ZRDcvGQNFkCkMGMBdtNeaLikXdAyE8,7769
-incident/models/incident.py,sha256=uKF7fUjZUPjLlfpRIlFMocGaanng2wmHmglP5RAzv_w,19847
+incident/models/incident.py,sha256=1uLkr7_QEKYsccO-OVmb7YcM8BA3Q6UCWWw2m935YKg,20030
 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
@@ -406,7 +406,7 @@ rest/middleware/session_store.py,sha256=1nSdeXK8PyuYgGgIufqrS6j6QpIrQ7zbMNT0ol75
 rest/models/__init__.py,sha256=M8pvFDq-WCF-QcM58X7pMufYYe0aaQ3U0PwGe9TKbbY,130
 rest/models/base.py,sha256=bPcTeCX7KvhkcVMKEyLmu9eYc7ccJGkIP1n3cctJPVE,69675
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
-rest/models/metadata.py,sha256=65GvfFbc26_7wJz8qEAzU7fEOZWVz0ttO5j5m_gs4hk,12860
+rest/models/metadata.py,sha256=1nQ7CYo9bJHoaXE_hVNaj1-Y7yqhHlf2ZlaD1IfTzic,12904
 rest/net.py,sha256=LcB2QV6VNRtsSdmiQvYZgwQUDwOPMn_VBdRiZ6OpI-I,2974
 rest/regexes.yaml,sha256=VoGb4E-P_K9f82Yzcpltgzekpt9usRtwu9PYlo46nUw,149463
 rest/requestex.py,sha256=N56056vV3zWkAP-QrYsCu7SdpPzE5kLuPoxGIuZAKt0,16127
@@ -506,7 +506,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.88.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.88.dist-info/METADATA,sha256=kNtJO38wHtEHLW03kxVgMPBEsRgcgLr8-jwlHYwMwUc,7645
-django_restit-4.2.88.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.88.dist-info/RECORD,,
+django_restit-4.2.90.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.90.dist-info/METADATA,sha256=NgUxbFxdTPM54mt7gxCFK77X4SIu0_2TDlioDkYvgC8,7645
+django_restit-4.2.90.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.90.dist-info/RECORD,,

incident/models/incident.py

@@ -151,6 +151,10 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
             self.setProperty("state", event.metadata.geoip.state)
             self.setProperty("country", event.metadata.geoip.country)
             self.setProperty("isp", event.metadata.geoip.isp)
+        else:
+            for key in ["city", "state", "country", "isp"]:
+                if key in event.metadata:
+                    self.setProperty(new_key, event.metadata[key])
 
     def shouldTriggerAction(self):
         count = self.events.all().count()

rest/models/metadata.py

@@ -115,7 +115,7 @@ class MetaDataModel(object):
         if not isinstance(values, dict):
             raise Exception("invalid metadata: {}".format(values))
 
-        for key, value in list(values.items()):
+        for key, value in values.items():
             cat = None
             if "." in key:
                 cat, key = key.split('.')
@@ -230,15 +230,17 @@ class MetaDataModel(object):
             request = rh.getActiveRequest()
         self.__initFieldProps()
 
+        if "." in key:
+            category, key = key.split('.')
+            
         if isinstance(value, dict):
-            return self.setProperties(value, key)
+            if category is None:
+                return self.setProperties(value, key)
         username = "root"
         if request and request.member:
             username = request.member.username
         prop = None
 
-        if "." in key:
-            category, key = key.split('.')
         if category:
             # delete any keys with this category name
             full_key = "{}.{}".format(category, key)