django-restit 4.2.9__py3-none-any.whl → 4.2.11__py3-none-any.whl

account/models/member.py

@@ -468,7 +468,7 @@ class Member(User, RestModel, MetaDataModel):
     def disable(self, by="system", reason="", notify=True):
         self.is_active = False
         self.save()
-        self.memberships.update(state=-100)
+        self.memberships.update(state=-25)
 
         [s.delete() for s in Session.objects.all() if s.get_decoded().get('_auth_user_id') == self.pk]
         # notify account disabled

auditlog/rpc.py

@@ -57,72 +57,3 @@ def plogList(request):
         qset = qset.filter(message__icontains=term)
     
     return rv.restList(request, qset.order_by('-when'), **auditlog.PersistentLog.getGraph(graph))
-
-
-@rd.urlGET (r'^list$')
-def auditList(request):
-    """
-    | Parameter: model=<string> (default=all)
-    | Parameter: id=<int> (default=all)
-    | Parameter: attributes=<string> (default=all)
-    | Parameter: user=<id|username> (default=all)
-    |
-    | Return: audit log entries
-    """
-    ret = auditlog.AuditLog.objects.all()
-    
-    model = request.DATA.get('model')
-    if model:
-        ret = ret.filter(model=model)
-
-    id = request.DATA.get('id')
-    if id:
-        ret = ret.filter(pkey=int(id))
-
-    attributes = request.DATA.get('attributes')
-    if attributes:
-        attributes = attributes.split(',')
-        print(attributes)
-        ret = ret.filter(attribute__in=attributes)
-
-    user = request.DATA.get('user')
-    if user:
-        ret = ret.filter(user=user)
-
-    return rv.restList(
-        request, ret, sort='-when',
-        fields=(
-            'when',
-            'model',
-            'pkey',
-            'attribute',
-            'user.id',
-            'user.username',
-            'reference',
-            'how',
-            'referer',
-            'stack',
-            'oldval',
-            'newval',
-        ), recurse_into=(
-            'user',
-        ), require_perms=(
-            'auditlog.can_read',
-        ),
-    )
-
-
-@rd.url(r'^nuke$')
-@rd.perm_required("nuke_logs")
-def nuke_log_data(request):
-    # nuclear option used for testing system to clear out all wallet data
-    # make sure this is enabled for this setup
-    confirm_nuke = request.DATA.get("nuke_code", None)
-    if confirm_nuke != "launch" or not getattr(auditlog.settings, "CAN_NUKE_DATABASE", False):
-        return rv.restPermissionDenied(request)
-
-    # first nuke all transactions
-    auditlog.PersistentLog.objects.all().delete()
-    auditlog.AuditLog.objects.all().delete()
-    auditlog.SessionLog.objects.all().delete()
-    return rv.restStatus(request, True)

{django_restit-4.2.9.dist-info → django_restit-4.2.11.dist-info}/METADATA

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

{django_restit-4.2.9.dist-info → django_restit-4.2.11.dist-info}/RECORD

@@ -23,7 +23,7 @@ account/models/device.py,sha256=XipNpByreGubB5-d4ZBOoIV5Xw14b2Btcgn6fXz8HAc,4105
 account/models/feeds.py,sha256=4n4Mv8HjcXpUmMPWafHlsGbVQ1fDKdtblL1hp30sDrg,1437
 account/models/group.py,sha256=jj4csGHDyDRMS_maL8AeV1k3whSxBdeffHxmnXrn-sg,20064
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
-account/models/member.py,sha256=_Nbm6U89WfCruGZ1pyt7_Uca7I6nj1ycjiBHpkfXrgM,49327
+account/models/member.py,sha256=QZ64pwPzk0Z10XHVgFgHuJfxSrguxJabce1bSpJbCho,49326
 account/models/membership.py,sha256=Qmp0xQa_3ObB581L83gce69t9eSfyH-mZZuGqW3ueI8,7763
 account/models/notify.py,sha256=YnZujSHJHY7B09e6FIyZIEJRWLPYk1Sk1e92tFzB1IA,12078
 account/models/session.py,sha256=swhxcx_lWzOpGCmfifXoACgWYqmKmS7eZsD9s9jSToc,3509
