dnsforward.cgi: Add DNSSEC option to legend

[ipfire-2.x.git] / html / cgi-bin / dnsforward.cgi

diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi
index ee63c6dd75853a1ed36b3baeaaf7802f9cf603cf..626b664fda11ae2ec598f68510bfdb4b581bcf6b 100644 (file)
--- a/html/cgi-bin/dnsforward.cgi
+++ b/html/cgi-bin/dnsforward.cgi
@@ -50,8 +50,9 @@ my %mainsettings = ();
 $cgiparams{'ENABLED'} = 'off';
 $cgiparams{'ACTION'} = '';
 $cgiparams{'ZONE'} = '';
-$cgiparams{'FORWARD_SERVER'} = '';
+$cgiparams{'FORWARD_SERVERS'} = '';
 $cgiparams{'REMARK'} ='';
+$cgiparams{'DISABLE_DNSSEC'} = 'off';
 &Header::getcgihash(\%cgiparams);
 open(FILE, $filename) or die 'Unable to open config file.';
 my @current = <FILE>;
@@ -67,22 +68,38 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'add'})
                $errormessage = $Lang::tr{'invalid domain name'};
        }
 
-       # Check if the settings for the forward server are valid.
-       unless(&General::validip($cgiparams{'FORWARD_SERVER'})) {
-               $errormessage = $Lang::tr{'invalid ip'};
+       my @forward_servers = split(/\,/, $cgiparams{'FORWARD_SERVERS'});
+       foreach my $forward_server (@forward_servers) {
+               # Check if the settings for the forward server are valid.
+               unless(&General::validip($forward_server) || &General::validfqdn($forward_server)) {
+                       $errormessage = "$Lang::tr{'invalid ip or hostname'}: $forward_server";
+                       last;
+               }
+       }
+
+       if ($cgiparams{'DISABLE_DNSSEC'} !~ /^(on|off)?$/) {
+               $errormessage = $Lang::tr{'invalid input'};
        }
 
        # Go further if there was no error.
        if ( ! $errormessage)
        {
+               # Save servers separated by |
+               $cgiparams{'FORWARD_SERVERS'} = join("|", @forward_servers);
+
            # Check if a remark has been entered.
            $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'});
 
+               # Set to off if not enabled
+               if (!$cgiparams{'DISABLE_DNSSEC'}) {
+                       $cgiparams{'DISABLE_DNSSEC'} = "off";
+               }
+
                # Check if we want to edit an existing or add a new entry.
                if($cgiparams{'EDITING'} eq 'no') {
                        open(FILE,">>$filename") or die 'Unable to open config file.';
                        flock FILE, 2;
-                       print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVER'},$cgiparams{'REMARK'}\n";
+                       print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVERS'},$cgiparams{'REMARK'},$cgiparams{'DISABLE_DNSSEC'}\n";
                } else {
                        open(FILE, ">$filename") or die 'Unable to open config file.';
                        flock FILE, 2;
@@ -91,7 +108,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'add'})
                        {
                                $id++;
                                if ($cgiparams{'EDITING'} eq $id) {
-                                       print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVER'},$cgiparams{'REMARK'}\n";
+                                       print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVERS'},$cgiparams{'REMARK'},$cgiparams{'DISABLE_DNSSEC'}\n";
                                } else { print FILE "$line"; }
                        }
                }
@@ -144,7 +161,10 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'})
                {
                        chomp($line);
                        my @temp = split(/\,/,$line);
-                       print FILE "$cgiparams{'ENABLE'},$temp[1],$temp[2],$temp[3]\n";
+
+                       $temp[0] = $cgiparams{'ENABLE'};
+
+                       print FILE join(",", @temp) . "\n";
                }
        }
        close(FILE);
@@ -167,8 +187,9 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'})
                        my @temp = split(/\,/,$line);
                        $cgiparams{'ENABLED'} = $temp[0];
                        $cgiparams{'ZONE'} = $temp[1];
-                       $cgiparams{'FORWARD_SERVER'} = $temp[2];
+                       $cgiparams{'FORWARD_SERVERS'} = join(",", split(/\|/, $temp[2]));
                        $cgiparams{'REMARK'} = $temp[3];
+                       $cgiparams{'DISABLE_DNSSEC'} = ($temp[4] eq "on") ? "on" : "off";
                }
        }
 }
