From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] guardian: Add upstream patch for HTTP parser.
Date: Tue, 04 Feb 2020 08:59:33 +0100
Message-ID: <20200204075933.21338-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4273545660349776660=="
List-Id: <development.lists.ipfire.org>

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

Fixes #12289.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 lfs/guardian                                 |  5 ++-
 src/patches/guardian-2.0.2-http-parser.patch | 45 ++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 src/patches/guardian-2.0.2-http-parser.patch

diff --git a/lfs/guardian b/lfs/guardian
index a40480c0c..3e2c3347f 100644
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -33,7 +33,7 @@ DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
=20
 PROG       =3D guardian
-PAK_VER    =3D 18
+PAK_VER    =3D 19
=20
 DEPS       =3D "perl-inotify2 perl-Net-IP"
=20
@@ -79,6 +79,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axvf $(DIR_DL)/$(DL_FILE)
=20
+	# Add upstream patches.
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/guardian-2.0.2-http-p=
arser.patch
+
 	# Adjust path for firewall binaries.
 	cd $(DIR_APP) && sed -i "s|/usr/sbin/|/sbin/|g" modules/IPtables.pm
=20
diff --git a/src/patches/guardian-2.0.2-http-parser.patch b/src/patches/guard=
ian-2.0.2-http-parser.patch
new file mode 100644
index 000000000..1ecae658c
--- /dev/null
+++ b/src/patches/guardian-2.0.2-http-parser.patch
@@ -0,0 +1,45 @@
+commit 5028c7fde1fa15e4960f2fec3c025d0338382895
+Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
+Date:   Tue Feb 4 07:55:48 2020 +0100
+
+    Parser: Adjust HTTP parser to be compatible with newer log format.
+   =20
+    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
+
+diff --git a/modules/Parser.pm b/modules/Parser.pm
+index 3880228..bcca88f 100644
+--- a/modules/Parser.pm
++++ b/modules/Parser.pm
+@@ -302,7 +302,7 @@ sub message_parser_httpd (@) {
+ 	# been passed.
+ 	foreach my $line (@message) {
+ 		# This will catch brute-force attacks against htaccess logins (username).
+-		if ($line =3D~ /.*\[error\] \[client (.*)\] user(.*) not found:.*/) {
++		if ($line =3D~ /.*\[client (.*)\] .* user(.*) not found:.*/) {
+ 			# Store the grabbed IP-address.
+ 			$address =3D $1;
+=20
+@@ -311,7 +311,7 @@ sub message_parser_httpd (@) {
+ 		}
+=20
+ 		# Detect htaccess password brute-forcing against a username.
+-		elsif ($line =3D~ /.*\[error\] \[client (.*)\] user(.*): authentication f=
ailure for.*/) {
++		elsif ($line =3D~ /.*\[client (.*)\] .* user(.*): authentication failure =
for.*/) {
+ 			# Store the extracted IP-address.
+ 			$address =3D $1;
+=20
+@@ -321,6 +321,14 @@ sub message_parser_httpd (@) {
+=20
+ 		# Check if at least the IP-address information has been extracted.
+ 		if (defined ($address)) {
++			# Check if the address also contains a port value.
++			if ($address =3D~ m/:/) {
++				my ($add_address, $port) =3D split(/:/, $address);
++
++				# Only process the address.
++				$address =3D $add_address;
++			}
++
+ 			# Add the extracted values and event message to the actions array.
+ 			push(@actions, "count $address $name $message");
+ 		}
--=20
2.25.0


--===============4273545660349776660==--