@@ -57,7 +57,7 @@ auditlog/migrations/0001_initial.py,sha256=X171gKQZIaTO9FGNG1yKTjGSZS0ZjZj5gvimF
 auditlog/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auditlog/models.py,sha256=6CyWMRNvqCYoyiXE9_qk41EJFjutwo6nfoP9KKYWiYw,16294
 auditlog/periodic.py,sha256=AUhDeVsZtC47BJ-lklvYEegHoxAzj1RpIvRFSsM7g5E,363
-auditlog/rpc.py,sha256=w01zcOiqmqM0953Muq9I4OY7o0CyKmwDEQTV4LfsASs,3591
+auditlog/rpc.py,sha256=lhme-ScqwVSKfHo3RlzMVm_C-Yx4xOxPogBEv7b3w1M,1720
 auditlog/tq.py,sha256=OgzJVspWI6FL92GEhDPtabYoP_Hd3zGNh0E297abz3Y,2415
 auditlog/urls.py,sha256=GNqpN74EpYlMND2UFUdPt5rOkTYYrdbTV0W3fg4zLfQ,163
 inbox/README.md,sha256=jsklDrzD5d94r7cwgaU6Gi1HCjBDfWq7jd92qB0JYPU,2169
@@ -97,18 +97,18 @@ incident/migrations/0013_rulecheck_is_required.py,sha256=cL7tOj5XGPpKd2f5BojIKfN
 incident/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/models/__init__.py,sha256=NMphuhb0RTMf7Ov4QkNv7iv6_I8Wtr3xQ54yjX_a31M,209
 incident/models/event.py,sha256=Nzy21glVc7V8Z6YziTt3SeQB3xCEKWuVaF01ufjB6xk,6849
-incident/models/incident.py,sha256=TymsO4TgOrvgQXTNqrFgWIOqqXqdk4nrosvlpTB_9nk,15294
+incident/models/incident.py,sha256=S3Z6PO-kYcpjBW3s_pGVEA14FOFc1Jrs5L3GRjiC0DA,15686
 incident/models/ossec.py,sha256=p1ptr-8lnaj1EP_VmPR58b2LmaYBGaYYKAMqhWK5yZM,2227
 incident/models/rules.py,sha256=DR7IW18Nxp_cEl3mN0E8jiTdL9eUmY_38Uag8OS7YOU,6024
 incident/models/ticket.py,sha256=S3kqGQpYLE6Y4M9IKu_60sgW-f592xNr8uufqHnvDoU,2302
 incident/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/parsers/ossec.py,sha256=XbiOmZ2CeRejABDeSUYBlK3iSwV68N7MQHkSk4ZwMGw,6247
-incident/periodic.py,sha256=K5ICRdXrRyR2rwf3IlBdByJlFw-pk80kKkXQCnx59Y0,227
+incident/periodic.py,sha256=eX1rQK6v65A9ugofTvJPSmAWei6C-3EYgzCMuGZ03jM,381
 incident/rpc.py,sha256=MoEEPRwayjkS4TNn4jVRicjJAMmGuNCZ9BoZhHbW65g,7546
 incident/templates/email/incident_change.html,sha256=O_5ocWTsnqmmOuQhAtXEiE4rWecnZnJjoKU4MwV6ILo,14178
 incident/templates/email/incident_new.html,sha256=IPX3CqIrvdrZSn13_jlR6sEb0If8ftvUrUpkzC5G2Gc,15173
 incident/templates/email/incident_plain.html,sha256=fx4zsoldG1AQEBA6IYx5BJp_MAMizgjjx9EmuR5m4SQ,14727
-incident/tq.py,sha256=2rybn_JV_3IeX8LOVV3Vi2YrxONCd5MuoQ-pGzmgLPE,4589
+incident/tq.py,sha256=Wzzsuyj6LLgeY9Sd71TAdz1vov-NHtU2TCES0eY_A3c,5029
 location/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 location/admin.py,sha256=6S97Rlgjkk0jM15sbT1OJRPZbgvKn2rn7duCSazOXq4,297
 location/geolocate.py,sha256=UgV129vmSxnqYFBYJD2RQVOcC1-lJJ1zUaxDqOJRbG4,1694
