[PATCH 1/5] ids-functions.pl: Drop downloader code for sourcefire based ruleset.

[PATCH 1/5] ids-functions.pl: Drop downloader code for sourcefire based ruleset.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 2261 bytes --]

Even if the servers do not support HEAD requests, the remote filesize
(content_length) can be obtained from the connection headers.

This generic method works for all servers and therefore we do not need
the code for handle sourcefire servers in a different way anymore.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 config/cfgroot/ids-functions.pl | 43 +++++----------------------------
 1 file changed, 6 insertions(+), 37 deletions(-)

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index 94dccc8ae..eb276030b 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -354,43 +354,6 @@ sub downloadruleset ($) {
 			return 1;
 		}
 
-		# Variable to store the filesize of the remote object.
-		my $remote_filesize;
-
-		# The sourcfire (snort rules) does not allow to send "HEAD" requests, so skip this check
-		# for this webserver.
-		#
-		# Check if the ruleset source contains "snort.org".
-		unless ($url =~ /\.snort\.org/) {
-			# Pass the requrested url to the downloader.
-			my $request = HTTP::Request->new(HEAD => $url);
-
-			# Accept the html header.
-			$request->header('Accept' => 'text/html');
-
-			# Perform the request and fetch the html header.
-			my $response = $downloader->request($request);
-
-			# Check if there was any error.
-			unless ($response->is_success) {
-				# Obtain error.
-				my $error = $response->status_line();
-
-				# Log error message.
-				&_log_to_syslog("Unable to download the ruleset. \($error\)");
-
-				# Return "1" - false.
-				return 1;
-			}
-
-			# Assign the fetched header object.
-			my $header = $response->headers();
-
-			# Grab the remote file size from the object and store it in the
-			# variable.
-			$remote_filesize = $header->content_length;
-		}
-
 		# Load perl module to deal with temporary files.
 		use File::Temp;
 
@@ -416,6 +379,12 @@ sub downloadruleset ($) {
 			return 1;
 		}
 
+		# Obtain the connection headers.
+		my $headers = $response->headers;
+
+		# Get the remote size of the downloaded file.
+		my $remote_filesize = $headers->content_length;
+
 		# Load perl stat module.
 		use File::stat;
 
-- 
2.30.2

[PATCH 2/5] ids-functions.pl: Allow "5" download attempts for each provider before fail.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 2092 bytes --]

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 config/cfgroot/ids-functions.pl | 38 ++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index eb276030b..c8bc52b1b 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -256,6 +256,10 @@ sub downloadruleset ($) {
 	# If no provider is given default to "all".
 	$provider //= 'all';
 
+	# The amount of download attempts before giving up and
+	# logging an error.
+	my $max_dl_attempts = 5;
+
 	# Hash to store the providers and access id's, for which rules should be downloaded.
 	my %sheduled_providers = ();
 
@@ -364,19 +368,33 @@ sub downloadruleset ($) {
 		# Pass the requested url to the downloader.
 		my $request = HTTP::Request->new(GET => $url);
 
-		# Perform the request and save the output into the tmpfile.
-		my $response = $downloader->request($request, $tmpfile);
+		my $dl_attempt = 1;
+		my $response;
 
-		# Check if there was any error.
-		unless ($response->is_success) {
-			# Obtain error.
-			my $error = $response->content;
+		# Download and retry on failure.
+		while ($dl_attempt <= $max_dl_attempts) {
+			# Perform the request and save the output into the tmpfile.
+			$response = $downloader->request($request, $tmpfile);
 
-			# Log error message.
-			&_log_to_syslog("Unable to download the ruleset. \($error\)");
+			# Check if the download was successfull.
+			if($response->is_success) {
+				# Break loop.
+				last;
 
-			# Return "1" - false.
-			return 1;
+			# Check if we ran out of download re-tries.
+			} elsif ($dl_attempt eq $max_dl_attempts) {
+				# Obtain error.
+				my $error = $response->content;
+
+				# Log error message.
+				&_log_to_syslog("Unable to download the ruleset. \($error\)");
+
+				# Return "1" - false.
+				return 1;
+			}
+
+			# Increase download attempt counter.
+			$dl_attempt++;
 		}
 
 		# Obtain the connection headers.
-- 
2.30.2

[PATCH 3/5] ids-functions.pl: Remove temporary file, if the download failed.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 563 bytes --]

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 config/cfgroot/ids-functions.pl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index c8bc52b1b..dfbeb1a7d 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -393,6 +393,9 @@ sub downloadruleset ($) {
 				return 1;
 			}
 
+			# Remove temporary file, if one exists.
+			unlink("$tmpfile") if (-e "$tmpfile");
+
 			# Increase download attempt counter.
 			$dl_attempt++;
 		}
-- 
2.30.2

[PATCH 4/5] ids-functions.pl: Use If-Modified-Since header to reduce file downloads.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 3423 bytes --]

