Add option to not check DNSSEC expiry, which can be slow on large zone files https://sourceforge.net/p/webadmin/discussion/600155/thread/8d78d189e1

This commit is contained in:
Jamie Cameron
2021-04-20 20:56:18 -07:00
parent e9999de7a8
commit 09436eda3b
59 changed files with 79 additions and 2 deletions

View File

@ -53,3 +53,4 @@ dnssectools_keydir=/var/named/dtkeys
dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
force_random=0
spf_record=0
dnssec_info=1

View File

@ -53,3 +53,4 @@ dnssectools_keydir=/var/named/dtkeys
dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
force_random=0
spf_record=0
dnssec_info=1

View File

@ -46,3 +46,4 @@ other_slaves=1
restart_cmd=restart
force_random=0
spf_record=0
dnssec_info=1

View File

@ -46,3 +46,4 @@ other_slaves=1
restart_cmd=restart
force_random=0
spf_record=0
dnssec_info=1

View File

@ -37,3 +37,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -43,3 +43,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -42,3 +42,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -43,3 +43,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -40,3 +40,4 @@ other_slaves=1
force_random=0
spf_record=0
pid_file=/var/run/named/pid
dnssec_info=1

View File

@ -40,3 +40,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -42,3 +42,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -40,3 +40,4 @@ other_slaves=1
pid_file=/var/run/named/named.pid /private/var/run/named/named.pid
force_random=0
spf_record=0
dnssec_info=1

View File

@ -42,3 +42,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -42,3 +42,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -41,3 +41,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -41,3 +41,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -40,3 +40,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -41,3 +41,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -44,3 +44,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -41,3 +41,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -46,3 +46,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -46,3 +46,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -46,3 +46,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -42,3 +42,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -40,3 +40,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -42,3 +42,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -40,3 +40,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -40,3 +40,4 @@ checkconf=/usr/bin/named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -44,3 +44,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -45,3 +45,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -47,3 +47,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -34,3 +34,4 @@ updserial_def=0
other_slaves=1
updserial_man=1
master_ttl=1
dnssec_info=1

View File

@ -46,3 +46,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -46,3 +46,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -46,3 +46,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -39,3 +39,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -42,3 +42,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -40,3 +40,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -57,3 +57,4 @@ checkconf=named-checkconf
other_slaves=1
force_random=0
spf_record=0
dnssec_info=1

View File

@ -24,6 +24,7 @@ extra_forward=Extra record types for forward zones,0
extra_reverse=Extra record types for reverse zones,0
largezones=Show records in zones?,1,0-Yes,1-No (for large zones)
default_view=Default view for new zones,3,First in list
dnssec_info=Show DNSSEC expired zones on system information page?,1,1-Yes,0-No
line2=Zone file options,11
soa_style=Serial number style,1,0-Running number,1-Date based (YYYYMMDDnn),2-Unix time

View File

@ -323,6 +323,24 @@ while($i < @tok) {
return @rv;
}
# files_in_zone_file(file)
# Quickly finds all includes in a zone file
sub files_in_zone_file
{
my ($file) = @_;
my @rv = ( $file );
my $fh;
open($fh, "<", $file);
while(<$fh>) {
if (/^\$include\s+(\S+)/) {
my $inc = $1;
push(@rv, &files_in_zone_file($inc));
}
}
close($fh);
return @rv;
}
# create_record(file, name, ttl, class, type, values, comment)
# Add a new record of some type to some zone file
sub create_record

View File

@ -5,7 +5,8 @@ sub list_system_info
{
my ($data, $in) = @_;
my @rv;
if (&foreign_available($module_name) && $access{'defaults'}) {
if (&foreign_available($module_name) && $access{'defaults'} &&
$config{'dnssec_info'}) {
# Show DNSSEC client config errors
my $err = &check_dnssec_client();
if ($err) {
@ -14,7 +15,8 @@ if (&foreign_available($module_name) && $access{'defaults'}) {
'warning' => $err });
}
}
if (&foreign_available($module_name) && !$access{'noconfig'}) {
if (&foreign_available($module_name) && !$access{'noconfig'} &&
$config{'dnssec_info'}) {
# Show DNSSEC expired domains
my @exps = &list_dnssec_expired_domains();
if (@exps) {