From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/5] ids-functions.pl: Drop downloader code for sourcefire
 based ruleset.
Date: Wed, 23 Mar 2022 05:04:48 +0100
Message-ID: <20220323040452.2609-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8048420221112299226=="
List-Id: <development.lists.ipfire.org>

--===============8048420221112299226==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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;
 		}
=20
-		# Variable to store the filesize of the remote object.
-		my $remote_filesize;
-
-		# The sourcfire (snort rules) does not allow to send "HEAD" requests, so s=
kip this check
-		# for this webserver.
-		#
-		# Check if the ruleset source contains "snort.org".
-		unless ($url =3D~ /\.snort\.org/) {
-			# Pass the requrested url to the downloader.
-			my $request =3D HTTP::Request->new(HEAD =3D> $url);
-
-			# Accept the html header.
-			$request->header('Accept' =3D> 'text/html');
-
-			# Perform the request and fetch the html header.
-			my $response =3D $downloader->request($request);
-
-			# Check if there was any error.
-			unless ($response->is_success) {
-				# Obtain error.
-				my $error =3D $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 =3D $response->headers();
-
-			# Grab the remote file size from the object and store it in the
-			# variable.
-			$remote_filesize =3D $header->content_length;
-		}
-
 		# Load perl module to deal with temporary files.
 		use File::Temp;
=20
@@ -416,6 +379,12 @@ sub downloadruleset ($) {
 			return 1;
 		}
=20
+		# Obtain the connection headers.
+		my $headers =3D $response->headers;
+
+		# Get the remote size of the downloaded file.
+		my $remote_filesize =3D $headers->content_length;
+
 		# Load perl stat module.
 		use File::stat;
=20
--=20
2.30.2


--===============8048420221112299226==--