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

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

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,10 @@ 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):
+    out = rh.countOccurences(Group.objects.filter(is_active=True), "kind")
+    return rv.restResult(request, dict(data=out))

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

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

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

@@ -26,7 +26,7 @@ account/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 account/models/__init__.py,sha256=cV_lMnT2vL_mjiYtT4hlcIHo52ocFbGSNVkOIHHLXZY,385
 account/models/device.py,sha256=TloXvvrx3khF3BeGFuVYn6DhXjOW0AMZb4F9Fl5nBII,5491
 account/models/feeds.py,sha256=vI7fG4ASY1M0Zjke24RdnfDcuWeATl_yR_25jPmT64g,2011
-account/models/group.py,sha256=iDD_oSgswKV_t_gXZuVK80MvICrZZqdANm2jtGtOFy8,21985
+account/models/group.py,sha256=Zsclyi83t-X-OshkaauObImVimiI2crTsKEM_aC2vvE,22262
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
 account/models/member.py,sha256=8xi-NahJipic_ut81vCFG-hY9x1U-trZ9KhnhIHAaFM,53092
 account/models/membership.py,sha256=90EpAhOsGaqphDAkONP6j_qQ0OWSRaQsI8H7E7fgMkE,9249
@@ -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=FD9GymgPY68y-gtDLsZxYVdwQJeLGpqcP4hjcDUh-GM,4022
+account/rpc/group.py,sha256=Iiefop0XmnuTZtZJTSyXbIAa7jD1cRLfreHMZWdhteE,4230
 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,12 +112,12 @@ 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=XB7FgyV26sgxSOHu69UTlLmLs1vljf0O6KyN114Rf2I,19585
+incident/models/incident.py,sha256=uKF7fUjZUPjLlfpRIlFMocGaanng2wmHmglP5RAzv_w,19847
 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
 incident/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-incident/parsers/ossec.py,sha256=jyJmNBwnQS1tjZMwYhslnCpZviCHXnozv88BPT-ytCw,11592
+incident/parsers/ossec.py,sha256=fouUsSnrdkEuqDzJ-MxmCP7ny5pCGFS3Tyf6lQSMBc4,11609
 incident/periodic.py,sha256=eX1rQK6v65A9ugofTvJPSmAWei6C-3EYgzCMuGZ03jM,381
 incident/rpc.py,sha256=6JVWTTAr4CN2tAjjIUcXug1z3RhU_ar5CDLzedkduA4,8187
 incident/templates/email/incident_change.html,sha256=tQYphypwLukkVdwH0TB2Szz2VEJ7GnsfRS3_ZJ-MYeE,13895
@@ -170,7 +170,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=QApiv3zFfqMSLbjVqwpvRYT4HKbXj7EZGFkNDG_P_hQ,52152
+medialib/models.py,sha256=eFT19hkG28OxSlrw2VFh3i9yiQGObPSY5Y76QmSORYk,52201
 medialib/ocr.py,sha256=zlP7-NBiXhW7jR9pljmEPl5xzLVZpLN5QLAELQgU0Fk,1189
 medialib/pdf.py,sha256=l28WwM0JKbT9boV-b_9TFh9jhvGcrquR8GqC8wfEaLk,1275
 medialib/qrcode.py,sha256=vHyA5egXOX70EFiUDgr1njI9zcF6bXQJ_hKAQrppRow,545
@@ -387,7 +387,7 @@ rest/extra/__init__.py,sha256=YzmNsch5H5FFLkUK9mIAKyoRK_rJCA9HGb0kubp4h30,54
 rest/extra/json_metadata.py,sha256=p_ffzmANmOFix_oC3voR6_NNTjcn7-T7aXcH-I4_Npg,1078
 rest/fields.py,sha256=_v1TJVc6vyWlqmwFRJ6mtuR5Fo-lS0KcUhPWIrzKZUo,9719
 rest/forms.py,sha256=66Wm5cdy8tKib_mGicjq_yd-gNVMFWRECnrDksnNnwU,6316
-rest/helpers.py,sha256=Ok4qUhSgepo3HjMe1EPwv5ZCWyMhM-HVFGUMnQclT00,29424
+rest/helpers.py,sha256=PQ6-zTKZo85-TTI5BOO1sQVUFScirArnMz3X7_OpZN4,29450
 rest/joke.py,sha256=0PpKaX2iN7jlS62kgjfmmqkFBYLPURz15aQ8R7OJkJ8,260
 rest/jwtoken.py,sha256=6AIe9IpsOn44sodiV0OPYeTZZNhS8VRiakV-rOuCyGw,2444
 rest/log.py,sha256=hd1_4HBOS395sfXJIL6BTw9yekm1SLgBwYx_PdfIhKA,20930
@@ -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.86.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.86.dist-info/METADATA,sha256=VgZXfFw-5VGQ9LfHhDDTKtJSJ056KXbmDThinDakpIU,7645
-django_restit-4.2.86.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.86.dist-info/RECORD,,
+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,,

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,17 @@ 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)
 
     def shouldTriggerAction(self):
         count = self.events.all().count()

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:

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"

rest/helpers.py

@@ -583,7 +583,7 @@ def getGroupLeaders(Model, timeframe="week", date_field="created",
         aq[field_key] = Avg(field)
     else:
         aq[field_key] = Count(field)
-    return list(qset.annotate(**aq)[:size])
+    return list(qset.annotate(**aq).order_by(f"-{field_key}")[:size])
 
 
 def countOccurences(qset, field_name):