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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: django-restit
3
- Version: 4.2.119
3
+ Version: 4.2.120
4
4
  Summary: A Rest Framework for DJANGO
5
5
  License: MIT
6
6
  Author: Ian Starnes
@@ -87,7 +87,7 @@ inbox/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
87
87
  inbox/models/__init__.py,sha256=yARvP31nhJGLjqP-U_ONi2OLjiTUFspdH0AlKynt4Y8,174
88
88
  inbox/models/bounce.py,sha256=3b_pCKH3gwb3NE8I1XlVI6JeoVmobZyKidsILH-jIRg,2881
89
89
  inbox/models/complaint.py,sha256=AcESgSzb26wLLmcW2VCsQ-MApZCkp_TfFJnaghiPf2s,2517
90
- inbox/models/message.py,sha256=iSbeKv6GUPflk_2v97ZR51OdSUAHjbTZA5xXs7CLREs,3003
90
+ inbox/models/message.py,sha256=acPm2z0QsucoFFmfzPekehElZm8EMzkcGChX_BpzGLU,3758
91
91
  inbox/models/template.py,sha256=i5vf0vsM1U0251UmVsF61MDCV_c7xt-zdCdx1SiKOG0,1013
92
92
  inbox/rpc.py,sha256=7JXvpXlEGKG7by_NkANPGYLCzagyCnTIGM4rme_htpk,1534
93
93
  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
114
114
  incident/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
115
115
  incident/models/__init__.py,sha256=NMphuhb0RTMf7Ov4QkNv7iv6_I8Wtr3xQ54yjX_a31M,209
116
116
  incident/models/event.py,sha256=LNKYdqOj_CO4aGvc2dNmy3K-S52Udi_gZ4-wintbs1s,7901
117
- incident/models/incident.py,sha256=v3UAQFn5IsoS8vhHEQXmGgZ8cIf8Hnd5elmULDTnYlk,19825
117
+ incident/models/incident.py,sha256=pxV7ZPMfYXci5GmRy1EzcLWwcV61UDoqcu4QuQnmZug,20304
118
118
  incident/models/ossec.py,sha256=eUDRGawzuLWobKEVGKfdZisDnyjS_Hlxi0T_GCSLCCI,2252
119
119
  incident/models/rules.py,sha256=aRkJ0ZnTv87nAUC1sHVkPExfb3OJ8fgHQIhnCIpIbhQ,7001
120
120
  incident/models/ticket.py,sha256=S3kqGQpYLE6Y4M9IKu_60sgW-f592xNr8uufqHnvDoU,2302
@@ -374,7 +374,7 @@ pushit/utils.py,sha256=IeTCGa-164nmB1jIsK1lu1O1QzUhS3BKfuXHGjCW-ck,2121
374
374
  rest/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
375
375
  rest/README.md,sha256=V3ETc-cJu8PZIbKr9xSe_pA4JEUpC8Dhw4bQeVCDJPw,5460
376
376
  rest/RemoteEvents.py,sha256=nL46U7AuxIrlw2JunphR1tsXyqi-ep_gD9CYGpYbNgE,72
377
- rest/__init__.py,sha256=T69hPGVuXYLkkZwzO8U8g_fb7Vw1XimtawbmkqkYBio,122
377
+ rest/__init__.py,sha256=v1onV7iLp2fAwAiAR6uRaS5Ck82v0WTI33rLH78hFqE,122
378
378
  rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
379
379
  rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
380
380
  rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -509,7 +509,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
509
509
  ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
510
510
  ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
511
511
  ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
512
- django_restit-4.2.119.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
513
- django_restit-4.2.119.dist-info/METADATA,sha256=bfo5mQTv9HTNskCFG0XkAhrkfzGHplgxitT1tKK9Ul4,7663
514
- django_restit-4.2.119.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
515
- django_restit-4.2.119.dist-info/RECORD,,
512
+ django_restit-4.2.120.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
513
+ django_restit-4.2.120.dist-info/METADATA,sha256=OfRFWQJ2xUyFXdqy1Vbx0j73hGWA_sCiCmm0iUEfQcU,7663
514
+ django_restit-4.2.120.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
515
+ django_restit-4.2.120.dist-info/RECORD,,
inbox/models/message.py CHANGED
@@ -1,5 +1,9 @@
1
1
  from django.db import models
2
2
  from rest import models as rm
3
+ import time
4
+
5
+ POSIX_BODY_BREAK = "\n\n\n"
6
+ WIN_BODY_BREAK = "\r\n\r\n\r\n"
3
7
 
4
8
 
5
9
  class Mailbox(models.Model, rm.RestModel, rm.MetaDataModel):
@@ -51,9 +55,31 @@ class Message(models.Model, rm.RestModel):
51
55
  body = models.TextField(null=True, default=None)
52
56
  html = models.TextField(null=True, default=None)
53
57
 
58
+ def getIdFromSubject(self, prefix="#"):
59
+ pk = self.subject[self.subject.find(prefix)+len(prefix):]
60
+ if ' ' in pk:
61
+ pk = pk[:pk.find(' ')]
62
+ return pk
63
+
64
+ def getLatestBody(self):
65
+ body = self.body
66
+ if POSIX_BODY_BREAK in body:
67
+ body = body[:body.find(POSIX_BODY_BREAK)]
68
+ elif WIN_BODY_BREAK in body:
69
+ body = body[:body.find(WIN_BODY_BREAK)]
70
+ return body
71
+
54
72
  def __str__(self):
55
73
  return f"message: to:{self.to_email} from:{self.from_email} subject: {self.subject}"
56
74
 
75
+ @staticmethod
76
+ def GetMessage(pk, delay=2.0):
77
+ msg = Message.objects.filter(pk=pk).last()
78
+ if msg is None:
79
+ time.sleep(delay)
80
+ msg = Message.objects.filter(pk=pk).last()
81
+ return msg
82
+
57
83
 
58
84
  class Attachment(models.Model, rm.RestModel):
59
85
  class RestMeta:
@@ -53,7 +53,16 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
53
53
  "rule": "basic",
54
54
  "assigned_to": "basic"
55
55
  },
56
- }
56
+ },
57
+ "detailed": {
58
+ "extra": ["metadata", ("get_state_display", "state_display")],
59
+ "graphs": {
60
+ "group": "basic",
61
+ "rule": "basic",
62
+ "assigned_to": "basic",
63
+ "generic__component": "basic"
64
+ },
65
+ },
57
66
  }
58
67
 
59
68
  created = models.DateTimeField(auto_now_add=True)
@@ -228,7 +237,13 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
228
237
  return
229
238
  self.action_sent = datetime.now()
230
239
  self.save()
231
- Task.Publish(fields[1], fields[2], channel=fields[3])
240
+ channel = "tq_app_handler"
241
+ if len(fields) > 3:
242
+ channel = fields[3]
243
+
244
+ Task.Publish(
245
+ fields[1], fields[2], channel=channel,
246
+ data=dict(pk=self.pk))
232
247
 
233
248
  def triggerEmail(self):
234
249
  if self.lastSentAge() < 300:
rest/__init__.py CHANGED
@@ -1,4 +1,4 @@
1
1
  from .uberdict import UberDict # noqa: F401
2
2
  from .settings_helper import settings # noqa: F401
3
3
 
4
- __version__ = "4.2.119"
4
+ __version__ = "4.2.120"