From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: Re: [PATCH 1/3] add option for selective PTR generation on hosts.cgi Date: Fri, 12 Apr 2019 17:10:00 +0000 Message-ID: <444cef9d-a375-c6c7-913c-c7bbe052aca4@ipfire.org> In-Reply-To: <775dba65-a075-8a3b-4c5b-6eafa8693afe@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0512570598365781318==" List-Id: --===============0512570598365781318== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, talking about patchsets, this also seems to be correctly processed by Patchwork: https://patchwork.ipfire.org/project/ipfire/list/?series=3D632 Is there a reason why it was not merged yet (e.g. base branch conflicts, or corrupt patches, or something similar)? If so, please drop me a line. Thanks, and best regards, Peter M=C3=BCller > In some cases, it might be useful to create an additional > host (i.e. for round robin loadbalancing) without assigning > another PTR to the IP address specified. >=20 > This patch introduces the ability to check or uncheck > PTR generation for each host individually. >=20 > Partially fixes #12030 >=20 > Signed-off-by: Peter M=C3=BCller > --- > html/cgi-bin/hosts.cgi | 52 +++++++++++++++++++++++++++++++++++++---------= ---- > langs/de/cgi-bin/de.pl | 2 ++ > langs/en/cgi-bin/en.pl | 2 ++ > 3 files changed, 43 insertions(+), 13 deletions(-) >=20 > diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi > index 41fe8a5b6..973c480b3 100644 > --- a/html/cgi-bin/hosts.cgi > +++ b/html/cgi-bin/hosts.cgi > @@ -2,9 +2,9 @@ > ##########################################################################= ##### > # = # > # IPFire.org - A linux based firewall = # > -# Copyright (C) 2007 Michael Tremer & Christian Schmidt = # > +# Copyright (C) 2007-2019 IPFire Team = # > # = # > -# This program is free software you can redistribute it and/or modify = # > +# This program is free software you can redistribute it and/or modify = # > # it under the terms of the GNU General Public License as published by = # > # the Free Software Foundation, either version 3 of the License, or = # > # (at your option) any later version. = # > @@ -50,9 +50,10 @@ our %settings =3D (); > #Must not be saved ! > $settings{'EN'} =3D ''; # reuse for dummy field in position zero > $settings{'IP'} =3D ''; > -$settings{'HOST'} =3D ''; =09 > -$settings{'DOM'} =3D ''; =09 > -my @nosaved=3D('EN','IP','HOST','DOM'); # List here ALL setting2 fields. M= andatory > +$settings{'HOST'} =3D ''; > +$settings{'DOM'} =3D ''; > +$settings{'PTR'} =3D ''; > +my @nosaved=3D('EN','IP','HOST','DOM','PTR'); # List here ALL setting2 fie= lds. Mandatory > =20 > $settings{'ACTION'} =3D ''; # add/edit/remove > $settings{'KEY1'} =3D ''; # point record for ACTION > @@ -78,6 +79,10 @@ if (open(FILE, "$datafile")) { > ## Settings1 Box not used... > &General::readhash("${General::swroot}/main/settings", \%settings); > =20 > +# Set PTR to off if filed was not received > +if ($settings{'PTR'} eq '') { > + $settings{'PTR'} =3D 'off'; > +} > =20 > ## Now manipulate the multi-line list with Settings2 > # Basic actions are: > @@ -122,13 +127,12 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { > $errormessage =3D $Lang::tr{'invalid domain name'}; > } > =20 > - > unless ($errormessage) { > if ($settings{'KEY1'} eq '') { #add or edit ? > - unshift (@current, "$settings{'EN'},$settings{'IP'},$settings{'HOST'}= ,$settings{'DOM'}\n"); > + unshift (@current, "$settings{'EN'},$settings{'IP'},$settings{'HOST'}= ,$settings{'DOM'},$settings{'PTR'}\n"); > &General::log($Lang::tr{'hosts config added'}); > } else { > - @current[$settings{'KEY1'}] =3D "$settings{'EN'},$settings{'IP'},$set= tings{'HOST'},$settings{'DOM'}\n"; > + @current[$settings{'KEY1'}] =3D "$settings{'EN'},$settings{'IP'},$set= tings{'HOST'},$settings{'DOM'},$settings{'PTR'}\n"; > $settings{'KEY1'} =3D ''; # End edit mode > &General::log($Lang::tr{'hosts config changed'}); > } > @@ -150,6 +154,11 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { > $settings{'IP'}=3D$temp[1]; > $settings{'HOST'}=3D$temp[2]; > $settings{'DOM'}=3D$temp[3]; > + if ($temp[4] eq '') { > + $settings{'PTR'} =3D 'on'; > + } else { > + $settings{'PTR'}=3D$temp[4]; > + } > } > =20 > if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { > @@ -190,6 +199,7 @@ if ($settings{'ACTION'} eq '' ) { # First launch from G= UI > # Place here default value when nothing is initialized > $settings{'EN'} =3D 'on'; > $settings{'DOM'} =3D $settings{'DOMAINNAME'}; > + $settings{'PTR'} =3D 'on'; > } > =20 > &Header::openpage($Lang::tr{'hostname'}, 1, ''); > @@ -238,6 +248,7 @@ if ($errormessage) { > # Second check box is for editing the list > # > $checked{'EN'}{'on'} =3D ($settings{'EN'} eq '' ) ? '' : "checked=3D'check= ed'"; > +$checked{'PTR'}{'on'} =3D ($settings{'PTR'} eq 'off' ) ? '' : "checked=3D'= checked'"; > =20 > my $buttontext =3D $Lang::tr{'add'}; > if ($settings{'KEY1'} ne '') { > @@ -257,9 +268,16 @@ print < > $Lang::tr{'hostname'}: 3D'*' > <= /td> > - > + > + > $Lang::tr{'domain name'}: > > + $Lang::tr{'generate ptr'}: > + > + > + > +   > +   > $Lang::tr{'enabled'} > > > @@ -288,7 +306,8 @@ print < > = $Lang::tr{'host ip'} > $Lang::tr{'hostname'} > - $Lang::tr{'domain name'} > + $Lang::tr{'domain name'} > + $Lang::tr{'pt= r'} > $Lang::tr{'action'} > > END > @@ -315,6 +334,12 @@ foreach my $line (@current) { > $gdesc =3D $Lang::tr{'click to enable'};=20 > } > =20 > + if ($temp[4] eq '' || $temp[4] eq 'on') { > + $temp[4] =3D $Lang::tr{'yes'}; > + } else { > + $temp[4] =3D $Lang::tr{'no'}; > + } > + > #Colorize each line > if ($settings{'KEY1'} eq $key) { > print ""; > @@ -329,6 +354,7 @@ foreach my $line (@current) { > $temp[1] > $temp[2] > $temp[3] > +$temp[4] > >
> > @@ -430,14 +456,14 @@ sub SortDataFile > my $key =3D 0; > foreach my $line (@current) { > chomp( $line); #remove newline because can be on field 5 or 6 (addition o= f REMARK) > - my @temp =3D ( '','','', ''); > + my @temp =3D ( '','','','',''); > @temp =3D split (',',$line); > =20 > # Build a pair 'Field Name',value for each of the data dataline. > # Each SORTABLE field must have is pair. > # Other data fields (non sortable) can be grouped in one > =09 > - my @record =3D ('KEY',$key++,'EN',$temp[0],'IP',$temp[1],'HOST',$temp[2],= 'DOM',$temp[3]); > + my @record =3D ('KEY',$key++,'EN',$temp[0],'IP',$temp[1],'HOST',$temp[2],= 'DOM',$temp[3],'PTR',$temp[4]); > my $record =3D {}; # create a reference to empty = hash > %{$record} =3D @record; # populate that hash with @record > $entries{$record->{KEY}} =3D $record; # add this to a hash of hashes > @@ -447,7 +473,7 @@ sub SortDataFile > =20 > # Each field value is printed , with the newline ! Don't forget separa= tor and order of them. > foreach my $entry (sort fixedleasesort keys %entries) { > - print FILE "$entries{$entry}->{EN},$entries{$entry}->{IP},$entries{$entry= }->{HOST},$entries{$entry}->{DOM}\n"; > + print FILE "$entries{$entry}->{EN},$entries{$entry}->{IP},$entries{$entry= }->{HOST},$entries{$entry}->{DOM},$entries{$entry}->{PTR}\n"; > } > =20 > close(FILE); > diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl > index 88b34d23b..b2e95b63a 100644 > --- a/langs/de/cgi-bin/de.pl > +++ b/langs/de/cgi-bin/de.pl > @@ -1262,6 +1262,7 @@ > 'generate dh key' =3D> 'Diffie-Hellman Key generieren', > 'generate iso' =3D> 'ISO erstellen', > 'generate root/host certificates' =3D> 'Erzeuge Root/Host-Zertifikate', > +'generate ptr' =3D> 'PTR erzeugen', > 'generate tripwire keys and init' =3D> 'Tripwire Initalisierung', > 'generatekeys' =3D> 'Neue Schl=C3=BCssel erzeugen', > 'generatepolicy' =3D> 'Neue Policy erstellen', > @@ -1998,6 +1999,7 @@ > 'proxy reports today' =3D> 'Heute', > 'proxy reports weekly' =3D> 'W=C3=B6chentliche Berichte', > 'psk' =3D> 'PSK', > +'ptr' =3D> 'PTR', > 'pulse' =3D> 'Puls', > 'pulse dial' =3D> 'Pulswahl:', > 'qos add subclass' =3D> 'Unterklasse hinzuf=C3=BCgen', > diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl > index af0d514af..cbe1ed75e 100644 > --- a/langs/en/cgi-bin/en.pl > +++ b/langs/en/cgi-bin/en.pl > @@ -1294,6 +1294,7 @@ > 'generate dh key' =3D> 'Generate Diffie-Hellman parameters', > 'generate iso' =3D> 'Generate ISO', > 'generate root/host certificates' =3D> 'Generate root/host certificates', > +'generate ptr' =3D> 'Generate PTR', > 'generate tripwire keys and init' =3D> 'generate tripwire keys and init', > 'generatekeys' =3D> 'Generate Keys', > 'generatepolicy' =3D> 'Generate new policy', > @@ -2036,6 +2037,7 @@ > 'proxy reports today' =3D> 'Today', > 'proxy reports weekly' =3D> 'Weekly reports', > 'psk' =3D> 'PSK', > +'ptr' =3D> 'PTR', > 'pulse' =3D> 'Pulse', > 'pulse dial' =3D> 'Pulse dial:', > 'qos add subclass' =3D> 'Add subclass', >=20 --=20 The road to Hades is easy to travel. -- Bion of Borysthenes --===============0512570598365781318==--