django-restit 4.2.164__py3-none-any.whl → 4.2.165__py3-none-any.whl

account/models/device.py

@@ -6,6 +6,8 @@ from rest import settings
 from objict import objict
 from datetime import datetime
 
+from rest import helpers as rh
+
 CM_BACKENDS = objict()
 DEVICE_USE_BUID = settings.get("DEVICE_USE_BUID", False)
 
@@ -85,8 +87,9 @@ class MemberDevice(models.Model, rm.RestModel, rm.MetaDataModel):
                 md.state = 1
             md.touch(request.ip)
             metadata = request.DATA.get("device_metadata", None)
-            if isinstance(metadata, dict):
-                md.set_metadata(metadata)
+            rh.debug("md.metadata", metadata)
+            if metadata is not None:
+                md.setProperty("device", metadata)
             return md
         md = MemberDevice(
             uuid=device_id, buid=buid,
@@ -100,8 +103,8 @@ class MemberDevice(models.Model, rm.RestModel, rm.MetaDataModel):
         md.save()
         md.setProperty("user_agent", request.META.get('HTTP_USER_AGENT', ''))
         metadata = request.DATA.get("device_metadata", None)
-        if isinstance(metadata, dict):
-            md.set_metadata(metadata)
+        if metadata is not None:
+            md.setProperty("device", metadata)
         return md
 
     @classmethod

{django_restit-4.2.164.dist-info → django_restit-4.2.165.dist-info}/METADATA

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

{django_restit-4.2.164.dist-info → django_restit-4.2.165.dist-info}/RECORD

@@ -26,7 +26,7 @@ account/migrations/0021_alter_cloudcredentials_group.py,sha256=zoFYmE-hd3uRGX6DR
 account/migrations/0022_alter_memberdevice_modified.py,sha256=9eeKcdr9p6qFJ8ZxSnKSj1KxZjW8NZfM0YCMck6i0QQ,424
 account/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 account/models/__init__.py,sha256=cV_lMnT2vL_mjiYtT4hlcIHo52ocFbGSNVkOIHHLXZY,385
-account/models/device.py,sha256=2XT45W5iRGFFZlD5-nnypuR6BlscVbfsS1azxoeHj3Y,6222
+account/models/device.py,sha256=8D-Sbv9PZWAnX6UVpp1lNJ03P24fknNnN1VOhqY7RVg,6306
 account/models/feeds.py,sha256=vI7fG4ASY1M0Zjke24RdnfDcuWeATl_yR_25jPmT64g,2011
 account/models/group.py,sha256=N9Ow7AtV4xN5zSE9E5-msthJy0G5-3DEr2MTmvFO1kU,22887
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
@@ -111,12 +111,13 @@ incident/migrations/0012_rule_match_by.py,sha256=PGclGnnc_8JEsJZ8znoXm-iAC6Y0i2W
 incident/migrations/0013_rulecheck_is_required.py,sha256=cL7tOj5XGPpKd2f5BojIKfNJeDB1IL-jGRU6-g-Co5o,387
 incident/migrations/0014_event_group_alter_rulecheck_index.py,sha256=v3gm5k0LVoas27qUDOt7el7YtK4yjFVLeEpuFUCoXaQ,724
 incident/migrations/0015_rule_title_template_alter_incident_state.py,sha256=FPUDhFwqBC39EjeknRT7BPddEf6ExCjsXVb9LMqIn3U,687
+incident/migrations/0016_rule_notify_template.py,sha256=4WGdMxiELujLIy9bzHovHWbAORupodN1Ty3vsy3mLjg,425
 incident/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/models/__init__.py,sha256=NMphuhb0RTMf7Ov4QkNv7iv6_I8Wtr3xQ54yjX_a31M,209
 incident/models/event.py,sha256=FEzEKKQKLkdRrPCvv-3Um9E2UPQjyIJp314Zr2LHuiw,7976
-incident/models/incident.py,sha256=5unJbVcjK05moXPrmq4S9aqGW6ysIzRxD4lp_HowKLs,21940
+incident/models/incident.py,sha256=dSveWs0VawYePeFxwZT8ni85CS_4jxpGV8nXPVGXokk,22607
 incident/models/ossec.py,sha256=eUDRGawzuLWobKEVGKfdZisDnyjS_Hlxi0T_GCSLCCI,2252
-incident/models/rules.py,sha256=aRkJ0ZnTv87nAUC1sHVkPExfb3OJ8fgHQIhnCIpIbhQ,7001
+incident/models/rules.py,sha256=PPp8oJDW1gop9i_21lhP50qgt_TrdWErp2mYqZCMfd4,7065
 incident/models/ticket.py,sha256=S3kqGQpYLE6Y4M9IKu_60sgW-f592xNr8uufqHnvDoU,2302
 incident/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/parsers/ossec.py,sha256=fouUsSnrdkEuqDzJ-MxmCP7ny5pCGFS3Tyf6lQSMBc4,11609
@@ -378,7 +379,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=OHP0LpCorLpmS0bdBI3QI-eOYtwdkh6DTH6YgR3KOUg,122
+rest/__init__.py,sha256=L-9nmqhBVg-KjQ-1szS_16HPFP4D1t7aJ05kVd52Qy4,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
@@ -514,7 +515,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=KKq00EwoGnz1yLwCZr5Dfoq2izivmAdsNEEM4EhZwN4,1610
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.164.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.164.dist-info/METADATA,sha256=cxD7mymamfcjCPYJNAbJ6Kkk9WMB_sHtqPA7wN8KPo8,7663
-django_restit-4.2.164.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.164.dist-info/RECORD,,
+django_restit-4.2.165.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.165.dist-info/METADATA,sha256=rRvGoqgmYwOEx1u5zs7YdPfoWe29f3kBTCybt3bueeQ,7663
+django_restit-4.2.165.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.165.dist-info/RECORD,,

incident/migrations/0016_rule_notify_template.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2025-01-03 19:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('incident', '0015_rule_title_template_alter_incident_state'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='rule',
+            name='notify_template',
+            field=models.TextField(default=None, null=True),
+        ),
+    ]

