From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Eitelwein <michael@eitelwein.net>
To: development@lists.ipfire.org
Subject: [PATCH 2/5] Fix regex to extract firewall chain for ipv6 in
 showrequestfrom*.dat
Date: Sun, 10 Jan 2016 18:36:04 +0100
Message-ID: <56929684.8040005@eitelwein.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4693353921446188983=="
List-Id: <development.lists.ipfire.org>

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

If bridged ipv6 is used, $iface is taken from PHYSIN
In the log line the order of fields is "... IN=3DXY OUT=3DXY PHYSIN=3DXY ..."

Signed-off-by: Michael Eitelwein <michael(a)eitelwein.net>

---
  html/cgi-bin/logs.cgi/showrequestfromcountry.dat | 8 ++++----
  html/cgi-bin/logs.cgi/showrequestfromip.dat      | 2 +-
  html/cgi-bin/logs.cgi/showrequestfromport.dat    | 2 +-
  3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/=
logs.cgi/showrequestfromcountry.dat
index 0784ab9..07bf864 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
@@ -181,7 +181,7 @@ if (!$skip)
              elsif($srcaddr ne '') {
                  # or srcaddr matches country code
                  my $ccode =3D $gi->country_code_by_name($srcaddr);
-                if($ccode eq $country){
+                if($ccode eq uc($country)){
                      $log[$lines] =3D $_;
                      $lines++;
                  }
@@ -221,7 +221,7 @@ if ($multifile) {
                      elsif (($_ =3D~ /SRC\=3D(([\d]{1,3})(\.([\d]{1,3})){3})=
/) or ($_ =3D~ /SRC\=3D(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) {
                        my $srcaddr=3D$1;
                        my $ccode =3D $gi->country_code_by_name($srcaddr);
-                      if($ccode eq $country){
+                      if($ccode eq uc($country)){
                          # or srcaddr matches country code
                          $log[$lines] =3D $_;
                          $lines++;
@@ -351,7 +351,7 @@ foreach $_ (@slice)
      if($iface ne $country) {
        $ccode =3D $gi->country_code_by_name($srcaddr);
      }
-    if($iface eq $country || $ccode eq $country) {
+    if($iface eq $country || $ccode eq uc($country)) {
        my $chain =3D '';
        my $in =3D '-'; my $out =3D '-';
        my $srcaddr =3D ''; my $dstaddr =3D '';
@@ -359,7 +359,7 @@ foreach $_ (@slice)
        my $srcport =3D ''; my $dstport =3D '';

        # If ipv6 uses bridge, the use PHYSIN otherwise use IN
-      if ($_ =3D~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(PHYSIN=3D.*)$/) {}
+      if ($_ =3D~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=3D.*)(PHYSIN=3D.*)$=
/) {}
        elsif ($_ =3D~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=3D.*)$/) {}
        my $timestamp =3D $1; my $chain =3D $2; my $packet =3D $3;
        $timestamp =3D~ /(...) (..) (..:..:..)/;
diff --git a/html/cgi-bin/logs.cgi/showrequestfromip.dat b/html/cgi-bin/logs.=
cgi/showrequestfromip.dat
index 94e795c..3611c19 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromip.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromip.dat
@@ -303,7 +303,7 @@ foreach $_ (@slice)
      my $srcport =3D ''; my $dstport =3D '';

      # If ipv6 uses bridge, the use PHYSIN, otherwise use IN
-        if ($_ =3D~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(PHYSIN=3D.*)$/) {}
+        if ($_ =3D~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=3D.*)(PHYSIN=3D.*=
)$/) {}
          elsif ($_ =3D~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=3D.*)$/) {}
      my $timestamp =3D $1; my $chain =3D $2; my $packet =3D $3;
      $timestamp =3D~ /(...) (..) (..:..:..)/;
diff --git a/html/cgi-bin/logs.cgi/showrequestfromport.dat b/html/cgi-bin/log=
s.cgi/showrequestfromport.dat
index af7779a..d735c7b 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromport.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromport.dat
@@ -308,7 +308,7 @@ foreach $_ (@slice)
      my $srcport =3D ''; my $dstport =3D '';

          # If ipv6 uses bridge, the use PHYSIN, otherwise use IN
-    if ($_ =3D~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(PHYSIN=3D.*)$/) {}
+    if ($_ =3D~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=3D.*)(PHYSIN=3D.*)$/)=
 {}
          elsif ($_ =3D~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=3D.*)$/) {}
      my $timestamp =3D $1; my $chain =3D $2; my $packet =3D $3;
      $timestamp =3D~ /(...) (..) (..:..:..)/;
--=20
1.9.1


--===============4693353921446188983==--