django-restit 4.2.80__tar.gz → 4.2.83__tar.gz

{django_restit-4.2.80 → django_restit-4.2.83}/PKG-INFO

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

{django_restit-4.2.80 → django_restit-4.2.83}/account/models/member.py

@@ -224,11 +224,11 @@ class Member(User, RestModel, MetaDataModel):
 
     @property
     def force_single_session(self):
-        return self.hasPermission("force_single_session")
+        return self.hasPermission("force_single_session", ignore_su=True)
 
     @property
     def email_disabled(self):
-        return self.hasPermission("email_disabled")
+        return self.hasPermission("email_disabled", ignore_su=True)
 
     @property
     def has_totp(self):

{django_restit-4.2.80 → django_restit-4.2.83}/account/models/notify.py

@@ -130,6 +130,8 @@ class NotificationRecord(models.Model, RestModel):
 
     @classmethod
     def canSend(cls):
+        if not settings.get("THROTTLE_EMAILS", False):
+            return True
         max_emails_per_minute = settings.get("MAX_EMAILS_PER_MINUTE", 30)
         last_email = NotificationRecord.objects.filter(state=1).last()
         now = datetime.now()
@@ -206,7 +208,7 @@ class NotificationRecord(models.Model, RestModel):
 
     @classmethod
     def _notifyViaEmail(cls, member, subject, message, template, context, 
-                        attachments, from_email=None):
+                        attachments, from_email=settings.DEFAULT_FROM_EMAIL):
         # lets verify the db is working
         if template:
             if context is None:
@@ -215,6 +217,8 @@ class NotificationRecord(models.Model, RestModel):
                 context["body"] = message
             context["unsubscribe_token"] = member.getUUID()
             message = inbox.utils.renderTemplate(template, context)
+        if from_email is None:
+            from_email = settings.DEFAULT_FROM_EMAIL
 
         nr = NotificationMemberRecord(member=member, to_addr=member.email)
         email_record = NotificationRecord(

django_restit-4.2.83/auditlog/migrations/0002_alter_persistentlog_session.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.11 on 2024-05-13 02:34
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sessionlog', '0001_initial'),
+        ('auditlog', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='persistentlog',
+            name='session',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='sessionlog.sessionlog'),
+        ),
+    ]

django_restit-4.2.83/inbox/migrations/0005_alter_mailbox_state.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-05-13 02:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inbox', '0004_mailtemplate'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='mailbox',
+            name='state',
+            field=models.IntegerField(db_index=True, default=1),
+        ),
+    ]

django_restit-4.2.83/incident/migrations/0015_rule_title_template_alter_incident_state.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.11 on 2024-05-13 02:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('incident', '0014_event_group_alter_rulecheck_index'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='rule',
+            name='title_template',
+            field=models.CharField(default=None, max_length=200, null=True),
+        ),
+        migrations.AlterField(
+            model_name='incident',
+            name='state',
+            field=models.IntegerField(choices=[(0, 'new'), (1, 'opened'), (2, 'paused'), (3, 'ignored'), (4, 'resolved'), (5, 'pending')], default=0),
+        ),
+    ]

{django_restit-4.2.80 → django_restit-4.2.83}/incident/models/event.py

@@ -155,7 +155,7 @@ class Event(JSONMetaData, rm.RestModel):
         incident = None
         action_count = 0
         if hit_rule is not None:
-            logger.error(f"RULE HIT: {hit_rule.name}")
+            # logger.error(f"RULE HIT: {hit_rule.name}")
             priority = hit_rule.priority
             if hit_rule.action == "ignore":
                 self.save()
@@ -184,7 +184,13 @@ class Event(JSONMetaData, rm.RestModel):
             if hit_rule is not None and hit_rule.action_after != 0:
                 incident.state = INCIDENT_STATE_PENDING
             # TODO possibly make this smarter?
