From f40e5cb2a6e5cd1d86fff5313992c5e8ff903443 Mon Sep 17 00:00:00 2001 From: Bill Meeks Date: Thu, 9 Nov 2023 22:01:31 -0500 Subject: [PATCH] Simplify $EXTERNAL_NET variable declaration to match Snort change --- .../files/usr/local/pkg/suricata/suricata_generate_yaml.php | 5 +---- .../files/usr/local/www/suricata/suricata_list_view.php | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_generate_yaml.php b/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_generate_yaml.php index 419e5b529c20..fbe203feeed1 100644 --- a/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_generate_yaml.php +++ b/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_generate_yaml.php @@ -53,10 +53,7 @@ $external_net = "[" . trim($external_net) . "]"; } else { - $external_net = "["; - foreach ($home_net_list as $ip) - $external_net .= "!{$ip}, "; - $external_net = trim($external_net, ', ') . "]"; + $external_net = "[!\$HOME_NET]"; } // Set the PASS LIST and write its contents to disk, diff --git a/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_list_view.php b/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_list_view.php index 9a2ca45871cf..cf6d651d5a11 100644 --- a/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_list_view.php +++ b/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_list_view.php @@ -68,7 +68,7 @@ elseif ($type == "externalnet") { if ($wlist == "default") { $list = suricata_build_list($a_rule, $a_rule['homelistname']); - $contents = ""; + $contents = "Defined in suricata.yaml as: !\$HOME_NET which expands to:\n\n"; foreach ($list as $ip) $contents .= "!{$ip}\n"; $contents = trim($contents, "\n");