[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f05b39059a4c50a08916200b76c560cfa5219f9c

[Michael Tremer <git@ipfire.org>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  f05b39059a4c50a08916200b76c560cfa5219f9c (commit)
      from  eead020f64d6def4853ad5e361567120d062197d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f05b39059a4c50a08916200b76c560cfa5219f9c
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Mar 9 11:54:02 2026 +0000

    suricata-reporter: Backport patch to render if DNS queries is empty
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/suricata-reporter                              |  1 +
 ...ricata-reporter-0.7-fix-empty-dns-queries.patch | 39 ++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 src/patches/suricata-reporter-0.7-fix-empty-dns-queries.patch

Difference in files:
diff --git a/lfs/suricata-reporter b/lfs/suricata-reporter
index 6c99388c9..c56e0b5da 100644
--- a/lfs/suricata-reporter
+++ b/lfs/suricata-reporter
@@ -70,6 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata-reporter-0.7-fix-empty-dns-queries.patch
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
diff --git a/src/patches/suricata-reporter-0.7-fix-empty-dns-queries.patch b/src/patches/suricata-reporter-0.7-fix-empty-dns-queries.patch
new file mode 100644
index 000000000..8099fbe8d
--- /dev/null
+++ b/src/patches/suricata-reporter-0.7-fix-empty-dns-queries.patch
@@ -0,0 +1,39 @@
+From 15c53ed2cf4545d94cc11220295278bcdeba5000 Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer@ipfire.org>
+Date: Mon, 9 Mar 2026 11:48:51 +0000
+Subject: [PATCH] generator: Fix crash if no further DNS queries info exists
+
+Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
+---
+ src/suricata-report-generator.in | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/suricata-report-generator.in b/src/suricata-report-generator.in
+index e4b4db9..e08005a 100644
+--- a/src/suricata-report-generator.in
++++ b/src/suricata-report-generator.in
+@@ -631,13 +631,14 @@ class ReportGenerator(object):
+ 				line = []
+ 
+ 				# Append all queries
+-				for query in json.loads(row.dns_queries):
+-					line.append(
+-						"%s: %s" % (_("Query"), "%(rrname)s (%(rrtype)s)" % query),
+-					)
+-
+-				# Append the line to the signature
+-				signature.append(" - ".join(line))
++				if row.dns_queries:
++					for query in json.loads(row.dns_queries):
++						line.append(
++							"%s: %s" % (_("Query"), "%(rrname)s (%(rrtype)s)" % query),
++						)
++
++					# Append the line to the signature
++					signature.append(" - ".join(line))
+ 
+ 			# HTTP
+ 			elif row.app_protocol == "http":
+-- 
+2.47.3
+


hooks/post-receive
--
IPFire 2.x development tree