From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] Fix for guardian-CGI: As a result of fixing BUG11318 Date: Mon, 17 Apr 2017 12:27:22 +0100 Message-ID: <1492428442.11653.42.camel@ipfire.org> In-Reply-To: <20170416221602.15439-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6044078879032101908==" List-Id: --===============6044078879032101908== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, On Mon, 2017-04-17 at 00:16 +0200, Matthias Fischer wrote: > This is necessary because commit bf1985fae5baca327fcded31264f45638442f02e > changes the > place where temporary files from 'iptables' are stored. To which commit are you referring to? There is no commit like that in the mainline repository: http://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dcommit;h=3Dbf1985fae5baca327fcd= ed31264f45638442f02e -Michael >=20 > Some typos where fixed, too. >=20 > Best, > Matthias >=20 > Signed-off-by: Matthias Fischer > --- > =C2=A0html/cgi-bin/guardian.cgi | 28 ++++++++++++++-------------- > =C2=A01 file changed, 14 insertions(+), 14 deletions(-) >=20 > 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'}) { > =C2=A0 $errormessage =3D "$Lang::tr{'guardian invalid > blocktime'}"; > =C2=A0 } > =C2=A0 > - # Check if the bloccount is valid. > + # Check if the blockcount is valid. > =C2=A0 unless(($settings{'GUARDIAN_BLOCKCOUNT'} =3D~ /^\d+$/) && > ($settings{'GUARDIAN_BLOCKCOUNT'} ne "0")) { > =C2=A0 $errormessage =3D "$Lang::tr{'guardian invalid > blockcount'}"; > =C2=A0 } > @@ -183,7 +183,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { > =C2=A0 > =C2=A0 # Generate the ID for the new entry. > =C2=A0 # > - # 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. > =C2=A0 my @keys =3D sort { $a <=3D> $b } keys %ignored; > =C2=A0 > =C2=A0 # Reverse the key array. > @@ -664,11 +664,11 @@ sub showIgnoreBox() { > =C2=A0 bgcolor=3D'$color{'color20'}'> > =C2=A0 > =C2=A0END > - # Check if some hosts have been add to be ignored. > + # Check if some hosts have been added to be ignored. > =C2=A0 if (keys (%ignored)) { > =C2=A0 my $col =3D ""; > =C2=A0 > - # Loop through all entries of the hash.. > + # Loop through all entries of the hash. > =C2=A0 while( (my $key) =3D each %ignored)=C2=A0=C2=A0{ > =C2=A0 # Assign data array positions to some > nice variable names. > =C2=A0 my $address =3D $ignored{$key}[0]; > @@ -784,7 +784,7 @@ END > =C2=A0 &Header::closebox(); > =C2=A0} > =C2=A0 > -# Function to list currently bocked addresses from guardian and unblock th= em > or add custom entries to block. > +# Function to list currently blocked addresses from guardian and unblock t= hem > or add custom entries to block. > =C2=A0sub showBlockedBox() { > =C2=A0 &Header::openbox('100%', 'center', $Lang::tr{'guardian blocked > hosts'}); > =C2=A0 > @@ -795,7 +795,7 @@ sub showBlockedBox() { > =C2=A0 > =C2=A0END > =C2=A0 > - # Lauch function to get the currently blocked hosts. > + # Launch function to get the currently blocked hosts. > =C2=A0 my @blocked_hosts =3D &GetBlockedHosts(); > =C2=A0 > =C2=A0 my $id =3D 0; > @@ -828,7 +828,7 @@ END > =C2=A0END > =C2=A0 } > =C2=A0 > - # If the loop only has been runs once the id still is "0", which > means there are no > + # If the loop only has been run once the id still is "0", which means > there are no > =C2=A0 # additional entries (blocked hosts) in the iptables chain. > =C2=A0 if ($id =3D=3D 0) { > =C2=A0 > @@ -890,11 +890,11 @@ sub GetBlockedHosts() { > =C2=A0 # Create new, empty array. > =C2=A0 my @hosts; > =C2=A0 > - # Lauch helper to get chains from iptables. > + # Launch helper to get chains from iptables. > =C2=A0 system('/usr/local/bin/getipstat'); > =C2=A0 > =C2=A0 # Open temporary file which contains the chains and rules. > - open (FILE, '/srv/web/ipfire/html/iptables.txt'); > + open (FILE, '/var/tmp/iptables.txt'); > =C2=A0 > =C2=A0 # Loop through the entire file. > =C2=A0 while () { > @@ -909,7 +909,7 @@ sub GetBlockedHosts() { > =C2=A0 next if ($line =3D~ /^Chain/); > =C2=A0 next if ($line =3D~ /^ pkts/); > =C2=A0 > - # Generate array, based on the line content > (seperator is a single or multiple space's) > + # Generate array, based on the line content > (separator is a single or multiple space) > =C2=A0 my @comps =3D split(/\s{1,}/, $line); > =C2=A0 my ($lead, $pkts, $bytes, $target, $prot, $opt, $in, > $out, $source, $destination) =3D @comps; > =C2=A0 > @@ -927,9 +927,9 @@ sub GetBlockedHosts() { > =C2=A0 close(FILE); > =C2=A0 > =C2=A0 # 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"); > =C2=A0 > =C2=A0 # Convert entries, sort them, write back and store the sorted entries > into new array. > =C2=A0 my @sorted =3D map=C2=A0=C2=A0{ $_->[0] } > @@ -947,7 +947,7 @@ sub BuildConfiguration() { > =C2=A0 > =C2=A0 my $configfile =3D "${General::swroot}/guardian/guardian.conf"; > =C2=A0 > - # Create the configfile if not exist yet. > + # Create the configfile if none exists yet. > =C2=A0 unless (-e "$configfile") { system("touch $configfile"); } > =C2=A0 > =C2=A0 # Open configfile for writing. --===============6044078879032101908== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlk5S2FhQUFvSkVJQjU4UDl2a0FrSGF3OFAvMjBLc0l1aUxlQXNORTU1ckNILzFhZ2sK TlVJdERDRXBNd2c2L2w0SzQrWGxrRjI3em5jZlhQYVV4MnFNWnppaDhsQjVmZTAvQS9JWTNYRWZy cGk4VGg3Twp3WGNjd3Z3QUYzZVc2ZVUyTk43SVdzNm52L2NwaDlBT2tqQlR0eHk2eGd2TEI4cVcr VkFReS9xQzFUTWZkeVBRCktna01mUk5wcFhRT2JKZkJNTXY0aEs0MFE5Mms1dXNySmMvZ0ZDdnZ1 L2hHV05xdXUzeGFwYW9TZ0ZLUjdWd3cKWG1LN2xHSzlsOE92VlhaaERjUHhmTlN5V3lBSW9uODk4 cXpIdzNSWitXN2svZm5zMVcwbGpJejF2TzNSR2cxOQpSMGRNZFk2ZzBabDhCVEJnVGpDYytKT25D dk10VTZVL21lRFd1L0NUSysxRnFud2lmZVJtZ2M4UVl6YnBPZlI2CnFZUHJZU3JoZWZ0NVcxTkdI S3phZDJQblF3S2ExUGx4UlJMQUV2ZWhnaXJxMUtJVmxudmRtcFVUd3hnam5CUHoKS3JOUVFMQ2Yr Tk1yS3Y5KzMrbzZIOEF4S1IvMFhja2xKcTRRbTBZMy9sSDVSZVA4em9wY1hvVE8xVEkveWhqUApO MmFMRDVSUFcrSkppVlg2SzViZXMxV0lvRi9qSlJXbkI4Y3Q5ZGE5ay9GYXRVeDluZ016SExnQ1VG WGFoT25NCkh3M0pQOW1QK2RBSlNyakp3SXRDR2ZjVm9pNzFtTkJ6YThMMUdQSzVPVDFNYWxUTDN2 ajBGajhURmJ6TVRVSGIKTjFtYTdFZGFQSGZHYms4cFNPV3RoWHhwYnpMbGE4Ty9GQm10K3pMeVZU QWpHZkJTTHBkN3ZBQ1dOcStxbHcyRApKeGxGemdiY0Y4dm1vR0I3RUJGSwo9aFlaLwotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============6044078879032101908==--