Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-02-22 10:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update flask_notification_routes.py

Browse Source
This commit is contained in:
MacRimi
2026-02-21 21:55:37 +01:00
parent fccd4c12ca
commit 49e9e26bff
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
AppImage/scripts/flask_notification_routes.py
View File

@@ -232,7 +232,7 @@ def _pve_remove_our_blocks(text, headers_to_remove):
def _build_webhook_fallback(): def _build_webhook_fallback():
"""Build fallback manual commands for webhook setup.""" """Build fallback manual commands for webhook setup."""
import base64 import base64
body_tpl = '{"title":"{{ escape title }}","message":"{{ escape message }}","severity":"{{ severity }}","timestamp":"{{ timestamp }}","type":"{{ escape type }}","hostname":"{{ escape hostname }}"}' body_tpl = '{"title":"{{ title }}","message":"{{ message }}","severity":"{{ severity }}","timestamp":"{{ timestamp }}"}'
body_b64 = base64.b64encode(body_tpl.encode()).decode() body_b64 = base64.b64encode(body_tpl.encode()).decode()
return [ return [
"# 1. Append to END of /etc/pve/notifications.cfg", "# 1. Append to END of /etc/pve/notifications.cfg",
@@ -312,11 +312,13 @@ def setup_pve_webhook_core() -> dict:
# PVE stores body as base64 in the config file. We encode it here # PVE stores body as base64 in the config file. We encode it here
# so the config parser reads it correctly. # so the config parser reads it correctly.
# IMPORTANT: use {{ escape X }} for title/message -- PVE's escape # Only use fields that ALWAYS exist: title, message, severity, timestamp.
# helper JSON-escapes quotes and newlines. Without it, multi-line # "type" and "hostname" are inside "fields" (not top-level) and
# backup messages break the JSON and our handler can't parse it. # {{ escape X }} fails hard on undefined fields, breaking the
# entire notification delivery for ALL targets.
# Our _classify() extracts type/hostname from the message content.
import base64 import base64
body_template = '{"title":"{{ escape title }}","message":"{{ escape message }}","severity":"{{ severity }}","timestamp":"{{ timestamp }}","type":"{{ escape type }}","hostname":"{{ escape hostname }}"}' body_template = '{"title":"{{ title }}","message":"{{ message }}","severity":"{{ severity }}","timestamp":"{{ timestamp }}"}'
body_b64 = base64.b64encode(body_template.encode()).decode() body_b64 = base64.b64encode(body_template.encode()).decode()
endpoint_block = ( endpoint_block = (
@@ -651,11 +653,27 @@ def proxmox_webhook():
# If still empty, try parsing raw data as JSON (PVE may not set Content-Type) # If still empty, try parsing raw data as JSON (PVE may not set Content-Type)
if not payload and raw_data: if not payload and raw_data:
try:
import json import json
try:
payload = json.loads(raw_data) payload = json.loads(raw_data)
except (json.JSONDecodeError, ValueError): except (json.JSONDecodeError, ValueError):
pass # PVE's {{ message }} may contain unescaped newlines/quotes
# that break JSON. Try to repair common issues.
try:
repaired = raw_data.replace('\n', '\\n').replace('\r', '\\r')
payload = json.loads(repaired)
except (json.JSONDecodeError, ValueError):
# Try to extract fields with regex from broken JSON
import re
title_m = re.search(r'"title"\s*:\s*"([^"]*)"', raw_data)
sev_m = re.search(r'"severity"\s*:\s*"([^"]*)"', raw_data)
if title_m:
payload = {
'title': title_m.group(1),
'body': raw_data[:1000],
'severity': sev_m.group(1) if sev_m else 'info',
'source': 'proxmox_hook',
}
# If still empty, try to salvage data from raw body # If still empty, try to salvage data from raw body
if not payload: if not payload: