django-restit 4.2.115__py3-none-any.whl → 4.2.117__py3-none-any.whl

{django_restit-4.2.115.dist-info → django_restit-4.2.117.dist-info}/METADATA

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

{django_restit-4.2.115.dist-info → django_restit-4.2.117.dist-info}/RECORD

@@ -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=1uLkr7_QEKYsccO-OVmb7YcM8BA3Q6UCWWw2m935YKg,20030
+incident/models/incident.py,sha256=v3UAQFn5IsoS8vhHEQXmGgZ8cIf8Hnd5elmULDTnYlk,19825
 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=rpT5GRLaen0ZtXUGON9i6D2o8jTE0wUDdVakkyznoVk,122
+rest/__init__.py,sha256=eEcQu-xBJYFfnIKJ2D20u1uTGYqA98jafXZ8kYWSowY,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
@@ -456,7 +456,7 @@ taskqueue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskqueue/admin.py,sha256=E6zXoToS_ea3MdoGjZzF1JiepWFtDSoZUQdan8H-pXI,208
 taskqueue/migrations/0001_initial.py,sha256=JwYib8CK5ftSXlfxKZUcKEEVsXktNB5q3h-2tu9inGk,4738
 taskqueue/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-taskqueue/models.py,sha256=VQ8Slk6Cm3H7ZDCfFP_b83VL2mpSdOOGTxALTZxQdqo,23726
+taskqueue/models.py,sha256=RsBC2YcG058D_LVq5fCgiqIaFqi5yDh9LAwI6Pe2V3A,23719
 taskqueue/periodic.py,sha256=hpXnunJL_cuVQLAKpjTbABbsQ4fvdsV9_gyyK-_53Sk,3844
 taskqueue/rpc.py,sha256=Lf5VUoqCRkfWUAIvx_s508mjAtDPwpiWyxg0ryqWbQA,5793
 taskqueue/tq.py,sha256=PzSoDrawYcqZylruEgsK95gcJ4J_VhdM6rxg9V6_X8E,942
@@ -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.115.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.115.dist-info/METADATA,sha256=uI2rG3O3i93ljjzF9wkBo86YUx0sUU-eR6FfZ8erZHQ,7663
-django_restit-4.2.115.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.115.dist-info/RECORD,,
+django_restit-4.2.117.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.117.dist-info/METADATA,sha256=JwiKaeVRnqgf3Vmbq6pENaofQTVTldb95V4T0dRh6_c,7663
+django_restit-4.2.117.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.117.dist-info/RECORD,,

incident/models/incident.py

@@ -13,20 +13,9 @@ import time
 
 logger = log.getLogger("incident", filename="incident.log")
 
-EVENT_META_TO_INCIDENT = [
-    "username",
-    "email",
-    "phone",
-    "group_name",
-    "group_id",
-    ("http_user_agent", "user_agent"),
-    "user_agent",
-    "http_url",
-    "error",
-    "error_code",
-    "rule_id",
-    "path"
-]
+EVENT_META_TO_INCIDENT = {
+    "http_user_agent": "user_agent"
+}
 
 INCIDENT_STATE_NEW = 0
 INCIDENT_STATE_OPENED = 1
@@ -139,22 +128,23 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
         self.setProperty("event_count", count)
 
     def updateMeta(self, event):
-        for key in EVENT_META_TO_INCIDENT:
-            new_key = key
-            if isinstance(key, tuple):
-                key, new_key = key
-            if key in event.metadata:
-                self.setProperty(new_key, event.metadata[key])
-        self.setProperty("details", event.details)
+        for key in event.metadata:
+            v = event.metadata[key]
+            if not isinstance(v, (str, int, float)):
+                continue
+            if key in EVENT_META_TO_INCIDENT:
+                if isinstance(EVENT_META_TO_INCIDENT[key], tuple):
+                    key = EVENT_META_TO_INCIDENT[key][1]
+            self.setProperty(key, v)
+
+        if event.details:
+            self.setProperty("details", event.details)
+    
         if event.metadata.geoip and event.metadata.geoip.city:
             self.setProperty("city", event.metadata.geoip.city)
             self.setProperty("state", event.metadata.geoip.state)
             self.setProperty("country", event.metadata.geoip.country)
             self.setProperty("isp", event.metadata.geoip.isp)
-        else:
-            for key in ["city", "state", "country", "isp"]:
-                if key in event.metadata:
-                    self.setProperty(new_key, event.metadata[key])
 
     def shouldTriggerAction(self):
         count = self.events.all().count()

rest/__init__.py

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

taskqueue/models.py

@@ -286,7 +286,7 @@ class Task(models.Model, RestModel):
             import incident
             incident.event_now(
                 category, description=subject, details=msg, 
-                level=3, metadata=metadata)
+                level=3, **metadata)
         except Exception as err:
             self.log(str(err), kind="error")