django-restit 4.2.144__py3-none-any.whl → 4.2.146__py3-none-any.whl

{django_restit-4.2.144.dist-info → django_restit-4.2.146.dist-info}/METADATA

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

{django_restit-4.2.144.dist-info → django_restit-4.2.146.dist-info}/RECORD

@@ -77,7 +77,7 @@ auditlog/urls.py,sha256=GNqpN74EpYlMND2UFUdPt5rOkTYYrdbTV0W3fg4zLfQ,163
 inbox/README.md,sha256=jsklDrzD5d94r7cwgaU6Gi1HCjBDfWq7jd92qB0JYPU,2169
 inbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inbox/admin.py,sha256=AgG82kwLzabzKgOok-ISJLQd7JoyuGa9hqrxrm3zSOQ,243
-inbox/handlers.py,sha256=Zz7l7Bo9z3kjSOl5QtotttImrCCePB7vHlKBpPMsHqs,5638
+inbox/handlers.py,sha256=oHxGp2OBbo01OZil6LkaPSKWV20x3Y5lEKjKAcCLB-I,5798
 inbox/migrations/0001_initial.py,sha256=P1OmbSHZGhj3wVBdFKWEzNrPdbyKzR9fFBXP8rhXXh8,6429
 inbox/migrations/0002_alter_message_cc.py,sha256=dsnDHCs1-dFZfSEWJmufBOs5gvNbI7u99kru6fVas0Y,380
 inbox/migrations/0003_attachment_content_type.py,sha256=dh_km90V6R3O0-N2oNTWhWLZZ96MylRgDY7Poua9CZ8,416
@@ -97,7 +97,7 @@ inbox/utils/sending.py,sha256=BKelTZnbkdSLGpjOY6IRTrzj-Hnw2pPZ7RYQGwe-tqk,2179
 incident/README.md,sha256=4vbZTJj7uUmq8rogYngxqNYjFTlBOujfWUGheLoFKMc,1114
 incident/__init__.py,sha256=xgdt3z3z7ygjWv5HxhiWgBtB2W3IUJmmR88NSyUeHuo,3455
 incident/extra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-incident/extra/abuse.py,sha256=TaNs1mF7L2ijoAl5iyEX1BaUgaOwsCeeF2_zwj4RSF0,4301
+incident/extra/abuse.py,sha256=1eBJWhhzQ6EF7mkchI_QD3h0UH4Qiw_iXvsQgJdmjcg,4373
 incident/migrations/0001_initial.py,sha256=KmJRau3a2QFRaUwUrFUgY2p7FQZCODv3F-Sl0ZArpu0,9720
 incident/migrations/0002_event_component_event_component_id.py,sha256=Qfu3ndJKh4v7953ULTUZlSa3mVI-lnFIq9VFN1Rbs7Q,595
 incident/migrations/0003_rule_action.py,sha256=LNqV52qOjxxe3L8qEdln-Hd2voFcpyjOZ_cEsasrv7s,425
@@ -115,7 +115,7 @@ incident/migrations/0014_event_group_alter_rulecheck_index.py,sha256=v3gm5k0LVoa
 incident/migrations/0015_rule_title_template_alter_incident_state.py,sha256=FPUDhFwqBC39EjeknRT7BPddEf6ExCjsXVb9LMqIn3U,687
 incident/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/models/__init__.py,sha256=NMphuhb0RTMf7Ov4QkNv7iv6_I8Wtr3xQ54yjX_a31M,209
-incident/models/event.py,sha256=mk5IQgxtwkLKJEpwIHwO0c45X4CfwqqIN-aI5lJPVBg,7944
+incident/models/event.py,sha256=FEzEKKQKLkdRrPCvv-3Um9E2UPQjyIJp314Zr2LHuiw,7976
 incident/models/incident.py,sha256=n5S-QzGvAOtJmlzbj3vPTY03avIknPjDMLUUq9FyTa0,21648
 incident/models/ossec.py,sha256=eUDRGawzuLWobKEVGKfdZisDnyjS_Hlxi0T_GCSLCCI,2252
 incident/models/rules.py,sha256=aRkJ0ZnTv87nAUC1sHVkPExfb3OJ8fgHQIhnCIpIbhQ,7001
@@ -379,7 +379,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=WbQDlSqAn04sJ1Ns67DJScCD43s2A5xHagr1HISnV7I,122
+rest/__init__.py,sha256=gEiT7xUmFhIFR7GF1myvLnmeN2xsHMj0l8HsLYSfOPc,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
@@ -515,7 +515,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=KKq00EwoGnz1yLwCZr5Dfoq2izivmAdsNEEM4EhZwN4,1610
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.144.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.144.dist-info/METADATA,sha256=P1p28suzqWk267UAN1dJ0FhlQZe6c3DALCwbPdqC2DQ,7663
-django_restit-4.2.144.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.144.dist-info/RECORD,,
+django_restit-4.2.146.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.146.dist-info/METADATA,sha256=UbdKn4LJWNrB_cn5SqjrkgEsMxk-Y7_E5UlNtM5JCZ0,7663
+django_restit-4.2.146.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.146.dist-info/RECORD,,

inbox/handlers.py

@@ -57,12 +57,14 @@ def on_complaint(request, msg):
     return rv.restStatus(request, True)
 
 
-def on_email(request, msg):
+def on_email(request, msg=None):
     """
     Email receiving can be configured in 2 ways.
      1. raw email via SNS which would have content field
      2. s3 bucket stored email which will have a receipt.action.bucketName
     """
+    if msg is None:
+        msg = request.DATA.asDict()
     if msg.content is None and msg.receipt and msg.receipt.action:
         action = msg.receipt.action
         if action.type == "S3":
@@ -111,6 +113,9 @@ def on_raw_email(request, imsg, msg_data):
         elif msg_atch.encoding == "quoted-printable":
             obj = mailtils.toFileObject(msg_atch)
             atch.saveMediaFile(obj, "media", msg_atch.name)
+        else:
+            logger.error("unknown encoding", msg_atch.encoding)
+            continue
         atch.save()
         attachments.append(atch)
     # add the recipients mailbox

incident/extra/abuse.py

@@ -90,7 +90,10 @@ def lookup(ip, max_days=0):
     response = requests.request(
         method='GET', url=url, headers=DEFAULT_HEADERS,
         params=params)
-    return objict.fromJSON(response.text)
+    output = objict.fromJSON(response.text)
+    if "data" in output:
+        return output.data
+    return output
 
 
 def reportAbuse(ip, comment, categories):

incident/models/event.py

@@ -193,6 +193,7 @@ class Event(JSONMetaData, rm.RestModel):
                     incident.description = self.description
             elif self.category == "ossec":
                 incident.description = f"{self.hostname}: {self.description}"
+                incident.save()
                 incident.updateAbuseInfo()
             else:
                 incident.description = self.description

rest/__init__.py

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