When using the "If-Modified-Since" header, the server can be requested
if a modified version of the file can be served.

In case that is true, the file will be sent and stored by the downloader
function. If the file has not been touched since the last time, the
server will respond with the code "304" (Not modified).

This tells us, that the current stored file is the latest one (still up-to-date)
and we safely can skip the download attempt for this provider.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 config/cfgroot/ids-functions.pl | 38 ++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index dfbeb1a7d..d7df41dd1 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -365,9 +365,25 @@ sub downloadruleset ($) {
 		my $tmp = File::Temp->new( SUFFIX => ".tmp", DIR => "/var/tmp/", UNLINK => 0 );
 		my $tmpfile = $tmp->filename();
 
+		# Genarate and assign file name and path to store the downloaded rules file.
+		my $dl_rulesfile = &_get_dl_rulesfile($provider);
+
+		# Load perl module to deal with file atributes.
+		use File::stat;
+
+		# Get the mtime of the rulesfile if it exists.
+		my $mtime = (stat($dl_rulesfile)->mtime) if (-f $dl_rulesfile);
+
+		# Convert the mtime into gmtime format.
+		my $gmtime = gmtime($mtime || 0);
+
 		# Pass the requested url to the downloader.
 		my $request = HTTP::Request->new(GET => $url);
 
+		# Add the If-Modified-Since header to the request, containing the omited and converted
+		# mtime of the downloaded rules file, if one is present.
+		$request->header( 'If-Modified-Since' => "$gmtime" );
+
 		my $dl_attempt = 1;
 		my $response;
 
@@ -381,6 +397,14 @@ sub downloadruleset ($) {
 				# Break loop.
 				last;
 
+			# Check if the server responds with 304 (Not Modified).
+			} elsif ($response->code == 304) {
+				# Log to syslog.
+				&_log_to_syslog("Ruleset is up-to-date, no update required.");
+
+				# Nothing to be done, the ruleset is up-to-date.
+				return;
+
 			# Check if we ran out of download re-tries.
 			} elsif ($dl_attempt eq $max_dl_attempts) {
 				# Obtain error.
@@ -406,6 +430,10 @@ sub downloadruleset ($) {
 		# Get the remote size of the downloaded file.
 		my $remote_filesize = $headers->content_length;
 
+		# Get the timestamp from header, when the file has been modified the
+		# last time.
+		my $last_modified = $headers->last_modified;
+
 		# Load perl stat module.
 		use File::stat;
 
@@ -428,9 +456,6 @@ sub downloadruleset ($) {
 			return 1;
 		}
 
-		# Genarate and assign file name and path to store the downloaded rules file.
-		my $dl_rulesfile = &_get_dl_rulesfile($provider);
-
 		# Check if a file name could be obtained.
 		unless ($dl_rulesfile) {
 			# Log error message.
@@ -449,6 +474,13 @@ sub downloadruleset ($) {
 		# Overwrite the may existing rulefile or tarball with the downloaded one.
 		move("$tmpfile", "$dl_rulesfile");
 
+		# Check if the server respond contained a last_modified value.
+		if ($last_modified) {
+			# Assign the last modified timestamp from server as mtime to the
+			# rules file.
+			utime(time(), "$last_modified", "$dl_rulesfile");
+		}
+
 		# Delete temporary file.
 		unlink("$tmpfile");
 
-- 
2.30.2

[PATCH 5/5] ids-functions.pl: Do not longer call any log message as "ERROR".

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 4280 bytes --]

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 config/cfgroot/ids-functions.pl | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index d7df41dd1..9eb375bc9 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -226,7 +226,7 @@ sub checkdiskspace () {
 			# Check if the available disk space is more than 300MB.
 			if ($available < 300) {
 				# Log error to syslog.
-				&_log_to_syslog("Not enough free disk space on /var. Only $available MB from 300 MB available.");
+				&_log_to_syslog("<ERROR> Not enough free disk space on /var. Only $available MB from 300 MB available.");
 
 				# Exit function and return "1" - False.
 				return 1;
@@ -270,7 +270,7 @@ sub downloadruleset ($) {
 	# Check if a ruleset has been configured.
 	unless(%used_providers) {
 		# Log that no ruleset has been configured and abort.
-		&_log_to_syslog("No ruleset provider has been configured.");
+		&_log_to_syslog("<ERROR> No ruleset provider has been configured.");
 
 		# Return "1".
 		return 1;
@@ -333,7 +333,7 @@ sub downloadruleset ($) {
 	# Loop through the hash of sheduled providers.
 	foreach my $provider ( keys %sheduled_providers) {
 		# Log download/update of the ruleset.
-		&_log_to_syslog("Downloading ruleset for provider: $provider.");
+		&_log_to_syslog("<INFO> Downloading ruleset for provider: $provider.");
 
 		# Grab the download url for the provider.
 		my $url = $IDS::Ruleset::Providers{$provider}{'dl_url'};
@@ -354,7 +354,7 @@ sub downloadruleset ($) {
 		# Abort if no url could be determined for the provider.
 		unless ($url) {
 			# Log error and abort.
-			&_log_to_syslog("Unable to gather a download URL for the selected ruleset provider.");
+			&_log_to_syslog("<ERROR> Unable to gather a download URL for the selected ruleset provider.");
 			return 1;
 		}
 
@@ -400,7 +400,7 @@ sub downloadruleset ($) {
 			# Check if the server responds with 304 (Not Modified).
 			} elsif ($response->code == 304) {
 				# Log to syslog.
-				&_log_to_syslog("Ruleset is up-to-date, no update required.");
+				&_log_to_syslog("<INFO> Ruleset is up-to-date, no update required.");
 
 				# Nothing to be done, the ruleset is up-to-date.
 				return;
@@ -411,7 +411,7 @@ sub downloadruleset ($) {
 				my $error = $response->content;
 
 				# Log error message.
-				&_log_to_syslog("Unable to download the ruleset. \($error\)");
+				&_log_to_syslog("<ERROR> Unable to download the ruleset. \($error\)");
 
 				# Return "1" - false.
 				return 1;
@@ -446,8 +446,8 @@ sub downloadruleset ($) {
 		# Check if both file sizes match.
 		if (($remote_filesize) && ($remote_filesize ne $local_filesize)) {
 			# Log error message.
-			&_log_to_syslog("Unable to completely download the ruleset. ");
-			&_log_to_syslog("Only got $local_filesize Bytes instead of $remote_filesize Bytes. ");
+			&_log_to_syslog("<ERROR> Unable to completely download the ruleset. ");
+			&_log_to_syslog("<ERROR> Only got $local_filesize Bytes instead of $remote_filesize Bytes. ");
 
 			# Delete temporary file.
 			unlink("$tmpfile");
@@ -459,7 +459,7 @@ sub downloadruleset ($) {
 		# Check if a file name could be obtained.
 		unless ($dl_rulesfile) {
 			# Log error message.
-			&_log_to_syslog("Unable to store the downloaded rules file. ");
+			&_log_to_syslog("<ERROR> Unable to store the downloaded rules file. ");
 
 			# Delete downloaded temporary file.
 			unlink("$tmpfile");
@@ -518,7 +518,7 @@ sub extractruleset ($) {
 
 	# Check if the file exists.
 	unless (-f $tarball) {
-		&_log_to_syslog("Could not find ruleset file: $tarball");
+		&_log_to_syslog("<ERROR> Could not find ruleset file: $tarball");
 
 		# Return nothing.
 		return;
@@ -897,7 +897,7 @@ sub _log_to_syslog ($) {
 
 	# The syslog function works best with an array based input,
 	# so generate one before passing the message details to syslog.
-	my @syslog = ("ERR", "<ERROR> $message");
+	my @syslog = ("ERR", "$message");
 
 	# Establish the connection to the syslog service.
 	openlog('oinkmaster', 'cons,pid', 'user');
-- 
2.30.2

[PATCH 5/5] ids-functions.pl: Do not longer call any log message as "ERROR".

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 4297 bytes --]

Fixes #12805.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 config/cfgroot/ids-functions.pl | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index d7df41dd1..9eb375bc9 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -226,7 +226,7 @@ sub checkdiskspace () {
 			# Check if the available disk space is more than 300MB.
 			if ($available < 300) {
 				# Log error to syslog.
-				&_log_to_syslog("Not enough free disk space on /var. Only $available MB from 300 MB available.");
+				&_log_to_syslog("<ERROR> Not enough free disk space on /var. Only $available MB from 300 MB available.");
 
 				# Exit function and return "1" - False.
 				return 1;
@@ -270,7 +270,7 @@ sub downloadruleset ($) {
 	# Check if a ruleset has been configured.
 	unless(%used_providers) {
 		# Log that no ruleset has been configured and abort.
-		&_log_to_syslog("No ruleset provider has been configured.");
+		&_log_to_syslog("<ERROR> No ruleset provider has been configured.");
 
 		# Return "1".
 		return 1;
@@ -333,7 +333,7 @@ sub downloadruleset ($) {
 	# Loop through the hash of sheduled providers.
 	foreach my $provider ( keys %sheduled_providers) {
 		# Log download/update of the ruleset.
-		&_log_to_syslog("Downloading ruleset for provider: $provider.");
+		&_log_to_syslog("<INFO> Downloading ruleset for provider: $provider.");
 
 		# Grab the download url for the provider.
 		my $url = $IDS::Ruleset::Providers{$provider}{'dl_url'};
@@ -354,7 +354,7 @@ sub downloadruleset ($) {
 		# Abort if no url could be determined for the provider.
 		unless ($url) {
 			# Log error and abort.
-			&_log_to_syslog("Unable to gather a download URL for the selected ruleset provider.");
+			&_log_to_syslog("<ERROR> Unable to gather a download URL for the selected ruleset provider.");
 			return 1;
 		}
 
@@ -400,7 +400,7 @@ sub downloadruleset ($) {
 			# Check if the server responds with 304 (Not Modified).
 			} elsif ($response->code == 304) {
 				# Log to syslog.
-				&_log_to_syslog("Ruleset is up-to-date, no update required.");
+				&_log_to_syslog("<INFO> Ruleset is up-to-date, no update required.");
 
 				# Nothing to be done, the ruleset is up-to-date.
 				return;
@@ -411,7 +411,7 @@ sub downloadruleset ($) {
 				my $error = $response->content;
 
 				# Log error message.
-				&_log_to_syslog("Unable to download the ruleset. \($error\)");
+				&_log_to_syslog("<ERROR> Unable to download the ruleset. \($error\)");
 
 				# Return "1" - false.
 				return 1;
@@ -446,8 +446,8 @@ sub downloadruleset ($) {
 		# Check if both file sizes match.
 		if (($remote_filesize) && ($remote_filesize ne $local_filesize)) {
 			# Log error message.
-			&_log_to_syslog("Unable to completely download the ruleset. ");
-			&_log_to_syslog("Only got $local_filesize Bytes instead of $remote_filesize Bytes. ");
+			&_log_to_syslog("<ERROR> Unable to completely download the ruleset. ");
+			&_log_to_syslog("<ERROR> Only got $local_filesize Bytes instead of $remote_filesize Bytes. ");
 
 			# Delete temporary file.
 			unlink("$tmpfile");
@@ -459,7 +459,7 @@ sub downloadruleset ($) {
 		# Check if a file name could be obtained.
 		unless ($dl_rulesfile) {
 			# Log error message.
-			&_log_to_syslog("Unable to store the downloaded rules file. ");
+			&_log_to_syslog("<ERROR> Unable to store the downloaded rules file. ");
 
 			# Delete downloaded temporary file.
 			unlink("$tmpfile");
@@ -518,7 +518,7 @@ sub extractruleset ($) {
 
 	# Check if the file exists.
 	unless (-f $tarball) {
-		&_log_to_syslog("Could not find ruleset file: $tarball");
+		&_log_to_syslog("<ERROR> Could not find ruleset file: $tarball");
 
 		# Return nothing.
 		return;
@@ -897,7 +897,7 @@ sub _log_to_syslog ($) {
 
 	# The syslog function works best with an array based input,
 	# so generate one before passing the message details to syslog.
-	my @syslog = ("ERR", "<ERROR> $message");
+	my @syslog = ("ERR", "$message");
 
 	# Establish the connection to the syslog service.
 	openlog('oinkmaster', 'cons,pid', 'user');
-- 
2.30.2