django-restit 4.2.111__tar.gz → 4.2.112__tar.gz

{django_restit-4.2.111 → django_restit-4.2.112}/PKG-INFO

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

{django_restit-4.2.111 → django_restit-4.2.112}/account/models/group.py

@@ -177,7 +177,7 @@ class Group(models.Model, RestModel, MetaDataModel):
             parent = request.member.getGroup(child_of)
             if parent:
                 request.group = None
-                return parent.getAllChildren(grand_children=True)
+                return parent.getAllChildren(grand_children=True, great_grand_children=True)
         return qset
 
     def on_rest_get(self, request):

{django_restit-4.2.111 → django_restit-4.2.112}/pyproject.toml

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

{django_restit-4.2.111 → django_restit-4.2.112}/rest/__init__.py

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

{django_restit-4.2.111 → django_restit-4.2.112}/rest/extra/hostinfo.py

@@ -6,6 +6,7 @@ import django
 import version
 import platform
 import socket
+import subprocess
 
 
 try:
@@ -36,13 +37,19 @@ def getTcpEstablished(filter=None):
 
 def filterConnections(cons, filter):
     if filter == "https":
-        return [c for c in cons if cons.laddr.port == 443]
+        return [c for c in cons if c.laddr.port == 443]
     elif filter == "redis":
-        return [c for c in cons if cons.raddr.port == 6379]
+        return [c for c in cons if c.raddr.port == 6379]
     elif filter == "postgres":
-        return [c for c in cons if cons.raddr.port == 5432]
+        return [c for c in cons if c.raddr.port == 5432]
     elif filter == "unknown":
-        return [c for c in cons if cons.raddr.port not in [5432, 6379] and cons.laddr.port != 443]
+        return [c for c in cons if c.raddr.port not in [5432, 6379] and c.laddr.port != 443]
+    elif filter and ":" in filter:
+        addr, port = filter.split(':')
+        if addr == "raddr":
+            return [c for c in cons if c.raddr.port == port]
+        elif addr == "laddr":
+            return [c for c in cons if c.laddr.port == port]
     return cons