django-restit 4.2.84__py3-none-any.whl → 4.2.85__py3-none-any.whl

{django_restit-4.2.84.dist-info → django_restit-4.2.85.dist-info}/METADATA

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

{django_restit-4.2.84.dist-info → django_restit-4.2.85.dist-info}/RECORD

@@ -112,14 +112,14 @@ 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=HPbi6J9qm7_-FMjnDUPV9NcbmP_60WU-IO9HJSpoLTY,19360
+incident/models/incident.py,sha256=XB7FgyV26sgxSOHu69UTlLmLs1vljf0O6KyN114Rf2I,19585
 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/periodic.py,sha256=eX1rQK6v65A9ugofTvJPSmAWei6C-3EYgzCMuGZ03jM,381
-incident/rpc.py,sha256=viJt873b8T8SiAq10EM57lF8g7ghyj3ymdkaXzh2Ass,8181
+incident/rpc.py,sha256=6JVWTTAr4CN2tAjjIUcXug1z3RhU_ar5CDLzedkduA4,8187
 incident/templates/email/incident_change.html,sha256=tQYphypwLukkVdwH0TB2Szz2VEJ7GnsfRS3_ZJ-MYeE,13895
 incident/templates/email/incident_msg.html,sha256=MZdKhTddUF2MpiH8Z3RTQEmW_ko1n3ajeZ11KLtiLlU,13780
 incident/templates/email/incident_new.html,sha256=W6nwFQROnyDfMlXub8s02ws4hGnJp16pfgp9xTm_aEc,15185
@@ -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.84.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.84.dist-info/METADATA,sha256=nTmKDiYJinMeyK6T2939-Zs5e8U4nFoaG_EV7_D9tkQ,7645
-django_restit-4.2.84.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.84.dist-info/RECORD,,
+django_restit-4.2.85.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.85.dist-info/METADATA,sha256=c0_tpMC4ULCMJwzo_QfuVOwW3MRdLMhy6k1gqDHUaec,7645
+django_restit-4.2.85.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.85.dist-info/RECORD,,

incident/models/incident.py

@@ -4,7 +4,7 @@ from rest import settings
 from rest import models as rm
 from rest import helpers as rh
 from taskqueue.models import Task
-from account.models import Member
+from account.models import Member, Group
 from objict import objict
 from datetime import datetime, timedelta
 from rest import log
@@ -255,10 +255,16 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
             rh.log_exception("triggerSMS")
 
     def triggerGroup(self):
+        if self.rule.action.count(":") == 2:
+            action, gid, perm = self.rule.action.split(":")
+            self.group = Group.objects.filter(pk=int(gid)).last()
+            self.save()
+        else:
+            action, perm = self.rule.action.split(":")
+
         if not self.group:
             self.notifyWith("notify.unknown_incidents")
             return
-        action, perm = self.rule.action.split(":")
         self.action_sent = datetime.now()
         self.save()
 
@@ -472,13 +478,13 @@ class IncidentHistory(models.Model, rm.RestModel):
         SEARCH_FIELDS = ["to__username", "note"]
         GRAPHS = {
             "default": {
-                "extra":[
+                "extra": [
                     ("get_state_display", "state_display"),
                     ("get_priority_display", "priority_display"),
                 ],
-                "graphs":{
-                    "by":"basic",
-                    "to":"basic",
+                "graphs": {
+                    "by": "basic",
+                    "to": "basic",
                     "media": "basic"
                 }
             },

incident/rpc.py

@@ -18,7 +18,7 @@ def patched_restPermissionDenied(request, error="permission denied",
                                  component=None, component_id=None):
     
     description = f"permission denied: {error_code} '{error}' for {request.user} {request.method}:{request.path}"
-    rh.log_error(description)
+    # rh.log_error(description)
     if error_code == 404:
         if not request.path.startswith(LOG_REST_PREFIX) and not request.path.startswith("/rpc"):
             # just ignore these
@@ -61,7 +61,7 @@ def ossec_alert_creat_from_request(request):
     if payload:
         try:
             # TODO make this a task (background it)
-            rh.log_error("parsing payload", payload)
+            # rh.log_error("parsing payload", payload)
             od = ossec.parseAlert(request, payload)
             # lets now create a local event
             if od is not None:
@@ -118,7 +118,7 @@ def ossec_alert_creat_from_request(request):
                 "category": "ossec_error",
                 "metadata": metadata
             })
-    rh.log_error("ossec alert", request.DATA.asDict())
+    # rh.log_error("ossec alert", request.DATA.asDict())
     return rv.restStatus(request, False, error="no alert data")