incident/models/incident.py

@@ -280,9 +280,7 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
         try:
             action, perm = self.rule.action.split(":")
             members = Member.GetWithNotification(perm)
-            # count = self.getProperty("event_count", default=1, field_type=int)
-            url = F"{settings.INCIDENT_PORTAL_URL}?incident={self.pk}"
-            msg = f"Incident #{self.pk}\n{self.description}\n{url}"
+            msg = self.renderTemplate()
             for m in members:
                 m.sendSMS(msg)
         except Exception:
@@ -363,6 +361,29 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
             context=dict(incident=self, portal_url=settings.INCIDENT_PORTAL_URL),
             email_only=True, from_email=INCIDENT_EMAIL_FROM)
 
+    def renderTemplate(self):
+        has_template = self.rule and self.rule.notify_template and not self.rule.notify_template.startswith("http")
+        url = self.renderURL()
+        if not has_template:
+            return f"Incident #{self.pk}\n{self.description}\n{url}"
+        template = self.rule.notify_template
+        try:
+            template = template.format(event=self)
+        except Exception:
+            pass
+        return template
+
+    def renderURL(self):
+        has_template = self.rule and self.rule.notify_template and self.rule.notify_template.startswith("http")
+        if not has_template:
+            return F"{settings.INCIDENT_PORTAL_URL}?incident={self.pk}"
+        url = self.rule.notify_template
+        try:
+            url = url.format(event=self)
+        except Exception:
+            pass
+        return url
+
     def lastSentAge(self):
         # prevent spams, only allow emails every 5 minutes
         if self.action_sent is None:

incident/models/rules.py

@@ -65,6 +65,7 @@ class Rule(models.Model, rm.RestModel):
 
     name = models.CharField(max_length=200)
     title_template = models.CharField(max_length=200, default=None, null=True)
+    notify_template = models.TextField(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

rest/__init__.py

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