django-restit 4.2.87__tar.gz → 4.2.89__tar.gz

{django_restit-4.2.87 → django_restit-4.2.89}/PKG-INFO

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

{django_restit-4.2.87 → django_restit-4.2.89}/account/models/group.py

@@ -209,6 +209,13 @@ class Group(models.Model, RestModel, MetaDataModel):
             self.name = value.strip()
         else:
             self.name = None
+
+    def set_parent(self, value):
+        if isinstance(value, (str, int)):
+            if int(value) == self.pk:
+                raise RestValidationError("cannot set self as parent", 1101)
+            value = Group.objects.filter(pk=value).last()
+        self.parent = value
     
     def set_child_of(self, value):
         # this is a helper to add this group to another group

{django_restit-4.2.87 → django_restit-4.2.89}/account/rpc/group.py

@@ -1,7 +1,7 @@
 from rest import decorators as rd
 from rest import views as rv
+from rest import helpers as rh
 from account.models import Group, Membership, Member, GroupFeed, MemberFeed
-from taskqueue import models as tq
 
 
 @rd.url(r'^group$')
@@ -105,3 +105,25 @@ def rest_on_group_feed(request, pk=None):
 @rd.login_required
 def rest_on_member_feed(request, pk=None):
     return MemberFeed.on_rest_request(request, pk)
+
+
+@rd.urlGET('group/stats/kinds')
+@rd.login_required
+def rest_on_group_stats(request):
+    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"]):
+            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.87 → django_restit-4.2.89}/incident/models/incident.py

@@ -19,7 +19,12 @@ EVENT_META_TO_INCIDENT = [
     "phone",
     "group_name",
     "group_id",
-    "http_user_agent",
+    ("http_user_agent", "user_agent"),
+    "user_agent",
+    "http_url",
+    "error",
+    "error_code",
+    "rule_id",
     "path"
 ]
 
@@ -135,13 +140,21 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
 
     def updateMeta(self, event):
         for key in EVENT_META_TO_INCIDENT:
+            new_key = key
+            if isinstance(key, tuple):
+                key, new_key = key
             if key in event.metadata:
-                self.setProperty(key, event.metadata[key])
+                self.setProperty(new_key, event.metadata[key])
         self.setProperty("details", event.details)
         if event.metadata.geoip and event.metadata.geoip.city:
             self.setProperty("city", event.metadata.geoip.city)
             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()

{django_restit-4.2.87 → django_restit-4.2.89}/incident/parsers/ossec.py

@@ -164,6 +164,7 @@ def parse_alert_metadata(alert):
             return dict(package=match.group(1))
     return match_patterns(patterns, alert.text)
 
+
 def match_patterns(patterns, text):
     # Search for matches in the text
     return {key: pattern.search(text).group(1) for key, pattern in patterns.items() if pattern.search(text)}
@@ -172,7 +173,7 @@ def match_patterns(patterns, text):
 def parse_alert_json(data):
     try:
         if isinstance(data, str):
-            data = objict.fromJSON(data.replace('\n', '\\n'))
+            data = objict.fromJSON(removeNonAscii(data.replace('\n', '\\n')))
     except Exception:
         data = objict.fromJSON(removeNonAscii(data))
     for key in data:

{django_restit-4.2.87 → django_restit-4.2.89}/medialib/models.py

@@ -324,11 +324,13 @@ class MediaLibrary(models.Model, RestModel):
         except (KeyError, AttributeError):
             return settings.MEDIALIB_DEFAULT_STORE
 
+
 class MediaItem(models.Model, RestModel, MetaDataModel):
     """
     Media Item (a video or image)
     """
     class RestMeta:
+        SEARCH_FIELDS = ["name", "description"]
         VIEW_PERMS = ["view_media", "manage_users", "manage_media"]
         SAVE_PERMS = ["manage_media", "manage_users"]
         OWNER_FIELD = "owner"

{django_restit-4.2.87 → django_restit-4.2.89}/pyproject.toml

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