From fccd4c12caf12e7f2c661b33db5eb25fdbe4fff1 Mon Sep 17 00:00:00 2001
From: MacRimi <ricoextincion@gmail.com>
Date: Sat, 21 Feb 2026 21:36:27 +0100
Subject: [PATCH] Update notification service

---
 AppImage/scripts/flask_notification_routes.py | 19 +++++++++++--------
 AppImage/scripts/notification_events.py       |  4 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/AppImage/scripts/flask_notification_routes.py b/AppImage/scripts/flask_notification_routes.py
index d30fe2e7..c14f659a 100644
--- a/AppImage/scripts/flask_notification_routes.py
+++ b/AppImage/scripts/flask_notification_routes.py
@@ -232,7 +232,7 @@ def _pve_remove_our_blocks(text, headers_to_remove):
 def _build_webhook_fallback():
     """Build fallback manual commands for webhook setup."""
     import base64
-    body_tpl = '{"title":"{{ title }}","message":"{{ message }}","severity":"{{ severity }}","timestamp":"{{ timestamp }}"}'
+    body_tpl = '{"title":"{{ escape title }}","message":"{{ escape message }}","severity":"{{ severity }}","timestamp":"{{ timestamp }}","type":"{{ escape type }}","hostname":"{{ escape hostname }}"}'
     body_b64 = base64.b64encode(body_tpl.encode()).decode()
     return [
         "# 1. Append to END of /etc/pve/notifications.cfg",
@@ -311,10 +311,12 @@ def setup_pve_webhook_core() -> dict:
         # Neither is needed for localhost calls.
         
         # PVE stores body as base64 in the config file. We encode it here
-        # so the config parser reads it correctly. The plain-text template:
-        #   {"title":"{{ title }}","message":"{{ message }}","severity":"{{ severity }}","timestamp":"{{ timestamp }}"}
+        # so the config parser reads it correctly.
+        # IMPORTANT: use {{ escape X }} for title/message -- PVE's escape
+        # helper JSON-escapes quotes and newlines. Without it, multi-line
+        # backup messages break the JSON and our handler can't parse it.
         import base64
-        body_template = '{"title":"{{ title }}","message":"{{ message }}","severity":"{{ severity }}","timestamp":"{{ timestamp }}"}'
+        body_template = '{"title":"{{ escape title }}","message":"{{ escape message }}","severity":"{{ severity }}","timestamp":"{{ timestamp }}","type":"{{ escape type }}","hostname":"{{ escape hostname }}"}'
         body_b64 = base64.b64encode(body_template.encode()).decode()
         
         endpoint_block = (
@@ -655,14 +657,15 @@ def proxmox_webhook():
             except (json.JSONDecodeError, ValueError):
                 pass
         
-        # If still empty, create a minimal test event from raw data
+        # If still empty, try to salvage data from raw body
         if not payload:
             if raw_data:
+                # Last resort: treat raw text as the message body
                 payload = {
-                    'type': 'webhook_test',
-                    'title': 'PVE Webhook Test',
-                    'body': raw_data[:500],
+                    'title': 'PVE Notification',
+                    'body': raw_data[:1000],
                     'severity': 'info',
+                    'source': 'proxmox_hook',
                 }
             else:
                 return _reject(400, 'empty_payload', 400)
diff --git a/AppImage/scripts/notification_events.py b/AppImage/scripts/notification_events.py
index a829eff7..c66967df 100644
--- a/AppImage/scripts/notification_events.py
+++ b/AppImage/scripts/notification_events.py
@@ -1055,7 +1055,7 @@ class ProxmoxHookWatcher:
         # ── PVE native notification types ──
         # When PVE sends via our webhook body template, fields.type is one of:
         #   vzdump, fencing, replication, package-updates, system-mail
-        pve_type = payload.get('type', '').lower()
+        pve_type = payload.get('type', '').lower().strip()
         
         if pve_type == 'vzdump':
             # Backup notification -- determine success or failure from severity
@@ -1163,6 +1163,6 @@ class ProxmoxHookWatcher:
         raw_l = str(raw).lower()
         if raw_l in ('critical', 'emergency', 'alert', 'crit', 'err', 'error'):
             return 'CRITICAL'
-        if raw_l in ('warning', 'warn'):
+        if raw_l in ('warning', 'warn', 'notice'):
             return 'WARNING'
         return 'INFO'