django-restit 4.2.166__tar.gz → 4.2.172__tar.gz

{django_restit-4.2.166 → django_restit-4.2.172}/PKG-INFO

@@ -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 → django_restit-4.2.172}/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()

{django_restit-4.2.166 → django_restit-4.2.172}/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:

{django_restit-4.2.166 → django_restit-4.2.172}/pyproject.toml

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

{django_restit-4.2.166 → django_restit-4.2.172}/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"

{django_restit-4.2.166 → django_restit-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: