django-restit 4.2.119__py3-none-any.whl → 4.2.121__py3-none-any.whl

{django_restit-4.2.119.dist-info → django_restit-4.2.121.dist-info}/METADATA

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

{django_restit-4.2.119.dist-info → django_restit-4.2.121.dist-info}/RECORD

@@ -87,7 +87,7 @@ inbox/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 inbox/models/__init__.py,sha256=yARvP31nhJGLjqP-U_ONi2OLjiTUFspdH0AlKynt4Y8,174
 inbox/models/bounce.py,sha256=3b_pCKH3gwb3NE8I1XlVI6JeoVmobZyKidsILH-jIRg,2881
 inbox/models/complaint.py,sha256=AcESgSzb26wLLmcW2VCsQ-MApZCkp_TfFJnaghiPf2s,2517
-inbox/models/message.py,sha256=iSbeKv6GUPflk_2v97ZR51OdSUAHjbTZA5xXs7CLREs,3003
+inbox/models/message.py,sha256=acPm2z0QsucoFFmfzPekehElZm8EMzkcGChX_BpzGLU,3758
 inbox/models/template.py,sha256=i5vf0vsM1U0251UmVsF61MDCV_c7xt-zdCdx1SiKOG0,1013
 inbox/rpc.py,sha256=7JXvpXlEGKG7by_NkANPGYLCzagyCnTIGM4rme_htpk,1534
 inbox/utils/__init__.py,sha256=P_UR2rGK3L0tZNlTN-mf99tpeYM-tLkA18iDKXSSLDM,89
@@ -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=v3UAQFn5IsoS8vhHEQXmGgZ8cIf8Hnd5elmULDTnYlk,19825
+incident/models/incident.py,sha256=dhzGlkHZn4ZwBjsW_tDwAJAVMA92d_VkrKIboyNbplw,20596
 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
@@ -374,7 +374,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=T69hPGVuXYLkkZwzO8U8g_fb7Vw1XimtawbmkqkYBio,122
+rest/__init__.py,sha256=H5p2wiXgFk7-1upHmWGchOgaS_PJww8PEbemgH0umAU,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
@@ -509,7 +509,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.119.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.119.dist-info/METADATA,sha256=bfo5mQTv9HTNskCFG0XkAhrkfzGHplgxitT1tKK9Ul4,7663
-django_restit-4.2.119.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.119.dist-info/RECORD,,
+django_restit-4.2.121.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.121.dist-info/METADATA,sha256=_xO1pbgTC8LQPTUBYTC_hL_Km8cjo35beIfQiji5drc,7663
+django_restit-4.2.121.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.121.dist-info/RECORD,,

inbox/models/message.py

@@ -1,5 +1,9 @@
 from django.db import models
 from rest import models as rm
+import time
+
+POSIX_BODY_BREAK = "\n\n\n"
+WIN_BODY_BREAK = "\r\n\r\n\r\n"
 
 
 class Mailbox(models.Model, rm.RestModel, rm.MetaDataModel):
@@ -51,9 +55,31 @@ class Message(models.Model, rm.RestModel):
     body = models.TextField(null=True, default=None)
     html = models.TextField(null=True, default=None)
 
+    def getIdFromSubject(self, prefix="#"):
+        pk = self.subject[self.subject.find(prefix)+len(prefix):]
+        if ' ' in pk:
+            pk = pk[:pk.find(' ')]
+        return pk
+
+    def getLatestBody(self):
+        body = self.body
+        if POSIX_BODY_BREAK in body:
+            body = body[:body.find(POSIX_BODY_BREAK)]
+        elif WIN_BODY_BREAK in body:
+            body = body[:body.find(WIN_BODY_BREAK)]
+        return body
+        
     def __str__(self):
         return f"message: to:{self.to_email} from:{self.from_email} subject: {self.subject}"
 
+    @staticmethod
+    def GetMessage(pk, delay=2.0):
+        msg = Message.objects.filter(pk=pk).last()
+        if msg is None:
+            time.sleep(delay)
+            msg = Message.objects.filter(pk=pk).last()
+        return msg
+
 
 class Attachment(models.Model, rm.RestModel):
     class RestMeta:

incident/models/incident.py

@@ -53,7 +53,16 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
                     "rule": "basic",
                     "assigned_to": "basic"
                 },
-            }
+            },
+            "detailed": {
+                "extra": ["metadata", ("get_state_display", "state_display")],
+                "graphs": {
+                    "group": "basic",
+                    "rule": "basic",
+                    "assigned_to": "basic",
+                    "generic__component": "basic"
+                },
+            },
         }
 
     created = models.DateTimeField(auto_now_add=True)
@@ -220,15 +229,23 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
         except Exception:
             rh.log_exception("triggerAsyncNotify")
 
-    def triggerTask(self):
+    def triggerTask(self, action=None):
         # task:APP_NAME:FNAME:CHANNEL
-        fields = self.rule.action.split(':')
-        if len(fields) < 4:
+        if action is None:
+            action = self.rule.action
+        fields = action.split(':')
+        if len(fields) < 3:
             rh.log_error("triggerTask failed, invalid field count")
             return
         self.action_sent = datetime.now()
         self.save()
-        Task.Publish(fields[1], fields[2], channel=fields[3])
+        channel = "tq_app_handler"
+        if len(fields) > 3:
+            channel = fields[3]
+
+        Task.Publish(
+            fields[1], fields[2], channel=channel,
+            data=dict(pk=self.pk))
 
     def triggerEmail(self):
         if self.lastSentAge() < 300:
@@ -258,19 +275,26 @@ 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(":")
+        parts = self.rule.action.split(":")
+        junk = parts[0]
+        gid = parts[1]
+        perm = None
+        if len(parts) == 2:
+            perm = gid
+            gid = None
+        if len(parts) > 2:
+            perm = parts[2]
+        if gid:
             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
+        if perm == "action" and len(parts) > 3:
+            if parts[3] == "task":
+                return self.triggerTask(":".join(parts[3:]))
         self.action_sent = datetime.now()
         self.save()
-
         subject = f"New Issue @ {self.group.name} - {self.description}"
         details = self.getProperty("details", self.description)
         username = self.getProperty("username", None)

rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.119"
+__version__ = "4.2.121"