@@ -177,6 +198,10 @@ $checked{'ENABLED'}{'off'} = '';
 $checked{'ENABLED'}{'on'} = '';
 $checked{'ENABLED'}{$cgiparams{'ENABLED'}} = "checked='checked'";
 
+$checked{'DISABLE_DNSSEC'}{'off'} = '';
+$checked{'DISABLE_DNSSEC'}{'on'} = '';
+$checked{'DISABLE_DNSSEC'}{$cgiparams{'DISABLE_DNSSEC'}} = "checked='checked'";
+
 &Header::openpage($Lang::tr{'dnsforward configuration'}, 1, '');
 
 &Header::openbigbox('100%', 'left', '', $errormessage);
@@ -213,8 +238,8 @@ print <<END
        </tr>
 
        <tr>
-               <td width='20%' class='base'>$Lang::tr{'dnsforward forward_server'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-               <td><input type='text' name='FORWARD_SERVER' value='$cgiparams{'FORWARD_SERVER'}' size='24' /></td>
+               <td width='20%' class='base'>$Lang::tr{'dnsforward forward_servers'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+               <td><input type='text' name='FORWARD_SERVERS' value='$cgiparams{'FORWARD_SERVERS'}' size='24' /></td>
        </tr>
 </table>
 
@@ -223,6 +248,10 @@ print <<END
                <td width ='20%' class='base'>$Lang::tr{'remark'}:</td>
                <td><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='40' maxlength='50' /></td>
        </tr>
+       <tr>
+               <td width ='20%' class='base'>$Lang::tr{'dns forward disable dnssec'}:</td>
+               <td><input type='checkbox' name='DISABLE_DNSSEC' $checked{'DISABLE_DNSSEC'}{'on'} /></td>
+       </tr>
 </table>
 <br>
 <hr>
@@ -255,7 +284,7 @@ print <<END
 <table width='100%' class='tbl'>
        <tr>
                <th width='35%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward zone'}</b></th>
-               <th width='30%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward forward_server'}</b></th>
+               <th width='30%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward forward_servers'}</b></th>
                <th width='30%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></th>
                <th width='5%' class='boldbase' colspan='3' align='center'><b>$Lang::tr{'action'}</b></th>
        </tr>
@@ -284,10 +313,19 @@ foreach my $line (@current)
        my $gif = '';
        my $gdesc = '';
        my $toggle = '';
-       
+       my $notice = "";
+
+       # Format lists of servers
+       my $servers = join(", ", split(/\|/, $temp[2]));
+
+       my $disable_dnssec = $temp[4];
+
        if($cgiparams{'ACTION'} eq $Lang::tr{'edit'} && $cgiparams{'ID'} eq $id) {
                print "<tr>";
                $col="bgcolor='${Header::colouryellow}'"; }
+       elsif ($disable_dnssec eq 'on') {
+               print "<tr>";
+               $col="bgcolor='${Header::colourred}' style='color: white'"; }
        elsif ($id % 2) {
                print "<tr>";
                $col="bgcolor='$color{'color22'}'"; }
@@ -298,12 +336,16 @@ foreach my $line (@current)
        if ($temp[0] eq 'on') { $gif='on.gif'; $toggle='off'; $gdesc=$Lang::tr{'click to disable'};}
        else { $gif='off.gif'; $toggle='on'; $gdesc=$Lang::tr{'click to enable'}; }
 
+       if ($disable_dnssec eq "on") {
+               $notice = $Lang::tr{'dns forwarding dnssec disabled notice'};
+       }
+
 ###
 # Display edit page.
 #
 print <<END
-       <td align='center' $col>$temp[1]</td>
-       <td align='center' $col>$temp[2]</td>
+       <td align='center' $col>$temp[1] $notice</td>
+       <td align='center' $col>$servers</td>
        <td align='center' $col>$temp[3]</td>
        <td align='center' $col>
                <form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'>
@@ -350,6 +392,8 @@ print <<END
                <td class='base'>$Lang::tr{'edit'}</td>
                <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
                <td class='base'>$Lang::tr{'remove'}</td>
+               <td>&nbsp; &nbsp; <span style="background-color: $Header::colourred">&nbsp; &nbsp;</span></td>
+               <td class='base'>$Lang::tr{'dnsforward dnssec disabled'}</td>
        </tr>
 </table>
 END