# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
-
+
use strict;
# enable only the following on debugging purpose
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
&Header::showhttpheaders();
$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>;
$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;
{
$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"; }
}
}
$cgiparams{'ID'} = $cgiparams{'EDITING'};
}
}
- # Restart dnsmasq.
- system('/usr/local/bin/dnsmasqctrl restart >/dev/null');
+ # Restart unbound
+ &General::system('/usr/local/bin/unboundctrl', 'reload');
}
###
unless ($cgiparams{'ID'} eq $id) { print FILE "$line"; }
}
close(FILE);
- # Restart dnsmasq.
- system('/usr/local/bin/dnsmasqctrl restart >/dev/null');
+ # Restart unbound.
+ &General::system('/usr/local/bin/unboundctrl', 'reload');
}
###
{
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);
- # Restart dnsmasq.
- system('/usr/local/bin/dnsmasqctrl restart >/dev/null');
+ # Restart unbound.
+ &General::system('/usr/local/bin/unboundctrl', 'reload');
}
###
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";
}
}
}
$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);
print <<END
<table width='100%'>
<tr>
- <td width='20%' class='base'>$Lang::tr{'dnsforward zone'}:</td>
+ <td width='20%' class='base'>$Lang::tr{'dnsforward zone'}: <img src='/blob.gif' alt='*' /></td>
<td><input type='text' name='ZONE' value='$cgiparams{'ZONE'}' size='24' /></td>
<td width='30%' class='base'>$Lang::tr{'enabled'}<input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>
</tr>
<tr>
- <td width='20%' class='base'>$Lang::tr{'dnsforward forward_server'}:</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'}: <img src='/blob.gif' alt='*' /></td>
+ <td><input type='text' name='FORWARD_SERVERS' value='$cgiparams{'FORWARD_SERVERS'}' size='24' /></td>
</tr>
</table>
<table width='100%'>
<tr>
- <td width ='20%' class='base'>$Lang::tr{'remark'}: <img src='/blob.gif' alt='*' /></td>
+ <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>
<table width='100%'>
<tr>
- <td class='base' width='55%'><img src='/blob.gif' alt ='*' align='top' /> $Lang::tr{'this field may be blank'}</td>
+ <td class='base' width='55%'><img src='/blob.gif' alt ='*' align='top' /> $Lang::tr{'required field'}</td>
<td width='40%' align='right'>
<input type='hidden' name='ACTION' value='$Lang::tr{'add'}' />
<input type='submit' name='SUBMIT' value='$buttontext' />
<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>
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'}'"; }
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'}'>
<td class='base'>$Lang::tr{'edit'}</td>
<td> <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
<td class='base'>$Lang::tr{'remove'}</td>
+ <td> <span style="background-color: $Header::colourred"> </span></td>
+ <td class='base'>$Lang::tr{'dnsforward dnssec disabled'}</td>
</tr>
</table>
END
projects / people / pmueller / ipfire-2.x.git / blobdiff