django-restit 4.2.144__tar.gz → 4.2.146__tar.gz

{django_restit-4.2.144 → django_restit-4.2.146}/PKG-INFO

@@ -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 → django_restit-4.2.146}/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

{django_restit-4.2.144 → django_restit-4.2.146}/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):

{django_restit-4.2.144 → django_restit-4.2.146}/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

{django_restit-4.2.144 → django_restit-4.2.146}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.2.144"
+version = "4.2.146"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"

{django_restit-4.2.144 → django_restit-4.2.146}/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"