django-restit 4.2.146__py3-none-any.whl → 4.2.149__py3-none-any.whl

{django_restit-4.2.146.dist-info → django_restit-4.2.149.dist-info}/METADATA

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

{django_restit-4.2.146.dist-info → django_restit-4.2.149.dist-info}/RECORD

@@ -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
@@ -163,7 +163,7 @@ location/rpc/location.py,sha256=D5R54nnmmp8NaHQRkP_TF921Ej6j9nmTUNzX1K5WVPc,779
 location/rpc/track.py,sha256=jSS9_eiKayM_8iW_4Ldojg9a2_trjfXhnLe_a261x5E,3735
 medialib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 medialib/admin.py,sha256=befSpVP7TpyWGsh47E1CiFMUSwNYT7bxMgzgyDK07yI,2261
-medialib/caching.py,sha256=K5dE8fpsC2mpFB5WLJQKx9OtjuhvYeTtQM5vBA5IBEE,2292
+medialib/caching.py,sha256=Hhkj8OsR6sLJ1RSWtQKsIHru2yYQpk-UBYK5IUWD-Jk,2776
 medialib/cvutil/__init__.py,sha256=ADxS2MfnLqzd7NI2QgWeQSNcgJCNBP2Wgy3hBZV9w4s,27
 medialib/cvutil/contours.py,sha256=B6_PGOIg_ORX9i3K8PE35H_c2H0LejLSRE1sQMxPaIc,4269
 medialib/cvutil/images.py,sha256=9qQDd1rE3HJZ0MBn2v39snBXatI9fLqYPQXgdCuaQs0,12649
@@ -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=gEiT7xUmFhIFR7GF1myvLnmeN2xsHMj0l8HsLYSfOPc,122
+rest/__init__.py,sha256=IGwy7wAnz9fNfCpR9r084LhwaUVkfoBheP4EmdLwutw,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
@@ -412,13 +412,13 @@ rest/middleware/request.py,sha256=JchRNy5L-bGd-7h-KFYekGRvREe2eCkZXKOYqIkP2hI,41
 rest/middleware/session.py,sha256=zHSoQpIzRLmpqr_JvW406wzpvU3W3gDbm5JhtzLAMlE,10240
 rest/middleware/session_store.py,sha256=1nSdeXK8PyuYgGgIufqrS6j6QpIrQ7zbMNT0ol75e6U,1901
 rest/models/__init__.py,sha256=M8pvFDq-WCF-QcM58X7pMufYYe0aaQ3U0PwGe9TKbbY,130
-rest/models/base.py,sha256=NTw7IHJu4wpJ3CwIDbYZnoDe8mbJ5B6quocAmyzzJ2c,71787
+rest/models/base.py,sha256=RnL6-8N7tghGDcOtWIRwlTWrllgwW6EMoeyi8I-bm4I,71856
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
 rest/models/metadata.py,sha256=1nQ7CYo9bJHoaXE_hVNaj1-Y7yqhHlf2ZlaD1IfTzic,12904
 rest/net.py,sha256=LcB2QV6VNRtsSdmiQvYZgwQUDwOPMn_VBdRiZ6OpI-I,2974
 rest/regexes.yaml,sha256=VoGb4E-P_K9f82Yzcpltgzekpt9usRtwu9PYlo46nUw,149463
 rest/requestex.py,sha256=N56056vV3zWkAP-QrYsCu7SdpPzE5kLuPoxGIuZAKt0,16127
-rest/rpc.py,sha256=CNQ2RtAPOYxZtpZxjh0sVzBmIGBYMP7n3CDEDwMENF0,2966
+rest/rpc.py,sha256=WXZe5CLdYMeSXRH6wuzl-_riPPRnmtFNVJB9dfY1GSo,2965
 rest/search.py,sha256=QVjk2b5tZLgf1zM2MHvJTyRjwUbY5ZD7HXSTmSPXtvU,8362
 rest/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rest/serializers/collection.py,sha256=V9O4qxw26VX9dSYdbsN0-RNnXEi347Ln8eFLZ003LhA,4646
@@ -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.146.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.146.dist-info/METADATA,sha256=UbdKn4LJWNrB_cn5SqjrkgEsMxk-Y7_E5UlNtM5JCZ0,7663
-django_restit-4.2.146.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.146.dist-info/RECORD,,
+django_restit-4.2.149.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.149.dist-info/METADATA,sha256=WxOpTRbK6J9rpGFisYpUws6eGzekulQ8xIFODOuRxcw,7663
+django_restit-4.2.149.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.149.dist-info/RECORD,,

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):

medialib/caching.py

@@ -1,3 +1,4 @@
+import io
 from rest import settings
 from medialib.stores import s3
 from django.http import HttpResponse, StreamingHttpResponse
@@ -45,7 +46,18 @@ def getCachedItem(cache_guid, content_type="application/json"):
 def cacheResponse(response, cache_guid, content_type="application/json"):
     url = f"s3://{settings.AWS_S3_BUCKET}/caching/{cache_guid}"
     item = s3.S3Item(url, content_type)
-    item.upload(response.content)
+    if isinstance(response, StreamingHttpResponse):
+        # Access the streaming content and convert it to a file-like object
+        content = io.BytesIO()
+        for chunk in response.streaming_content:
+            content.write(chunk)
+        # Reset the file pointer to the beginning before uploading
+        content.seek(0)
+        item.upload(content)
+        content.seek(0)
+        response.streaming_content = iter(lambda: content.read(8192), b'')
+    else:
+        item.upload(response.content)
     return item
 
 

rest/__init__.py

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

rest/models/base.py

@@ -1028,6 +1028,7 @@ class RestModel(object):
         if tr_start is not None:
             dr_start = rh.updateTimeFromString(dr_start, tr_start)
         if tr_end is not None:
+            dr_end = request.DATA.get("dr_end", field_type=datetime)
             dr_end = rh.updateTimeFromString(dr_end, tr_end)
 
         if dr_tz is not None:

rest/rpc.py

@@ -81,7 +81,7 @@ def on_get_system_info(request):
     out = hostinfo.getHostInfo(
         include_versions=request.DATA.get("versions") and SOFTWARE_VERSIONS,
         include_blocked=request.DATA.get("blocked"))
-    out["redist_pool"] = redis.getPoolStatus()
+    out["redis_pool"] = redis.getPoolStatus()
     return views.restGet(request, out)