From: Peter Müller Date: Mon, 8 Apr 2019 18:04:00 +0000 (+0000) Subject: add option for selective PTR generation on hosts.cgi X-Git-Tag: v2.23-core131~29 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=c3c2ae4475a0e99a6163027405a45a1e2b4fa8b6 add option for selective PTR generation on hosts.cgi 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. This patch introduces the ability to check or uncheck PTR generation for each host individually. Partially fixes #12030 Signed-off-by: Peter Müller Signed-off-by: Michael Tremer --- diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi index 41fe8a5b63..973c480b35 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 = (); #Must not be saved ! $settings{'EN'} = ''; # reuse for dummy field in position zero $settings{'IP'} = ''; -$settings{'HOST'} = ''; -$settings{'DOM'} = ''; -my @nosaved=('EN','IP','HOST','DOM'); # List here ALL setting2 fields. Mandatory +$settings{'HOST'} = ''; +$settings{'DOM'} = ''; +$settings{'PTR'} = ''; +my @nosaved=('EN','IP','HOST','DOM','PTR'); # List here ALL setting2 fields. Mandatory $settings{'ACTION'} = ''; # add/edit/remove $settings{'KEY1'} = ''; # point record for ACTION @@ -78,6 +79,10 @@ if (open(FILE, "$datafile")) { ## Settings1 Box not used... &General::readhash("${General::swroot}/main/settings", \%settings); +# Set PTR to off if filed was not received +if ($settings{'PTR'} eq '') { + $settings{'PTR'} = 'off'; +} ## Now manipulate the multi-line list with Settings2 # Basic actions are: @@ -122,13 +127,12 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { $errormessage = $Lang::tr{'invalid domain name'}; } - 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'}] = "$settings{'EN'},$settings{'IP'},$settings{'HOST'},$settings{'DOM'}\n"; + @current[$settings{'KEY1'}] = "$settings{'EN'},$settings{'IP'},$settings{'HOST'},$settings{'DOM'},$settings{'PTR'}\n"; $settings{'KEY1'} = ''; # End edit mode &General::log($Lang::tr{'hosts config changed'}); } @@ -150,6 +154,11 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { $settings{'IP'}=$temp[1]; $settings{'HOST'}=$temp[2]; $settings{'DOM'}=$temp[3]; + if ($temp[4] eq '') { + $settings{'PTR'} = 'on'; + } else { + $settings{'PTR'}=$temp[4]; + } } if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { @@ -190,6 +199,7 @@ if ($settings{'ACTION'} eq '' ) { # First launch from GUI # Place here default value when nothing is initialized $settings{'EN'} = 'on'; $settings{'DOM'} = $settings{'DOMAINNAME'}; + $settings{'PTR'} = 'on'; } &Header::openpage($Lang::tr{'hostname'}, 1, ''); @@ -238,6 +248,7 @@ if ($errormessage) { # Second check box is for editing the list # $checked{'EN'}{'on'} = ($settings{'EN'} eq '' ) ? '' : "checked='checked'"; +$checked{'PTR'}{'on'} = ($settings{'PTR'} eq 'off' ) ? '' : "checked='checked'"; my $buttontext = $Lang::tr{'add'}; if ($settings{'KEY1'} ne '') { @@ -257,9 +268,16 @@ print < $Lang::tr{'hostname'}: * - + + $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{'ptr'} $Lang::tr{'action'} END @@ -315,6 +334,12 @@ foreach my $line (@current) { $gdesc = $Lang::tr{'click to enable'}; } + if ($temp[4] eq '' || $temp[4] eq 'on') { + $temp[4] = $Lang::tr{'yes'}; + } else { + $temp[4] = $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 = 0; foreach my $line (@current) { chomp( $line); #remove newline because can be on field 5 or 6 (addition of REMARK) - my @temp = ( '','','', ''); + my @temp = ( '','','','',''); @temp = split (',',$line); # 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 - my @record = ('KEY',$key++,'EN',$temp[0],'IP',$temp[1],'HOST',$temp[2],'DOM',$temp[3]); + my @record = ('KEY',$key++,'EN',$temp[0],'IP',$temp[1],'HOST',$temp[2],'DOM',$temp[3],'PTR',$temp[4]); my $record = {}; # create a reference to empty hash %{$record} = @record; # populate that hash with @record $entries{$record->{KEY}} = $record; # add this to a hash of hashes @@ -447,7 +473,7 @@ sub SortDataFile # Each field value is printed , with the newline ! Don't forget separator 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"; } close(FILE); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index d63ebe6e51..39059c4d40 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1262,6 +1262,7 @@ 'generate dh key' => 'Diffie-Hellman Key generieren', 'generate iso' => 'ISO erstellen', 'generate root/host certificates' => 'Erzeuge Root/Host-Zertifikate', +'generate ptr' => 'PTR erzeugen', 'generate tripwire keys and init' => 'Tripwire Initalisierung', 'generatekeys' => 'Neue Schlüssel erzeugen', 'generatepolicy' => 'Neue Policy erstellen', @@ -1998,6 +1999,7 @@ 'proxy reports today' => 'Heute', 'proxy reports weekly' => 'Wöchentliche Berichte', 'psk' => 'PSK', +'ptr' => 'PTR', 'pulse' => 'Puls', 'pulse dial' => 'Pulswahl:', 'qos add subclass' => 'Unterklasse hinzufügen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a709604b07..2472ebf962 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1294,6 +1294,7 @@ 'generate dh key' => 'Generate Diffie-Hellman parameters', 'generate iso' => 'Generate ISO', 'generate root/host certificates' => 'Generate root/host certificates', +'generate ptr' => 'Generate PTR', 'generate tripwire keys and init' => 'generate tripwire keys and init', 'generatekeys' => 'Generate Keys', 'generatepolicy' => 'Generate new policy', @@ -2036,6 +2037,7 @@ 'proxy reports today' => 'Today', 'proxy reports weekly' => 'Weekly reports', 'psk' => 'PSK', +'ptr' => 'PTR', 'pulse' => 'Pulse', 'pulse dial' => 'Pulse dial:', 'qos add subclass' => 'Add subclass',