django-restit 4.2.112__py3-none-any.whl → 4.2.113__py3-none-any.whl

{django_restit-4.2.112.dist-info → django_restit-4.2.113.dist-info}/METADATA

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

{django_restit-4.2.112.dist-info → django_restit-4.2.113.dist-info}/RECORD

@@ -126,7 +126,7 @@ incident/templates/email/incident_change.html,sha256=tQYphypwLukkVdwH0TB2Szz2VEJ
 incident/templates/email/incident_msg.html,sha256=MZdKhTddUF2MpiH8Z3RTQEmW_ko1n3ajeZ11KLtiLlU,13780
 incident/templates/email/incident_new.html,sha256=W6nwFQROnyDfMlXub8s02ws4hGnJp16pfgp9xTm_aEc,15185
 incident/templates/email/incident_plain.html,sha256=AyTv_3ITUwHoAO7Tv_xCODzWQXTV61EdtlphFum0BnM,14739
-incident/tq.py,sha256=6KjeTFlWAlG_l8LWMlxUGdr8ULU0uE-DB5ex0ERW440,5226
+incident/tq.py,sha256=BO8OjH5UzLB97vOatMmsuMDeQ1ZYhXWENoomoVJ9QlY,5235
 location/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 location/admin.py,sha256=6S97Rlgjkk0jM15sbT1OJRPZbgvKn2rn7duCSazOXq4,297
 location/geolocate.py,sha256=UgV129vmSxnqYFBYJD2RQVOcC1-lJJ1zUaxDqOJRbG4,1694
@@ -333,7 +333,7 @@ medialib/youtube/upload.py,sha256=MTuPxm1ZC-y5pXAGtLNtp1hBSNZgCKYt1ewP5hwMQHI,28
 medialib/youtube/uritemplate/__init__.py,sha256=ONWR_KRz9au0O-XUUTrO_UN7GHTmZCTKyvflUQb8wxM,4996
 metrics/README.md,sha256=YwbCA2y6xJBlaO6yEtl1zWpqrQ4ZzkQSuQT-h6btET8,2307
 metrics/__init__.py,sha256=70sdDZGOwGIEFWgDkHWPMVODFelo206jp1g-BFV2u_4,90
-metrics/client.py,sha256=-cbOdOIJoE8Q5DH_sMv-Ia_tD7w15SXt3pBnNUGPNPo,25251
+metrics/client.py,sha256=WXyyl4C4CUZECJHWrY154uTPMEoJTZoYocVK582i4co,25322
 metrics/eod.py,sha256=gnq-tNE7xfm2ah52e2TUyERgUQNwkFuT2rtDv8XOUVQ,9182
 metrics/examples/eod_example.py,sha256=gYtansjsKILVxe8XJD12XPaxmBJ-B6dOXGZG2JTGWA8,1664
 metrics/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -352,10 +352,10 @@ metrics/migrations/0004_eodmetrics.py,sha256=Ky6ZVMZqa0F_SUp_QFWY7ZKBgVhy9CS4wZc
 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=lD9nVzfwdav70ENulqJ8rE8Ui8EWlzdVp05rg8bAlMA,13444
-metrics/periodic.py,sha256=VmL0YG05D6k5fcNsF4QqPEU-BBPbZXjbOrp3b8EHZ-U,651
+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
-metrics/rpc.py,sha256=LXZcYBtssSFmcaoIjaJ32S6Nv_mswDALtmUYm5ByDMQ,21667
+metrics/rpc.py,sha256=gnyRFBW2KBA-TAiqVcwkoVviX4bPbZ2WZELlR9uEUlM,22213
 metrics/settings.py,sha256=wwHA9Z7BAHNeu3tFVn8Fh5j46KR-eGx0E8r5dzCFlAU,132
 metrics/tq.py,sha256=WHBRYSinmTuxF9l-_-lx0yfzEYkb0ffVMt_uvCj9bYo,825
 metrics/utils.py,sha256=PSydxeI983udULUTcbeWG-_ulPSOac6Q_t_8k_Vjn1I,12606
