django-restit 4.1.31__py3-none-any.whl → 4.1.33__py3-none-any.whl

{django_restit-4.1.31.dist-info → django_restit-4.1.33.dist-info}/METADATA

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

{django_restit-4.1.31.dist-info → django_restit-4.1.33.dist-info}/RECORD

@@ -84,10 +84,11 @@ incident/migrations/0005_incident_component_alter_incident_state.py,sha256=qC8-T
 incident/migrations/0006_delete_eventmetadata.py,sha256=buSEY_TmmXi9ShPFxB74Os2q0XP3KWejFX9RESoKDDU,324
 incident/migrations/0007_event_metadata.py,sha256=syxcM4gIcBwSjcpdU69CXq5dGS1Gu8OodZtPJFDpY5U,414
 incident/migrations/0008_incident_action_sent_incident_hostname_and_more.py,sha256=N2D47E9k4PxOo-9C72gqYkb6K0GqVIO4PkvdnWlrSuA,903
+incident/migrations/0009_incident_reporter_ip.py,sha256=JOrTGBPJw9g7cg--HH3zqnbsMowjNSgzxJTrKojcPJA,473
 incident/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/models/__init__.py,sha256=adTSOSVrYJgHD4hZNJJjFj_M1QZbpwhZZQiIzanUKA8,167
-incident/models/event.py,sha256=vxVszq2j106RbpIFXwLXL10Pa1Pz3oQmsHXPW51dssg,5585
-incident/models/incident.py,sha256=BNK9gEXz_GrhiKdhC985GCbc7MgbXA31UxvmYqLYkU0,10022
+incident/models/event.py,sha256=TcnpP2b6EGOHC4FrGg0fEXYxR72ijpG15Da6QIYPd3Y,5664
+incident/models/incident.py,sha256=_59XYgAxIrcXwjwowJkNmOWpWe5uq9DEgjeWaVsymXA,10325
 incident/models/ossec.py,sha256=pWMqcuTRxPFTEF-OZQSMn7YpNEE9mfsI4GMhWWjJs5I,2187
 incident/models/rules.py,sha256=67fbtEDfznxCYb-B89417lgYesN12PzmY25WBF_65a8,5300
 incident/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -342,7 +343,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=v6CRCYrWb-tXpiIv3FE15Pve4ox4XzY6fMK8CJ3fCiw,121
+rest/__init__.py,sha256=6U9nBasTmc58hTcdKLJO_tYr-kAllDsYaEEg4B5ezTU,121
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -422,17 +423,17 @@ 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=s1cUB4xndxiuaDYmubDAkABfv31hNTtuLWYrcveVRqM,19203
+taskqueue/models.py,sha256=0hqAYWfbWn-EhXL4cvzJNIIblC6gcLceyW3rhmZvnDs,19208
 taskqueue/periodic.py,sha256=2i0271khrCow3hDmlNEcoAZnesBVl40jd7MIim2Cxs4,3543
 taskqueue/rpc.py,sha256=CrxWKMTXi1EDvjB6iW5rAlwCpQIP_n1RW8Yfx9aKB9Y,5711
 taskqueue/tq.py,sha256=PzSoDrawYcqZylruEgsK95gcJ4J_VhdM6rxg9V6_X8E,942
 taskqueue/transports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskqueue/transports/email.py,sha256=H4GaomiyCck5R_AOcsrMawCl-_Bp_Zg-uWto9t1Xcoo,623
-taskqueue/transports/http.py,sha256=hbKBbN879fi9ZkMK12NROGGriEkei6DT1gJPB-ipt1M,2409
+taskqueue/transports/http.py,sha256=WFRLOfto_ODYzRUtYqeJq2GyV63pLfAWbvnRZTzaLIY,2409
 taskqueue/transports/s3.py,sha256=KI0paoIuQktk1c40Aa5LkzInVVCjXPdL7tPuTfXOtzs,1099
 taskqueue/transports/sftp.py,sha256=jT1_krjTHA7DCAukD85aGYRCg9m0cEH9EWzOC-wJGdk,1891
 taskqueue/transports/sms.py,sha256=H1-LIGEMfbUNqJD9amRcsvKUSwtz9yBj1QNfB7EHjHE,142
-taskqueue/worker.py,sha256=4cdDeSo7dENgCaQfckGYAiapCzI3yC4RGmGFDzC69Kw,16035
+taskqueue/worker.py,sha256=bt3rFrw7Ahf1-RHAqAFCv_M6sMad6u2m2WygnFPsaxI,15960
 telephony/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 telephony/admin.py,sha256=iOdsBfFFbBisdqKSZ36bIrh_z5sU0Wx_PkaFi8wd1iA,243
 telephony/decorators.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -473,7 +474,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.1.31.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.1.31.dist-info/METADATA,sha256=8gf5q9xS9aYrcj9VMO7G_v1tUAmwFkRcIfBzCgKziYY,7573
-django_restit-4.1.31.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.1.31.dist-info/RECORD,,
+django_restit-4.1.33.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.1.33.dist-info/METADATA,sha256=bs9FHm49r70GuX4baI73i2RntoO0Sld5480ehAD4m2E,7573
+django_restit-4.1.33.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.1.33.dist-info/RECORD,,

incident/migrations/0009_incident_reporter_ip.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.4 on 2023-08-22 19:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('incident', '0008_incident_action_sent_incident_hostname_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='incident',
+            name='reporter_ip',
+            field=models.CharField(blank=True, db_index=True, default=None, max_length=16, null=True),
+        ),
+    ]

