From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] Fix for guardian-CGI: As a result of fixing BUG11318 Date: Mon, 17 Apr 2017 00:16:02 +0200 Message-ID: <20170416221602.15439-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1319181259291522683==" List-Id: --===============1319181259291522683== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is necessary because commit bf1985fae5baca327fcded31264f45638442f02e cha= nges the place where temporary files from 'iptables' are stored. Some typos where fixed, too. Best, Matthias Signed-off-by: Matthias Fischer --- html/cgi-bin/guardian.cgi | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/html/cgi-bin/guardian.cgi b/html/cgi-bin/guardian.cgi index 963a56430..e15501ef5 100644 --- a/html/cgi-bin/guardian.cgi +++ b/html/cgi-bin/guardian.cgi @@ -120,7 +120,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { $errormessage =3D "$Lang::tr{'guardian invalid blocktime'}"; } =20 - # Check if the bloccount is valid. + # Check if the blockcount is valid. unless(($settings{'GUARDIAN_BLOCKCOUNT'} =3D~ /^\d+$/) && ($settings{'GUARD= IAN_BLOCKCOUNT'} ne "0")) { $errormessage =3D "$Lang::tr{'guardian invalid blockcount'}"; } @@ -183,7 +183,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { =20 # Generate the ID for the new entry. # - # Sort the keys by it's ID and store them in an array. + # Sort the keys by their ID and store them in an array. my @keys =3D sort { $a <=3D> $b } keys %ignored; =20 # Reverse the key array. @@ -664,11 +664,11 @@ sub showIgnoreBox() { END - # Check if some hosts have been add to be ignored. + # Check if some hosts have been added to be ignored. if (keys (%ignored)) { my $col =3D ""; =20 - # Loop through all entries of the hash.. + # Loop through all entries of the hash. while( (my $key) =3D each %ignored) { # Assign data array positions to some nice variable names. my $address =3D $ignored{$key}[0]; @@ -784,7 +784,7 @@ END &Header::closebox(); } =20 -# Function to list currently bocked addresses from guardian and unblock them= or add custom entries to block. +# Function to list currently blocked addresses from guardian and unblock the= m or add custom entries to block. sub showBlockedBox() { &Header::openbox('100%', 'center', $Lang::tr{'guardian blocked hosts'}); =20 @@ -795,7 +795,7 @@ sub showBlockedBox() { END =20 - # Lauch function to get the currently blocked hosts. + # Launch function to get the currently blocked hosts. my @blocked_hosts =3D &GetBlockedHosts(); =20 my $id =3D 0; @@ -828,7 +828,7 @@ END END } =20 - # If the loop only has been runs once the id still is "0", which means ther= e are no + # If the loop only has been run once the id still is "0", which means there= are no # additional entries (blocked hosts) in the iptables chain. if ($id =3D=3D 0) { =20 @@ -890,11 +890,11 @@ sub GetBlockedHosts() { # Create new, empty array. my @hosts; =20 - # Lauch helper to get chains from iptables. + # Launch helper to get chains from iptables. system('/usr/local/bin/getipstat'); =20 # Open temporary file which contains the chains and rules. - open (FILE, '/srv/web/ipfire/html/iptables.txt'); + open (FILE, '/var/tmp/iptables.txt'); =20 # Loop through the entire file. while () { @@ -909,7 +909,7 @@ sub GetBlockedHosts() { next if ($line =3D~ /^Chain/); next if ($line =3D~ /^ pkts/); =20 - # Generate array, based on the line content (seperator is a single or mul= tiple space's) + # Generate array, based on the line content (separator is a single or mul= tiple space) my @comps =3D split(/\s{1,}/, $line); my ($lead, $pkts, $bytes, $target, $prot, $opt, $in, $out, $source, $dest= ination) =3D @comps; =20 @@ -927,9 +927,9 @@ sub GetBlockedHosts() { close(FILE); =20 # Remove recently created temporary files of the "getipstat" binary. - system(rm -f "/srv/web/ipfire/html/iptables.txt"); - system(rm -f "/srv/web/ipfire/html/iptablesmangle.txt"); - system(rm -f "/srv/web/ipfire/html/iptablesnat.txt"); + system("rm -f /var/tmp/iptables.txt"); + system("rm -f /var/tmp/iptablesmangle.txt"); + system("rm -f /var/tmp/iptablesnat.txt"); =20 # Convert entries, sort them, write back and store the sorted entries into = new array. my @sorted =3D map { $_->[0] } @@ -947,7 +947,7 @@ sub BuildConfiguration() { =20 my $configfile =3D "${General::swroot}/guardian/guardian.conf"; =20 - # Create the configfile if not exist yet. + # Create the configfile if none exists yet. unless (-e "$configfile") { system("touch $configfile"); } =20 # Open configfile for writing. --=20 2.11.0 --===============1319181259291522683==--