@@ -374,7 +374,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=m3kqpu3YhcghJ-KrIUqDNZLIi6TS2MsL0ixv0h0LuPE,122
+rest/__init__.py,sha256=i3s__yG9Z22yx1bmRS4KcS9xtQl2dT7xDnCCeUYFhos,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
@@ -407,13 +407,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=-NUKed_67o3eCZCknndQixSHU4pR-Lm2wxsb_h4rjVQ,70652
+rest/models/base.py,sha256=6mqDcuVVFm610V5RLO8yfr0vY-I4sBN_QW69OkejsJQ,70655
 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=wCR22Ds4CgZ9q-ptWuIpc15J01tTRPpAYWEkAA9LDHM,2205
+rest/rpc.py,sha256=xun-HuaEqm1Lwg-9Xm4Y2JwOf8wTdpoagHuIUNlqTlI,2891
 rest/search.py,sha256=QVjk2b5tZLgf1zM2MHvJTyRjwUbY5ZD7HXSTmSPXtvU,8362
 rest/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rest/serializers/collection.py,sha256=V9O4qxw26VX9dSYdbsN0-RNnXEi347Ln8eFLZ003LhA,4646
@@ -457,7 +457,7 @@ taskqueue/admin.py,sha256=E6zXoToS_ea3MdoGjZzF1JiepWFtDSoZUQdan8H-pXI,208
 taskqueue/migrations/0001_initial.py,sha256=JwYib8CK5ftSXlfxKZUcKEEVsXktNB5q3h-2tu9inGk,4738
 taskqueue/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskqueue/models.py,sha256=i8v0vQqlz4X3rVFVJsUSldA-26NEPWnsMZF2Kly_1Qo,22398
-taskqueue/periodic.py,sha256=FMXEmAdTQwgBIlwwuFV-VfxMl8OKXYzHp9jJt57Qghk,3838
+taskqueue/periodic.py,sha256=hpXnunJL_cuVQLAKpjTbABbsQ4fvdsV9_gyyK-_53Sk,3844
 taskqueue/rpc.py,sha256=Lf5VUoqCRkfWUAIvx_s508mjAtDPwpiWyxg0ryqWbQA,5793
 taskqueue/tq.py,sha256=PzSoDrawYcqZylruEgsK95gcJ4J_VhdM6rxg9V6_X8E,942
 taskqueue/transports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -498,7 +498,7 @@ wiki/rpc/wiki.py,sha256=RQY1gtqxdNhp13n3SkZL9WZ6RatrtCIh7QOYta6-UUU,1327
 wiki/tq.py,sha256=wvuBZ3OMV_D2o4kpJhVLIOwpEUfwlglqLJQvpncAwtk,313
 ws4redis/README.md,sha256=QvwdsauPKxx4qQqnJ991xeU8DgFQCj3CeQt-nCE4s-w,3624
 ws4redis/__init__.py,sha256=teNfv83A_ke1CBt9BB7NsnWCcFBhnUFPsPESjF554_k,46
-ws4redis/client.py,sha256=iuwygfy32rsSS8f1fWtgOgprWBa42LKbRpUTIXwKfGM,7013
+ws4redis/client.py,sha256=kElPtVMVObLUXAfu32v_PHd0HyygrW-ukk37_Tuo7ZM,7062
 ws4redis/connection.py,sha256=QGjzalYrx1y4o6sb6P1akL-Y2fjf2qil0JCo-ona5F8,13431
 ws4redis/exceptions.py,sha256=EGLoRTdqJVwz900pwhciqPuSjBBd08hhLgFu6umHrI4,636
 ws4redis/redis.py,sha256=IfT4p3bUtlqso9rryNliH9Ebzlx8-Q2VJcs1kFioeGA,6093
