django-restit 4.2.156__tar.gz → 4.2.157__tar.gz

{django_restit-4.2.156 → django_restit-4.2.157}/PKG-INFO

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

{django_restit-4.2.156 → django_restit-4.2.157}/incident/models/incident.py

@@ -10,7 +10,7 @@ from datetime import datetime, timedelta
 from rest import log
 from ws4redis import client as ws4redis
 import time
-from incident.extra import abuse
+from location.providers.iplookup import abuse
 
 logger = log.getLogger("incident", filename="incident.log")
 
@@ -516,6 +516,8 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
             q.reporter_ip = event.reporter_ip
         if rule.bundle_by in [6, 7, 8]:
             q.category = event.category
+        if rule.bundle_by in [9] and event.group is not None:
+            q.group__pk = event.group.pk
         return Incident.objects.filter(**q).last()
 
     @classmethod

{django_restit-4.2.156 → django_restit-4.2.157}/incident/rpc.py

@@ -2,10 +2,10 @@ from rest import decorators as rd
 from rest import views as rv
 from rest import helpers as rh
 from rest import settings
-from . import models as am
-from .extra import abuse 
+from . import models as am 
 from .parsers import ossec
 from taskqueue.models import Task
+from location.providers.iplookup import abuse
 import incident
 
 LOG_REST_PREFIX = settings.get("REST_PREFIX", "api/")

{django_restit-4.2.156 → django_restit-4.2.157}/pyproject.toml

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

{django_restit-4.2.156 → django_restit-4.2.157}/rest/__init__.py

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