django-restit 4.2.9__tar.gz → 4.2.11__tar.gz

{django_restit-4.2.9 → django_restit-4.2.11}/PKG-INFO

@@ -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 → django_restit-4.2.11}/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

django_restit-4.2.11/auditlog/rpc.py

@@ -0,0 +1,59 @@
+from . import models as auditlog
+
+from rest import views as rv
+from rest import decorators as rd
+
+
+@rd.url(r'^plog$')
+@rd.url(r'^plog/(?P<plog_id>\d+)$')
+@rd.perm_required('view_logs')
+def plog_handler(request, plog_id=None):
+    if not plog_id:
+        min_pk = getattr(auditlog.settings, "PLOG_STALE_ID", 0)
+        return auditlog.PersistentLog.on_rest_list(request, qset=auditlog.PersistentLog.objects.filter(pk__gte=min_pk))
+    return auditlog.PersistentLog.on_rest_request(request, plog_id)
+
+
+@rd.urlGET(r'^plog_old$')
+@rd.perm_required('view_logs')
+def plogList(request):
+    auditlog.PersistentLog.on_request_handle()
+
+    graph = request.DATA.get("graph", "default")
+    qset = auditlog.PersistentLog.objects.all()
+    if request.group:
+        qset = qset.filter(group=request.group)
+
+    ip = request.DATA.get("ip")
+    if ip:
+        qset = qset.filter(session__ip=ip)
+
+    path = request.DATA.get("path")
+    if path:
+        qset = qset.filter(remote_path__icontains=path)
+    
+    method = request.DATA.get("method")
+    if method:
+        qset = qset.filter(method=method)
+
+    action = request.DATA.get("action")
+    if action:
+        qset = qset.filter(action=action)
+    
+    component = request.DATA.get("component")
+    if component:
+        qset = qset.filter(component=component)
+    
+    pkey = request.DATA.get("pkey")
+    if pkey:
+        qset = qset.filter(pkey=pkey)
+
+    username = request.DATA.get("username")
+    if username:
+        qset = qset.filter(user__username=username)
+    
+    term = request.DATA.get("term")
+    if term:
+        qset = qset.filter(message__icontains=term)
+    
+    return rv.restList(request, qset.order_by('-when'), **auditlog.PersistentLog.getGraph(graph))

{django_restit-4.2.9 → django_restit-4.2.11}/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()

{django_restit-4.2.9 → django_restit-4.2.11}/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")

{django_restit-4.2.9 → django_restit-4.2.11}/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)
+
+

{django_restit-4.2.9 → django_restit-4.2.11}/pyproject.toml

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

{django_restit-4.2.9 → django_restit-4.2.11}/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"

{django_restit-4.2.9 → django_restit-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>

django_restit-4.2.9/auditlog/rpc.py

@@ -1,128 +0,0 @@
-from . import models as auditlog
-
-from rest import views as rv
-from rest import decorators as rd
-
-
-@rd.url(r'^plog$')
-@rd.url(r'^plog/(?P<plog_id>\d+)$')
-@rd.perm_required('view_logs')
-def plog_handler(request, plog_id=None):
-    if not plog_id:
-        min_pk = getattr(auditlog.settings, "PLOG_STALE_ID", 0)
-        return auditlog.PersistentLog.on_rest_list(request, qset=auditlog.PersistentLog.objects.filter(pk__gte=min_pk))
-    return auditlog.PersistentLog.on_rest_request(request, plog_id)
-
-
-@rd.urlGET(r'^plog_old$')
-@rd.perm_required('view_logs')
-def plogList(request):
-    auditlog.PersistentLog.on_request_handle()
-
-    graph = request.DATA.get("graph", "default")
-    qset = auditlog.PersistentLog.objects.all()
-    if request.group:
-        qset = qset.filter(group=request.group)
-
-    ip = request.DATA.get("ip")
-    if ip:
-        qset = qset.filter(session__ip=ip)
-
-    path = request.DATA.get("path")
-    if path:
-        qset = qset.filter(remote_path__icontains=path)
-    
-    method = request.DATA.get("method")
-    if method:
-        qset = qset.filter(method=method)
-
-    action = request.DATA.get("action")
-    if action:
-        qset = qset.filter(action=action)
-    
-    component = request.DATA.get("component")
-    if component:
-        qset = qset.filter(component=component)
-    
-    pkey = request.DATA.get("pkey")
-    if pkey:
-        qset = qset.filter(pkey=pkey)
-
-    username = request.DATA.get("username")
-    if username:
-        qset = qset.filter(user__username=username)
-    
-    term = request.DATA.get("term")
-    if term:
-        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)