@@ -509,7 +509,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.112.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.112.dist-info/METADATA,sha256=sb1cEMGTn30fqgEPa6eq2gPuta4N5nSVKh3WzcG5fec,7663
-django_restit-4.2.112.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.112.dist-info/RECORD,,
+django_restit-4.2.113.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.113.dist-info/METADATA,sha256=GpwHy5Fu9GlB1SztkmqX22MGSuVoAOVvfN3Iv9zgGCQ,7663
+django_restit-4.2.113.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.113.dist-info/RECORD,,

incident/tq.py

@@ -118,16 +118,16 @@ def on_incoming_email(task):
 def run_cleanup(task):
     stale = datetime.now() - timedelta(days=90)
     # delete all ossec alerts older then 90 days
-    count = ia.ServerOssecAlert.objects.filter(created__lte=stale).delete()
+    count = ia.ServerOssecAlert.objects.filter(created__lte=stale).delete()[0]
     if count:
         task.log(f"deleted {count} old ServerOssecAlert")
     # delete all events older then 90 days
     count = ia.Event.objects.filter(created__lte=stale).filter(
-        Q(incident__state=ia.INCIDENT_STATE_IGNORE) | Q(incident__isnull=True)).delete()
+        Q(incident__state=ia.INCIDENT_STATE_IGNORE) | Q(incident__isnull=True)).delete()[0]
     if count:
         task.log(f"deleted {count} old Events")
     
-    count = ia.Incident.objects.filter(created__lte=stale).filter(state=ia.INCIDENT_STATE_IGNORE).delete()
+    count = ia.Incident.objects.filter(created__lte=stale).filter(state=ia.INCIDENT_STATE_IGNORE).delete()[0]
     if count:
         task.log(f"deleted {count} old Incidents")
 

metrics/client.py

@@ -329,8 +329,12 @@ class R(object):
             for s in slug:
                 self.metric(s, num, category, expire, date)
             return
+        
         # Add the slug to the set of metric slugs
-        self.r.sadd(self._metric_slugs_key, slug)
+        try:
+            self.r.sadd(self._metric_slugs_key, slug)
+        except Exception:
+            return
 
         if category:
             self._categorize(slug, category)

metrics/periodic.py

@@ -1,13 +1,13 @@
 from datetime import datetime, timedelta
 from taskqueue.models import Task
-from .models import Metrics
+from metrics.models import Metrics
 from rest import log
 from rest import decorators as rd
 
 
 @rd.periodic(minute=15, hour=10)
 def run_cleanup(force=False, verbose=False, now=None):
-    count = Metrics.objects.filter(expires__lte=datetime.now()).delete()
+    count = Metrics.objects.filter(expires__lte=datetime.now()).delete()[0]
     if count > 0:
         logger = log.getLogger("auditlog", filename="auditlog.log")
         logger.info(f"METRICS.CLEANUP {count} expired records deleted")

metrics/rpc.py

@@ -301,32 +301,44 @@ def rest_on_ec2_domains(request):
 @rd.urlGET('restit/servers')
 @rd.login_required
 def rest_on_ec2_restit_stats(request):
-    hostname = settings.SERVER_ROOT
-    if hostname is None:
-        hostname = settings.SERVER_NAME
+    from concurrent.futures import ThreadPoolExecutor, as_completed
+    hostname = settings.SERVER_ROOT or settings.SERVER_NAME
     if hostname.count(".") == 2:
-        hostname = hostname[hostname.find(".")]
+        hostname = hostname.split(".")[1]  # Corrected to get the second part
+
     instances = aws.getAllEC2()
     hosts = [inst.name for inst in instances]
-    data = []
-    for name in hosts:
+    path = "versions"
+    params = {"detailed": 1}
+    if request.DATA.get("sysinfo"):
+        path = "system/info"
+        params["key"] = settings.SYS_INFO_KEY
+
+    def fetch_host_data(name):
         if settings.SERVER_NAME_MAP and name in settings.SERVER_NAME_MAP:
             host = settings.SERVER_NAME_MAP[name]
             if "." not in host:
                 host = f"{name}.{hostname}"
         else:
             host = f"{name}.{hostname}"