incident/models/event.py

@@ -135,7 +135,10 @@ class Event(JSONMetaData, rm.RestModel):
 
         # always create an incident 
         if incident is None:
-            incident = Incident(rule=hit_rule, priority=priority, component=self.category, hostname=self.hostname)
+            incident = Incident(
+                rule=hit_rule, priority=priority,
+                reporter_ip=self.reporter_ip,
+                component=self.category, hostname=self.hostname)
             if hit_rule is not None:
                 incident.group = hit_rule.group
             # TODO possibly make this smarter?

incident/models/incident.py

@@ -50,6 +50,7 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
     description = models.CharField(max_length=200)
     component = models.CharField(max_length=200, null=True, default=None, db_index=True)
     hostname = models.CharField(max_length=200, null=True, default=None, db_index=True)
+    reporter_ip = models.CharField(max_length=16, blank=True, null=True, default=None, db_index=True)
 
     group = models.ForeignKey("account.Group", on_delete=models.SET_NULL, null=True, default=None)
     assigned_to = models.ForeignKey("account.Member", on_delete=models.SET_NULL, null=True, default=None)
@@ -210,6 +211,11 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
         elif rule.bundle_by == 3:
             q.hostname = event.hostname
             q.component = event.category
+        elif rule.bundle_by == 4:
+            q.reporter_ip = event.reporter_ip
+        elif rule.bundle_by == 5:
+            q.reporter_ip = event.reporter_ip
+            q.component = event.category
         return Incident.objects.filter(**q).last()
 
     @classmethod

rest/__init__.py

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

taskqueue/models.py

@@ -256,7 +256,7 @@ class Task(models.Model, RestModel):
         tdata = nobjict()
         tdata.url = url
         tdata.data = data
-        task = cls(channel="tq_hook",model="tq_web_request", fname=fname, data=tdata)
+        task = cls(channel="tq_hook", model="tq_web_request", fname=fname, data=tdata)
         if stale_after_seconds:
             task.stale_after = datetime.now() + timedelta(seconds=stale_after_seconds)
         task.save()
@@ -270,7 +270,7 @@ class Task(models.Model, RestModel):
         tdata.filename = filename
         tdata.subject = subject
         tdata.data = data
-        task = cls(channel="tq_hook",model="tq_email_request", data=tdata)
+        task = cls(channel="tq_hook", model="tq_email_request", data=tdata)
         task.save()
         task.publish()
         return task
@@ -280,7 +280,7 @@ class Task(models.Model, RestModel):
         tdata = nobjict()
         tdata.phone = phone
         tdata.data = data
-        task = cls(channel="tq_hook",model="tq_sms_request", data=tdata)
+        task = cls(channel="tq_hook", model="tq_sms_request", data=tdata)
         task.save()
         task.publish()
         return task
@@ -295,7 +295,7 @@ class Task(models.Model, RestModel):
         tdata.username = username
         tdata.password = password
         tdata.data = data
-        task = cls(channel="tq_hook",model="tq_sftp_request", data=tdata)
+        task = cls(channel="tq_hook", model="tq_sftp_request", data=tdata)
         task.save()
         task.publish()
         return task
@@ -310,7 +310,7 @@ class Task(models.Model, RestModel):
         tdata.aws = aws
         tdata.secret = secret
         tdata.when = str(when)
-        task = cls(channel="tq_hook",model="tq_s3_request", data=tdata)
+        task = cls(channel="tq_hook", model="tq_s3_request", data=tdata)
         task.save()
         task.publish()
         return task

taskqueue/transports/http.py

@@ -1,7 +1,8 @@
 import requests
 import time
 REQ_TIMEOUT = 15.0
-from rest.uberdict import UberDict
+from objict import objict
+
 
 def POST(task, attempts=3, timeout=REQ_TIMEOUT, headers=None):
     while attempts:
@@ -43,13 +44,14 @@ def httpGET(url, params=None, session=None, timeout=REQ_TIMEOUT):
         res = requests.get(url, headers=headers, params=params, timeout=timeout)
     return res
 
+
 def httpPOST(url, data, post_json=False, session=None, timeout=REQ_TIMEOUT, headers=None):
     if not headers or type(headers) is not dict:
         headers = {'Accept': 'application/json'}
     if 'Accept' not in headers:
         headers['Accept'] = 'application/json'
     if post_json:
-        data = UberDict(data).toJSON()
+        data = objict.fromdict(data).toJSON()
         headers['Content-type'] = 'application/json'
     if post_json:
         if session:

taskqueue/worker.py

@@ -194,7 +194,7 @@ class WorkManager(object):
                 self.logger.warning("ignore job {}:{}".format(task.id, task.channel))
 
     def _on_webrequest(self, task):
-        self.logger.debug("starting webrequest to: {}".format(task.data.url))
+        # self.logger.debug("starting web request to: {}".format(task.data.url))
         # we need to copy the data and remove the url
         if task.fname.upper() == "GET":
             resp = http.GET(task)
@@ -207,7 +207,6 @@ class WorkManager(object):
             task.retry_later(from_now_secs=(task.attempts-1) * 120)
 
     def _on_hookrequest(self, task):
-        self.logger.debug("starting webrequest to: {}".format(task.data.url))
         # we need to copy the data and remove the url
         if task.model == "tq_email_request":
             resp = email.SEND(task)