django-restit 4.2.166__py3-none-any.whl → 4.2.172__py3-none-any.whl

{django_restit-4.2.166.dist-info → django_restit-4.2.172.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: django-restit
-Version: 4.2.166
+Version: 4.2.172
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: boto3 (>=1.26.160,<2.0.0)
 Requires-Dist: django
 Requires-Dist: django-redis-cache (>=3.0.1,<4.0.0)

{django_restit-4.2.166.dist-info → django_restit-4.2.172.dist-info}/RECORD

@@ -122,7 +122,7 @@ incident/models/ticket.py,sha256=S3kqGQpYLE6Y4M9IKu_60sgW-f592xNr8uufqHnvDoU,230
 incident/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/parsers/ossec.py,sha256=fouUsSnrdkEuqDzJ-MxmCP7ny5pCGFS3Tyf6lQSMBc4,11609
 incident/periodic.py,sha256=eX1rQK6v65A9ugofTvJPSmAWei6C-3EYgzCMuGZ03jM,381
-incident/rpc.py,sha256=y1u_op8PiWI4kUVD_DsKXmygdxRDBDxudCFGp829s3E,9056
+incident/rpc.py,sha256=7sJCrUasXMSVm6RUkna3xG15oSD_9Vbnqp8ezdPiepo,9448
 incident/templates/email/incident_change.html,sha256=tQYphypwLukkVdwH0TB2Szz2VEJ7GnsfRS3_ZJ-MYeE,13895
 incident/templates/email/incident_msg.html,sha256=MZdKhTddUF2MpiH8Z3RTQEmW_ko1n3ajeZ11KLtiLlU,13780
 incident/templates/email/incident_new.html,sha256=W6nwFQROnyDfMlXub8s02ws4hGnJp16pfgp9xTm_aEc,15185
@@ -356,7 +356,7 @@ metrics/migrations/0003_metrics_expires.py,sha256=_g4oRv4NHW-4iCQx2s1SiF38LLyFf8
 metrics/migrations/0004_eodmetrics.py,sha256=Ky6ZVMZqa0F_SUp_QFWY7ZKBgVhy9CS4wZcsEhrkSgc,3271
 metrics/migrations/0005_alter_metrics_v1_alter_metrics_v10_alter_metrics_v11_and_more.py,sha256=pmwJfpPJ1RUX_CqM66l6vvV-nrAUPo_GIan0Pc9mQHs,2358
 metrics/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-metrics/models.py,sha256=-bIEvhamfZZKweMEswBcBoZDOQhPqJHbCKyUuH6WjFc,14052
+metrics/models.py,sha256=O29Cud4VAwIAWnmQymFti0-ibOEoGmTWGxWsbtzcZHQ,14162
 metrics/periodic.py,sha256=IayBLLat40D8FB-A3bYBW9lxm9-IzcugQunojThQ_OU,661
 metrics/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metrics/providers/aws.py,sha256=dIBGFE1Fvszy6rmVrn_Fm1zUDv345q4dBsg9Iit-XCc,8358
@@ -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=0TxtckfR2izNmII4ddcJuIksqIVi3UW_LKZ9O-p_E4E,122
+rest/__init__.py,sha256=8TNkWn1IUaIq_YXkkpS9iccJHxoxu2RQlJ1uqRRibr0,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
@@ -471,7 +471,7 @@ taskqueue/transports/http.py,sha256=AzliUnw_LuyO2zZZOoUAJGFcTV-Gxt1iE3hCVnIiyGQ,
 taskqueue/transports/s3.py,sha256=fMosL893u1iQdo6Y1djwb7KEoNo6TTsDPJl13OJdJP8,1913
 taskqueue/transports/sftp.py,sha256=jT1_krjTHA7DCAukD85aGYRCg9m0cEH9EWzOC-wJGdk,1891
 taskqueue/transports/sms.py,sha256=H1-LIGEMfbUNqJD9amRcsvKUSwtz9yBj1QNfB7EHjHE,142
-taskqueue/worker.py,sha256=U_WGw3pJx9-I8loCQyfj3kyWScXOVb45g-6U9uyCH-c,15700
+taskqueue/worker.py,sha256=641Z6C9JTps0mx99JiqnnCrhkfmeqs4AE-zuJh6B6jA,15699
 telephony/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 telephony/admin.py,sha256=iOdsBfFFbBisdqKSZ36bIrh_z5sU0Wx_PkaFi8wd1iA,243
 telephony/decorators.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.166.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.166.dist-info/METADATA,sha256=UFrfXKJj92wJ-lgCMNHKLGE8dsK9hP9MKncpiq9O-jE,7663
-django_restit-4.2.166.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.166.dist-info/RECORD,,
+django_restit-4.2.172.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.172.dist-info/METADATA,sha256=iGWUZqAmN7YQzXkMWtkuODNttINTNwwqseRaOrJpbfE,7714
+django_restit-4.2.172.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+django_restit-4.2.172.dist-info/RECORD,,

{django_restit-4.2.166.dist-info → django_restit-4.2.172.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any

incident/rpc.py

@@ -7,6 +7,7 @@ from .parsers import ossec
 from taskqueue.models import Task
 from location.providers.iplookup import abuse
 import incident
+from objict import objict
 
 LOG_REST_PREFIX = settings.get("REST_PREFIX", "api/")
 if not LOG_REST_PREFIX.startswith("/"):
@@ -59,8 +60,13 @@ if settings.REPORT_PERMISSION_DENIED:
 @rd.urlPOST(r'^ossec/alert/batch$')
 def batch_ossec_alert_creat_from_request(request):
     batch = request.DATA.get("batch")
+    if isinstance(batch, str):
+        batch = objict.fromJSON(batch)
     if not isinstance(batch, list):
-        return rv.restStatus(request, False, error="invalid format")
+        rh.debug("ossec batch data", batch)
+        rh.debug("ossec data", request.DATA.asDict())
+        data_format = str(type(batch))
+        return rv.restStatus(request, False, error=f"invalid format {data_format}")
     for alert in batch:
         on_ossec_alert(request, alert)
     return rv.restStatus(request, True)  
@@ -110,7 +116,7 @@ def on_ossec_alert(request, alert):
                 metadata["province"] = od.geoip.state
                 metadata["isp"] = od.geoip.isp
 
-            am.Event.createFromDict(None, {
+            evt = am.Event.createFromDict(None, {
                 "hostname": od.hostname,
                 "description": od.title,
                 "details": od.text,
@@ -121,6 +127,9 @@ def on_ossec_alert(request, alert):
                 "reporter_ip": od.src_ip,
                 "metadata": metadata
             })
+            # fix the created datetime to be from when it was actually happening
+            evt.created = od.when
+            evt.save()
             return rv.restStatus(request, True)
     except Exception as err:
         rh.log_exception()

metrics/models.py

@@ -40,6 +40,8 @@ def metric(
             expires = datetime.now() + timedelta(days=METRICS_EXPIRE_DAILY)
         elif granularity == "weekly":
             expires = datetime.now() + timedelta(days=METRICS_EXPIRE_WEEKLY)
+        elif granularity in ["minutes", "seconds"]:
+            expires = datetime.now() + timedelta(days=7)
         m, created = Metrics.objects.get_or_create(
             uuid=key, 
             defaults=dict(
@@ -88,6 +90,7 @@ def normalize_date(date=None, timezone=None, group=None):
         date = date_util.convertToLocalTime(settings.METRICS_TIMEZONE, date)
     return date
 
+
 def get_qset(slug, granularity, start=None, end=None,
              group=-1, starts_with=False, ends_with=None):
     if start is None:

rest/__init__.py

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

taskqueue/worker.py

@@ -62,7 +62,7 @@ class WorkManager(object):
             task.failed("stale")
             return
         if task.id in self._scheduled_tasks:
-            self.logger.error("task({}) is alrleady scheduled".format(task.id))
+            self.logger.error("task({}) is already scheduled".format(task.id))
             return
         task.manager = self
         with self.lock: