From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 7 Mar 2023 12:38:09 +0000 (+0100)
Subject: ids-functions.pl: Extract rules files if they are in a providers rules folder.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c35974f87dbdd91ffe70f03a07217308545447d7;p=people%2Fms%2Fipfire-2.x.git

ids-functions.pl: Extract rules files if they are in a providers rules folder.

Now the rules files in a subfolder like "<provider>-rules" also will get
extracted.

Fixes rule file extraction for Snort Community ruleset.

Fixes #12948.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
---

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index ec4fdacc57..d97431b4a3 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -572,7 +572,7 @@ sub extractruleset ($) {
 			# Handle rules files.
 			} elsif ($file =~ m/\.rules$/) {
 				# Skip rule files which are not located in the rules directory or archive root.
-				next unless(($packed_file =~ /^rules\//) || ($packed_file !~ /\//));
+				next unless(($packed_file =~ /^rules\//) || ($packed_file =~ /^$provider-rules\//) || ($packed_file !~ /\//));
 
 				# Skip deleted.rules.
 				#