django-restit 4.2.145__py3-none-any.whl → 4.2.147__py3-none-any.whl

{django_restit-4.2.145.dist-info → django_restit-4.2.147.dist-info}/METADATA

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

{django_restit-4.2.145.dist-info → django_restit-4.2.147.dist-info}/RECORD

@@ -97,7 +97,7 @@ inbox/utils/sending.py,sha256=BKelTZnbkdSLGpjOY6IRTrzj-Hnw2pPZ7RYQGwe-tqk,2179
 incident/README.md,sha256=4vbZTJj7uUmq8rogYngxqNYjFTlBOujfWUGheLoFKMc,1114
 incident/__init__.py,sha256=xgdt3z3z7ygjWv5HxhiWgBtB2W3IUJmmR88NSyUeHuo,3455
 incident/extra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-incident/extra/abuse.py,sha256=TaNs1mF7L2ijoAl5iyEX1BaUgaOwsCeeF2_zwj4RSF0,4301
+incident/extra/abuse.py,sha256=1eBJWhhzQ6EF7mkchI_QD3h0UH4Qiw_iXvsQgJdmjcg,4373
 incident/migrations/0001_initial.py,sha256=KmJRau3a2QFRaUwUrFUgY2p7FQZCODv3F-Sl0ZArpu0,9720
 incident/migrations/0002_event_component_event_component_id.py,sha256=Qfu3ndJKh4v7953ULTUZlSa3mVI-lnFIq9VFN1Rbs7Q,595
 incident/migrations/0003_rule_action.py,sha256=LNqV52qOjxxe3L8qEdln-Hd2voFcpyjOZ_cEsasrv7s,425
@@ -116,7 +116,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=FEzEKKQKLkdRrPCvv-3Um9E2UPQjyIJp314Zr2LHuiw,7976
-incident/models/incident.py,sha256=n5S-QzGvAOtJmlzbj3vPTY03avIknPjDMLUUq9FyTa0,21648
+incident/models/incident.py,sha256=Imr2fjRBjuuut8XAGrNcn3mjTLPTDO4V2KfWByHxSac,21824
 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
@@ -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=trsrty-OmytWDbV8VQRGLWtxXyAs0fe3ChtS0kcDo1s,122
+rest/__init__.py,sha256=DXC3jf0JO99XmF87usjMaANr6EwqvH5vRYN3btnK7bg,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
@@ -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.145.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.145.dist-info/METADATA,sha256=dfGvUCDbH5Nf_RJPVqtw7qe0mMQC1P28kHQvz25h56Y,7663
-django_restit-4.2.145.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.145.dist-info/RECORD,,
+django_restit-4.2.147.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.147.dist-info/METADATA,sha256=UVN5VubPWs-OWuDvx_HWVNDvVXXCg7PaG0uumf-GTuo,7663
+django_restit-4.2.147.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.147.dist-info/RECORD,,

incident/extra/abuse.py

@@ -90,7 +90,10 @@ def lookup(ip, max_days=0):
     response = requests.request(
         method='GET', url=url, headers=DEFAULT_HEADERS,
         params=params)
-    return objict.fromJSON(response.text)
+    output = objict.fromJSON(response.text)
+    if "data" in output:
+        return output.data
+    return output
 
 
 def reportAbuse(ip, comment, categories):

incident/models/incident.py

@@ -177,6 +177,8 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
         return (count % aa) == 0
 
     def triggerAction(self, force=False):
+        if self.state == INCIDENT_STATE_IGNORE:
+            return
         if self.rule is None:
             if self.action_sent is None:
                 self.triggerAsyncNotify()
@@ -496,6 +498,8 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
         info = abuse.lookup(ip, 0)
         if "errors" not in info:
             self.setProperty("abuse_info", info)
+            if info.get("abuseConfidenceScore", 0) >= 45:
+                self.state = INCIDENT_STATE_IGNORE
 
     @classmethod
     def getBundled(cls, rule, event):

rest/__init__.py

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