-            if self.category == "ossec":
+            if hit_rule and hit_rule.title_template and "{" in hit_rule.title_template:
+                try:
+                    incident.description = hit_rule.title_template.format(event=self)
+                except Exception:
+                    logger.exception(hit_rule.title_template)
+                    incident.description = self.description
+            elif self.category == "ossec":
                 incident.description = f"{self.hostname}: {self.description}"
             else:
                 incident.description = self.description

{django_restit-4.2.80 → django_restit-4.2.83}/incident/models/rules.py

@@ -43,6 +43,7 @@ class Rule(models.Model, rm.RestModel):
                     "created",
                     "priority",
                     "name",
+                    "title_template",
                     "category",
                     "priority",
                     "action",
@@ -63,6 +64,7 @@ class Rule(models.Model, rm.RestModel):
     modified = models.DateTimeField(auto_now=True)
 
     name = models.CharField(max_length=200)
+    title_template = models.CharField(max_length=200, default=None, null=True)
     # the group the rule gets assigned to when triggered
     group = models.ForeignKey("account.Group", on_delete=models.CASCADE, null=True, default=None)
     # category allows us to limit running rules to only those with a category

{django_restit-4.2.80 → django_restit-4.2.83}/incident/parsers/ossec.py

@@ -33,12 +33,21 @@ def parse_nginx_line(line):
     return None
 
 
-def removeNonAscii(input_str):
-    """Remove all non-ASCII characters and escaped byte sequences from the input string."""
-    # Remove escaped byte sequences
-    cleaned_str = re.sub(r'\\x[0-9a-fA-F]{2}', '', input_str)
-    # Remove non-ASCII characters
-    return ''.join(char for char in cleaned_str if 32 <= ord(char) < 128)
+def removeNonAscii(input_str, replacement=''):
+    """
+    Replace all non-ASCII characters and escaped byte sequences in the input string with a specified string.
+    
+    Args:
+    input_str (str): The string to process.
+    replacement (str): The string to use as a replacement for non-ASCII characters and escaped byte sequences.
+
+    Returns:
+    str: The processed string with non-ASCII characters and byte sequences replaced.
+    """
+    # Replace escaped byte sequences with the replacement string
+    cleaned_str = re.sub(r'\\x[0-9a-fA-F]{2}', replacement, input_str)
+    # Replace non-ASCII characters with the replacement string
+    return ''.join(char if (32 <= ord(char) < 128 or char in '\n\r\t') else f"<r{str(ord(char))}>" for char in cleaned_str)
 
 
 def extractURL(text):
@@ -168,6 +177,8 @@ def parse_alert_json(data):
         data = objict.fromJSON(removeNonAscii(data))
     for key in data:
         data[key] = data[key].strip()
+    if data.text:
+        data.text = removeNonAscii(data.text)
     return data
 
 

{django_restit-4.2.80 → django_restit-4.2.83}/location/models/ip.py

@@ -93,6 +93,8 @@ class GeoIP(models.Model, rm.RestModel):
             ip = ip.strip()
         if not geolocate.isIP(ip):
             ip = geolocate.dnsToIP(ip)
+            if ip is None:
+                return None
         subnet = ip[:ip.rfind(".")]
         gip = GeoIP.objects.filter(ip=ip).first()
         if gip is None:

{django_restit-4.2.80 → django_restit-4.2.83}/location/providers/iplookup/__init__.py

@@ -32,4 +32,8 @@ def isIP(ip):
 
 
 def dnsToIP(name):
-    return socket.gethostbyname(name)
+    try:
+        return socket.gethostbyname(name)
+    except Exception:
+        pass
+    return None

{django_restit-4.2.80 → django_restit-4.2.83}/pyproject.toml

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

django_restit-4.2.83/wiki/migrations/0002_alter_pagemedia_entry.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.11 on 2024-05-13 02:34
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wiki', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='pagemedia',
+            name='entry',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='media_library', to='wiki.page'),
+        ),
+    ]