-        resp = net.REQUEST(
-            "GET", host, 
-            f"/{REST_PREFIX}versions", 
-            params=dict(detailed=1),
-            timeout=5.0)
-        if resp.status:
-            resp.data.id = host
-            resp.data.hostname = host
-            data.append(resp.data)
-        else:
-            data.append(dict(id=host, hostname=host))
+
+        try:
+            resp = net.REQUEST("GET", host, f"/{REST_PREFIX}{path}", params=params, timeout=5.0)
+            if resp.status:
+                resp.data.id = host
+                resp.data.hostname = host
+                return resp.data
+            else:
+                return dict(id=host, hostname=host)
+        except requests.RequestException:
+            return dict(id=host, hostname=host)
+
+    data = []
+    with ThreadPoolExecutor(max_workers=10) as executor:  # Adjust max_workers as needed
+        futures = {executor.submit(fetch_host_data, name): name for name in hosts}
+        for future in as_completed(futures):
+            data.append(future.result())
+
     return rv.restReturn(request, dict(data=data))
 
 

rest/__init__.py

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

rest/models/base.py

@@ -1197,7 +1197,7 @@ class RestModel(object):
             can_delete = getattr(cls.RestMeta, "CAN_DELETE", False)
             if not can_delete:
                 raise re.PermissionDeniedException(f"deletion not allowed for {cls.get_class_name()}", 438)
-            count = qset.delete()
+            count = qset.delete()[0]
             return GRAPH_HELPERS.restStatus(request, True, error="delete {} items".format(count))
         elif action == "update":
             update_fields = request.DATA.get(["batch_data", "batch_update"])

rest/rpc.py

@@ -10,6 +10,8 @@ from django.conf import settings
 
 from .decorators import url
 from rest.extra import hostinfo
+from ws4redis import client as redis
+from django.db import connections
 
 
 URL_PREFIX = ""
@@ -49,6 +51,27 @@ def on_get_joke(request):
     return views.restGet(request, {"joke": joke.getRandomJoke()})
 
 
+@url('status')
+def on_get_status(request):
+    flag = True
+    try:
+        flag = redis.ping()
+    except Exception:
+        flag = False
+    status = dict(redis=flag, database={})
+    for alias in settings.DATABASES.keys():
+        db_conn = connections[alias]
+        try:
+            # Ensure connection with a timeout
+            db_conn.ensure_connection()
+            status["database"][alias] = True
+        except Exception:
+            flag = False
+            status["database"][alias] = False
+    if flag:
+        return views.restGet(request, status)
+    return views.restResult(request, status, 417)
+
 @url('system/info')
 def on_get_system_info(request):
     key = request.DATA.get("key")

taskqueue/periodic.py

@@ -95,11 +95,11 @@ def run_cleanup(force=False, verbose=False, now=None):
     if not settings.TQ_MASTER:
         return
     stale = datetime.now() - timedelta(days=TQ_DELETE_AFTER)
-    count = Task.objects.filter(created__lte=stale).delete()
+    count = Task.objects.filter(created__lte=stale).delete()[0]
     if count:
         logger.info("deleted {} old tasks".format(count))
     stale = datetime.now() - timedelta(days=TQ_DELETE_COMPLETED_AFTER)
-    count = Task.objects.filter(created__lte=stale, state=TASK_STATE_COMPLETED).delete()
+    count = Task.objects.filter(created__lte=stale, state=TASK_STATE_COMPLETED).delete()[0]
     if count:
         logger.info("deleted {} old completed tasks".format(count))
 

ws4redis/client.py

@@ -21,6 +21,10 @@ def buildEventMessage(name=None, message=None, priority=0, model=None, model_pk=
     return msg.toJSON(as_string=True)
 
 
+def ping():
+    return getRedisClient().ping()
+
+
 def exists(key, default=None):
     c = getRedisClient()
     return c.exists(key)