@@ -353,7 +353,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=DsyV_w31nO8KqDhfUDguj4tt6YC9_3dMGiAeGLZWoDs,120
+rest/__init__.py,sha256=nv6oOALCMbitZIAgHoohQVuEIESvc6Izm4HxqbY69rc,121
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -413,7 +413,7 @@ rest/static/rest/rest.scss,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rest/templates/email/error.html,sha256=JDtB0egYLHDZS6KCNFslgB4ZiaidfPdjkTXaHiyVbDY,529
 rest/templates/email/error.subject,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rest/templates/rest_docs.html,sha256=lr5p3ic0uCRli9KEvoULTa5a3_54wNE5yL16kN1uau8,7148
-rest/templates/rest_html.html,sha256=nqID5IlhF8R4UpV_h82Sd-mR5wRQpZPher-el5bEubs,10986
+rest/templates/rest_html.html,sha256=utOzvXEE6LiHFUvcAQUDOQ0yl3J_2F3-22r0K611eTQ,11048
 rest/ua.py,sha256=0wwOtJPWCiCxUKzWKyMApRbSaiuAxCCk0Pe3OwzYBhE,185398
 rest/uberdict.py,sha256=ivDpzfchQqX8dM2_TtuyMW7NNO-j7zDmxkdKixQxvU4,17064
 rest/url_docs.py,sha256=O8O_CQso3fB-7o-huidIT1BRGv5R6lDW-yKHnsGyAPk,11881
@@ -485,7 +485,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.9.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.9.dist-info/METADATA,sha256=HEk9Et5Um9d7v-o5ljCouhqmL4aNBkdUCrKlMU1d6rU,7572
-django_restit-4.2.9.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.2.9.dist-info/RECORD,,
+django_restit-4.2.11.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.11.dist-info/METADATA,sha256=wcPSgtYyuZ3H10nYpwHd2yTIp2N5Rvat6q-KkEqD84g,7573
+django_restit-4.2.11.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.2.11.dist-info/RECORD,,

incident/models/incident.py

@@ -74,6 +74,18 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
     def first_event(self):
         return self.events.first()
 
+    @property
+    def action_triggered(self):
+        if self.rule is None or self.rule.action_after == 0:
+            return True
+        return self.events.all().count() >= abs(self.rule.action_after)
+
+    @property
+    def bundle_expired(self):
+        if self.rule is not None:
+            return self.created < (datetime.now() - timedelta(minutes=self.rule.bundle))
+        return True
+
     def set_action(self, value):
         if value == "merge":
             request = self.getActiveRequest()

incident/periodic.py

@@ -5,3 +5,8 @@ from taskqueue.models import Task
 @periodic(minute=50, hour=8)
 def run_cleanup(force=False, verbose=False, now=None):
     Task.Publish("incident", "run_cleanup", channel="tq_app_handler")
+
+
+@periodic(minute=30)
+def run_auto_close(force=False, verbose=False, now=None):
+    Task.Publish("incident", "run_auto_close", channel="tq_app_handler")

incident/tq.py

@@ -123,7 +123,7 @@ def run_cleanup(task):
         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()
     if count:
         task.log(f"deleted {count} old Events")
 
@@ -131,3 +131,14 @@ def run_cleanup(task):
     if count:
         task.log(f"deleted {count} duplicate IPs")
 
+
+def run_auto_close(task):
+    # lets check any incidents that haven't reached action threshold and older then bundle time
+    qset = ia.Incident.objects.filter(state=ia.INCIDENT_STATE_NEW, rule__action_after__gt=0)
+    for inc in qset:
+        if inc.bundle_expired and not inc.action_triggered:
+            inc.state = ia.INCIDENT_STATE_IGNORE
+            inc.save()
+            inc.logHistory("history", "auto ignore", notify=False)
+
+

rest/__init__.py

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

rest/templates/rest_html.html

@@ -59,6 +59,8 @@
 		font-size: 18px;
 		height: 100%;
 		background: #333333;
+		background: linear-gradient(90deg, rgba(2,0,36,1) 0%, rgba(50,43,56,1) 35%, rgba(56,54,85,1) 100%);
+
 	}
 
 	footer {
@@ -251,7 +253,6 @@
 		    <div class="path">
 		        {{path}}
 		    </div>
-		    <h4 class='subtitle'>request:</h4>
 		    <div class="request">
 		        <pre>{{req_out}}</pre>
 		    </div>