mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Merge branch '828-rewrite-logfileconfig' into 'main'

Browse Source 
logfileconfig fixes

Closes #828

See merge request isc-projects/bind9!5411
This commit is contained in:
Evan Hunt
2021-10-13 16:26:02 +00:00
parent e857191b20 96980adbad
commit 068ab04310
24 changed files with 273 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@@ -1,3 +1,8 @@
5741. [bug] Log files with "timestamp" suffixes could be left in
place after rolling, even if the number of preserved
log files exceeded the configured "versions" limit.
[GL #828]
5740. [func] Implement incremental resizing of RBT hash table to 5740. [func] Implement incremental resizing of RBT hash table to
perform the rehashing gradually. [GL #2941] perform the rehashing gradually. [GL #2941]

6
bin/named/logconf.c
View File

@@ -299,10 +299,6 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) {
dest.file.name, dest.file.name,
isc_result_totext(result)); isc_result_totext(result));
} }
fprintf(stderr,
"isc_stdio_open '%s' failed: %s\n",
dest.file.name,
isc_result_totext(result));
} else { } else {
(void)isc_stdio_close(fp); (void)isc_stdio_close(fp);
} }
@@ -312,8 +308,6 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) {
syslog(LOG_ERR, "isc_file_isplainfile '%s' failed: %s", syslog(LOG_ERR, "isc_file_isplainfile '%s' failed: %s",
dest.file.name, isc_result_totext(result)); dest.file.name, isc_result_totext(result));
} }
fprintf(stderr, "isc_file_isplainfile '%s' failed: %s\n",
dest.file.name, isc_result_totext(result));
} }
done: done:

4
bin/named/server.c
View File

@@ -9355,8 +9355,8 @@ load_configuration(const char *filename, named_server_t *server,
logobj = NULL; logobj = NULL;
(void)cfg_map_get(config, "logging", &logobj); (void)cfg_map_get(config, "logging", &logobj);
if (logobj != NULL) { if (logobj != NULL) {
CHECKM(named_logconfig(logc, logobj), "configuring " CHECKM(named_logconfig(logc, logobj),
"logging"); "configuring logging");
} else { } else {
named_log_setdefaultchannels(logc); named_log_setdefaultchannels(logc);
CHECKM(named_log_setunmatchedcategory(logc), CHECKM(named_log_setunmatchedcategory(logc),

5
bin/tests/system/logfileconfig/clean.sh
View File

@@ -12,10 +12,9 @@
# #
# Clean up after log file tests # Clean up after log file tests
# #
rm -f ns1/rndc.conf
rm -f ns1/controls.conf
rm -f ns1/named.conf rm -f ns1/named.conf
rm -f ns1/named.pid ns1/named.run rm -f ns1/named.args
rm -f ns1/named.pid ns1/named.run ns1/named.run.prev
rm -f ns1/named.memstats ns1/dig.out rm -f ns1/named.memstats ns1/dig.out
rm -f ns1/named_log ns1/named_pipe ns1/named_sym rm -f ns1/named_log ns1/named_pipe ns1/named_sym
rm -rf ns1/named_dir rm -rf ns1/named_dir

1
bin/tests/system/logfileconfig/named1.args Normal file
View File

@@ -0,0 +1 @@
-c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -X named.lock -U 4

1
bin/tests/system/logfileconfig/named2.args Normal file
View File

@@ -0,0 +1 @@
-c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -X named.lock -U 4 -L named_deflog

16
bin/tests/system/logfileconfig/ns1/controls.conf.in
View File

@@ -1,16 +0,0 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
controls {
inet 127.0.0.1 port @CONTROLPORT@
allow { 127.0.0.1/32; ::1/128; }
keys { "rndc-key"; };
};

16
bin/tests/system/logfileconfig/ns1/named.dirconf → bin/tests/system/logfileconfig/ns1/named.dirconf.in
View File

@@ -17,27 +17,25 @@ options {
pid-file "named.pid"; pid-file "named.pid";
listen-on { 10.53.0.1; }; listen-on { 10.53.0.1; };
listen-on-v6 { none; }; listen-on-v6 { none; };
dnssec-validation no;
recursion no; recursion no;
notify yes; notify yes;
}; };
logging { logging {
channel default_log { channel default_log {
file "named_dir"; file "/tmp";
print-time yes; print-time yes;
}; };
category default { default_log; default_debug; }; category default { default_log; default_debug; };
category lame-servers { null; }; category lame-servers { null; };
}; };
include "controls.conf"; controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; };
};
key "rndc-key" { key rndc-key {
secret "1234abcd8765";
algorithm hmac-sha256; algorithm hmac-sha256;
secret "Am9vCg==";
};
zone "." {
type primary;
file "root.db";
}; };

14
bin/tests/system/logfileconfig/ns1/named.iso8601-utc → bin/tests/system/logfileconfig/ns1/named.iso8601-utc.in
View File

@@ -17,6 +17,7 @@ options {
pid-file "named.pid"; pid-file "named.pid";
listen-on { 10.53.0.1; }; listen-on { 10.53.0.1; };
listen-on-v6 { none; }; listen-on-v6 { none; };
dnssec-validation no;
recursion no; recursion no;
notify yes; notify yes;
}; };
@@ -30,14 +31,11 @@ logging {
category default { default_log; default_debug; }; category default { default_log; default_debug; };
}; };
include "controls.conf"; controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; };
};
key "rndc-key" { key rndc-key {
secret "1234abcd8765";
algorithm hmac-sha256; algorithm hmac-sha256;
secret "Am9vCg==";
};
zone "." {
type primary;
file "root.db";
}; };

15
bin/tests/system/logfileconfig/ns1/named.iso8601 → bin/tests/system/logfileconfig/ns1/named.iso8601.in
View File

@@ -17,6 +17,7 @@ options {
pid-file "named.pid"; pid-file "named.pid";
listen-on { 10.53.0.1; }; listen-on { 10.53.0.1; };
listen-on-v6 { none; }; listen-on-v6 { none; };
dnssec-validation no;
recursion no; recursion no;
notify yes; notify yes;
}; };
@@ -30,14 +31,12 @@ logging {
category default { default_log; default_debug; }; category default { default_log; default_debug; };
}; };
include "controls.conf";
key "rndc-key" { controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; };
};
key rndc-key {
secret "1234abcd8765";
algorithm hmac-sha256; algorithm hmac-sha256;
secret "Am9vCg==";
};
zone "." {
type primary;
file "root.db";
}; };

14
bin/tests/system/logfileconfig/ns1/named.pipeconf → bin/tests/system/logfileconfig/ns1/named.pipeconf.in
View File

@@ -17,6 +17,7 @@ options {
pid-file "named.pid"; pid-file "named.pid";
listen-on { 10.53.0.1; }; listen-on { 10.53.0.1; };
listen-on-v6 { none; }; listen-on-v6 { none; };
dnssec-validation no;
recursion no; recursion no;
notify yes; notify yes;
}; };
@@ -30,14 +31,11 @@ logging {
category lame-servers { null; }; category lame-servers { null; };
}; };
include "controls.conf"; controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; };
};
key "rndc-key" { key rndc-key {
secret "1234abcd8765";
algorithm hmac-sha256; algorithm hmac-sha256;
secret "Am9vCg==";
};
zone "." {
type primary;
file "root.db";
}; };

15
bin/tests/system/logfileconfig/ns1/named.plain → bin/tests/system/logfileconfig/ns1/named.plain.in
View File

@@ -17,6 +17,7 @@ options {
pid-file "named.pid"; pid-file "named.pid";
listen-on { 10.53.0.1; }; listen-on { 10.53.0.1; };
listen-on-v6 { none; }; listen-on-v6 { none; };
dnssec-validation no;
recursion no; recursion no;
notify yes; notify yes;
}; };
@@ -37,15 +38,11 @@ logging {
category queries { query_log; }; category queries { query_log; };
}; };
include "controls.conf"; controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; };
};
key "rndc-key" { key rndc-key {
secret "1234abcd8765";
algorithm hmac-sha256; algorithm hmac-sha256;
secret "Am9vCg==";
};
zone "." {
type primary;
file "root.db";
}; };

14
bin/tests/system/logfileconfig/ns1/named.plainconf → bin/tests/system/logfileconfig/ns1/named.plainconf.in
View File

@@ -17,18 +17,16 @@ options {
pid-file "named.pid"; pid-file "named.pid";
listen-on { 10.53.0.1; }; listen-on { 10.53.0.1; };
listen-on-v6 { none; }; listen-on-v6 { none; };
dnssec-validation no;
recursion no; recursion no;
notify yes; notify yes;
}; };
include "controls.conf"; controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; };
};
key "rndc-key" { key rndc-key {
secret "1234abcd8765";
algorithm hmac-sha256; algorithm hmac-sha256;
secret "Am9vCg==";
};
zone "." {
type primary;
file "root.db";
}; };

14
bin/tests/system/logfileconfig/ns1/named.symconf → bin/tests/system/logfileconfig/ns1/named.symconf.in
View File

@@ -17,6 +17,7 @@ options {
pid-file "named.pid"; pid-file "named.pid";
listen-on { 10.53.0.1; }; listen-on { 10.53.0.1; };
listen-on-v6 { none; }; listen-on-v6 { none; };
dnssec-validation no;
recursion no; recursion no;
notify yes; notify yes;
}; };
@@ -30,14 +31,11 @@ logging {
category lame-servers { null; }; category lame-servers { null; };
}; };
include "controls.conf"; controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; };
};
key "rndc-key" { key rndc-key {
secret "1234abcd8765";
algorithm hmac-sha256; algorithm hmac-sha256;
secret "Am9vCg==";
};
zone "." {
type primary;
file "root.db";
}; };

17
bin/tests/system/logfileconfig/ns1/named.tsconf → bin/tests/system/logfileconfig/ns1/named.tsconf.in
View File

@@ -17,6 +17,7 @@ options {
pid-file "named.pid"; pid-file "named.pid";
listen-on { 10.53.0.1; }; listen-on { 10.53.0.1; };
listen-on-v6 { none; }; listen-on-v6 { none; };
dnssec-validation no;
recursion no; recursion no;
notify yes; notify yes;
}; };
@@ -24,7 +25,7 @@ options {
logging { logging {
channel default_log { channel default_log {
buffered no; buffered no;
file "named_ts" versions 10 size 1000 suffix timestamp; # small size file "named_ts" versions 3 size 1000 suffix timestamp; # small size
severity debug 100; severity debug 100;
print-time yes; print-time yes;
}; };
@@ -39,15 +40,11 @@ logging {
category queries { query_log; }; category queries { query_log; };
}; };
include "controls.conf"; controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; };
};
key "rndc-key" { key rndc-key {
secret "1234abcd8765";
algorithm hmac-sha256; algorithm hmac-sha256;
secret "Am9vCg==";
};
zone "." {
type primary;
file "root.db";
}; };

15
bin/tests/system/logfileconfig/ns1/named.unlimited → bin/tests/system/logfileconfig/ns1/named.unlimited.in
View File

@@ -17,6 +17,7 @@ options {
pid-file "named.pid"; pid-file "named.pid";
listen-on { 10.53.0.1; }; listen-on { 10.53.0.1; };
listen-on-v6 { none; }; listen-on-v6 { none; };
dnssec-validation no;
recursion no; recursion no;
notify yes; notify yes;
}; };
@@ -39,15 +40,11 @@ logging {
category queries { query_log; }; category queries { query_log; };
}; };
include "controls.conf"; controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; };
};
key "rndc-key" { key rndc-key {
secret "1234abcd8765";
algorithm hmac-sha256; algorithm hmac-sha256;
secret "Am9vCg==";
};
zone "." {
type primary;
file "root.db";
}; };

15
bin/tests/system/logfileconfig/ns1/named.versconf → bin/tests/system/logfileconfig/ns1/named.versconf.in
View File

@@ -17,6 +17,7 @@ options {
pid-file "named.pid"; pid-file "named.pid";
listen-on { 10.53.0.1; }; listen-on { 10.53.0.1; };
listen-on-v6 { none; }; listen-on-v6 { none; };
dnssec-validation no;
recursion no; recursion no;
notify yes; notify yes;
}; };
@@ -39,15 +40,11 @@ logging {
category queries { query_log; }; category queries { query_log; };
}; };
include "controls.conf"; controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; };
};
key "rndc-key" { key rndc-key {
secret "1234abcd8765";
algorithm hmac-sha256; algorithm hmac-sha256;
secret "Am9vCg==";
};
zone "." {
type primary;
file "root.db";
}; };

24
bin/tests/system/logfileconfig/ns1/rndc.conf.in
View File

@@ -1,24 +0,0 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
options {
default-server 127.0.0.1;
};
server 127.0.0.1 {
key "rndc-key";
addresses { 127.0.0.1 port @CONTROLPORT@; };
};
key "rndc-key" {
algorithm hmac-sha256;
secret "Am9vCg==";
};

25
bin/tests/system/logfileconfig/ns1/root.db
View File

@@ -1,25 +0,0 @@
; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
;
; This Source Code Form is subject to the terms of the Mozilla Public
; License, v. 2.0. If a copy of the MPL was not distributed with this
; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;
; See the COPYRIGHT file distributed with this work for additional
; information regarding copyright ownership.
$TTL 300
. IN SOA gson.nominum.com. a.root.servers.nil. (
2000042100 ; serial
600 ; refresh
600 ; retry
1200 ; expire
600 ; minimum
)
. NS a.root-servers.nil.
a.root-servers.nil. A 10.53.0.1
example. NS ns2.example.
ns2.example. A 10.53.0.2
tsigzone. NS ns2.tsigzone.
ns2.tsigzone. A 10.53.0.2

4
bin/tests/system/logfileconfig/setup.sh
View File

@@ -13,6 +13,4 @@
$SHELL clean.sh $SHELL clean.sh
copy_setports ns1/named.plain ns1/named.conf copy_setports ns1/named.plain.in ns1/named.conf
copy_setports ns1/rndc.conf.in ns1/rndc.conf
copy_setports ns1/controls.conf.in ns1/controls.conf

514
bin/tests/system/logfileconfig/tests.sh
View File

@@ -10,32 +10,6 @@
# information regarding copyright ownership. # information regarding copyright ownership.
. ../conf.sh . ../conf.sh
THISDIR=`pwd`
CONFDIR="ns1"
PLAINCONF="${THISDIR}/${CONFDIR}/named.plainconf"
PLAINFILE="named_log"
DIRCONF="${THISDIR}/${CONFDIR}/named.dirconf"
DIRFILE="named_dir"
PIPECONF="${THISDIR}/${CONFDIR}/named.pipeconf"
PIPEFILE="named_pipe"
SYMCONF="${THISDIR}/${CONFDIR}/named.symconf"
SYMFILE="named_sym"
VERSCONF="${THISDIR}/${CONFDIR}/named.versconf"
VERSFILE="named_vers"
TSCONF="${THISDIR}/${CONFDIR}/named.tsconf"
TSFILE="named_ts"
UNLIMITEDCONF="${THISDIR}/${CONFDIR}/named.unlimited"
UNLIMITEDFILE="named_unlimited"
ISOCONF="${THISDIR}/${CONFDIR}/named.iso8601"
ISOFILE="named_iso8601"
ISOCONFUTC="${THISDIR}/${CONFDIR}/named.iso8601-utc"
ISOUTCFILE="named_iso8601_utc"
DLFILE="named_deflog"
PIDFILE="${THISDIR}/${CONFDIR}/named.pid"
myRNDC="$RNDC -c ${THISDIR}/${CONFDIR}/rndc.conf"
myNAMED="$NAMED -c ${THISDIR}/${CONFDIR}/named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -X named.lock -U 4"
# Test given condition. If true, test again after a second. Used for testing # Test given condition. If true, test again after a second. Used for testing
# filesystem-dependent conditions in order to prevent false negatives caused by # filesystem-dependent conditions in order to prevent false negatives caused by
@@ -50,366 +24,214 @@ test_with_retry() {
return 1 return 1
} }
waitforpidfile() {
for _w in 1 2 3 4 5 6 7 8 9 10
do
test -f $PIDFILE && break
sleep 1
done
}
status=0 status=0
n=0 n=0
cd $CONFDIR
echo_i "testing log file validity (named -g + only plain files allowed)"
n=`expr $n + 1`
echo_i "testing plain file (named -g) ($n)"
# First run with a known good config. # First run with a known good config.
echo > $PLAINFILE n=$((n+1))
copy_setports $PLAINCONF named.conf echo_i "testing log file validity (only plain files allowed) ($n)"
$myRNDC reconfig > rndc.out.test$n 2>&1 ret=0
grep "reloading configuration failed" named.run > /dev/null 2>&1 cat /dev/null > ns1/named_log
if [ $? -ne 0 ] copy_setports ns1/named.plainconf.in ns1/named.conf
then nextpart ns1/named.run > /dev/null
echo_i "testing plain file succeeded" rndc_reconfig ns1 10.53.0.1 > rndc.out.test$n
else wait_for_log 5 "reloading configuration succeeded" ns1/named.run || ret=1
echo_i "testing plain file failed (unexpected)" if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
echo_i "exit status: 1" status=$((status+ret))
exit 1
fi
# Now try directory, expect failure # Now try directory, expect failure
n=`expr $n + 1` n=$((n+1))
echo_i "testing directory as log file (named -g) ($n)"
echo > named.run
rm -rf $DIRFILE
mkdir -p $DIRFILE >/dev/null 2>&1
if [ $? -eq 0 ]
then
copy_setports $DIRCONF named.conf
echo > named.run
$myRNDC reconfig > rndc.out.test$n 2>&1
grep "checking logging configuration failed: invalid file" named.run > /dev/null 2>&1
if [ $? -ne 0 ]
then
echo_i "testing directory as file succeeded (UNEXPECTED)"
echo_i "exit status: 1"
exit 1
else
echo_i "testing directory as log file failed (expected)"
fi
else
echo_i "skipping directory test (unable to create directory)"
fi
# Now try pipe file, expect failure
n=`expr $n + 1`
echo_i "testing pipe file as log file (named -g) ($n)"
echo > named.run
rm -f $PIPEFILE
mkfifo $PIPEFILE >/dev/null 2>&1
if [ $? -eq 0 ]
then
copy_setports $PIPECONF named.conf
echo > named.run
$myRNDC reconfig > rndc.out.test$n 2>&1
grep "checking logging configuration failed: invalid file" named.run > /dev/null 2>&1
if [ $? -ne 0 ]
then
echo_i "testing pipe file as log file succeeded (UNEXPECTED)"
echo_i "exit status: 1"
exit 1
else
echo_i "testing pipe file as log file failed (expected)"
fi
else
echo_i "skipping pipe test (unable to create pipe)"
fi
# Now try symlink file to plain file, expect success
n=`expr $n + 1`
echo_i "testing symlink to plain file as log file (named -g) ($n)"
# Assume success
echo > named.run
echo > $PLAINFILE
rm -f $SYMFILE $SYMFILE
ln -s $PLAINFILE $SYMFILE >/dev/null 2>&1
if [ $? -eq 0 ]
then
copy_setports $SYMCONF named.conf
$myRNDC reconfig > rndc.out.test$n 2>&1
echo > named.run
grep "reloading configuration failed" named.run > /dev/null 2>&1
if [ $? -ne 0 ]
then
echo_i "testing symlink to plain file succeeded"
else
echo_i "testing symlink to plain file failed (unexpected)"
echo_i "exit status: 1"
exit 1
fi
else
echo_i "skipping symlink test (unable to create symlink)"
fi
# Stop the server and run through a series of tests with various config
# files while controlling the stop/start of the server.
# Have to stop the stock server because it uses "-g"
#
$PERL ../../stop.pl logfileconfig ns1
$myNAMED > /dev/null 2>&1
if [ $? -ne 0 ]
then
echo_i "failed to start $myNAMED"
echo_i "exit status: $status"
exit $status
fi
status=0
echo_i "testing log file validity (only plain files allowed)"
n=`expr $n + 1`
echo_i "testing plain file (named -g) ($n)"
# First run with a known good config.
echo > $PLAINFILE
copy_setports $PLAINCONF named.conf
$myRNDC reconfig > rndc.out.test$n 2>&1
grep "reloading configuration failed" named.run > /dev/null 2>&1
if [ $? -ne 0 ]
then
echo_i "testing plain file succeeded"
else
echo_i "testing plain file failed (unexpected)"
echo_i "exit status: 1"
exit 1
fi
# Now try directory, expect failure
n=`expr $n + 1`
echo_i "testing directory as log file ($n)" echo_i "testing directory as log file ($n)"
echo > named.run ret=0
rm -rf $DIRFILE nextpart ns1/named.run > /dev/null
mkdir -p $DIRFILE >/dev/null 2>&1 copy_setports ns1/named.dirconf.in ns1/named.conf
if [ $? -eq 0 ] rndc_reconfig ns1 10.53.0.1 > rndc.out.test$n
then wait_for_log 5 "reloading configuration failed: invalid file" ns1/named.run || ret=1
copy_setports $DIRCONF named.conf if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
echo > named.run status=$((status+ret))
$myRNDC reconfig > rndc.out.test$n 2>&1
grep "configuring logging: invalid file" named.run > /dev/null 2>&1
if [ $? -ne 0 ]
then
echo_i "testing directory as file succeeded (UNEXPECTED)"
echo_i "exit status: 1"
exit 1
else
echo_i "testing directory as log file failed (expected)"
fi
else
echo_i "skipping directory test (unable to create directory)"
fi
# Now try pipe file, expect failure # Now try pipe file, expect failure
n=`expr $n + 1` n=$((n+1))
echo_i "testing pipe file as log file ($n)" echo_i "testing pipe file as log file ($n)"
echo > named.run ret=0
rm -f $PIPEFILE nextpart ns1/named.run > /dev/null
mkfifo $PIPEFILE >/dev/null 2>&1 rm -f ns1/named_pipe
if [ $? -eq 0 ] if mkfifo ns1/named_pipe >/dev/null 2>&1; then
then copy_setports ns1/named.pipeconf.in ns1/named.conf
copy_setports $PIPECONF named.conf rndc_reconfig ns1 10.53.0.1 > rndc.out.test$n
echo > named.run wait_for_log 5 "reloading configuration failed: invalid file" ns1/named.run || ret=1
$myRNDC reconfig > rndc.out.test$n 2>&1 if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
grep "configuring logging: invalid file" named.run > /dev/null 2>&1 status=$((status+ret))
if [ $? -ne 0 ]
then
echo_i "testing pipe file as log file succeeded (UNEXPECTED)"
echo_i "exit status: 1"
exit 1
else
echo_i "testing pipe file as log file failed (expected)"
fi
else else
echo_i "skipping pipe test (unable to create pipe)" echo_i "skipping pipe test (unable to create pipe)"
fi fi
# Now try symlink file to plain file, expect success # Now try symlink file to plain file, expect success
n=`expr $n + 1` n=$((n+1))
echo_i "testing symlink to plain file as log file ($n)" echo_i "testing symlink to plain file as log file ($n)"
# Assume success ret=0
status=0 rm -f ns1/named_log ns1/named_sym
echo > named.run touch ns1/named_log
echo > $PLAINFILE if ln -s $(pwd)/ns1/named_log $(pwd)/ns1/named_sym >/dev/null 2>&1; then
rm -f $SYMFILE nextpart ns1/named.run > /dev/null
ln -s $PLAINFILE $SYMFILE >/dev/null 2>&1 copy_setports ns1/named.symconf.in ns1/named.conf
if [ $? -eq 0 ] rndc_reconfig ns1 10.53.0.1 > rndc.out.test$n
then wait_for_log 5 "reloading configuration succeeded" ns1/named.run || ret=1
copy_setports $SYMCONF named.conf if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
$myRNDC reconfig > rndc.out.test$n 2>&1 status=$((status+ret))
echo > named.run
grep "reloading configuration failed" named.run > /dev/null 2>&1
if [ $? -ne 0 ]
then
echo_i "testing symlink to plain file succeeded"
else
echo_i "testing symlink to plain file failed (unexpected)"
echo_i "exit status: 1"
exit 1
fi
else else
echo_i "skipping symlink test (unable to create symlink)" echo_i "skipping symlink test (unable to create symlink)"
fi fi
n=`expr $n + 1` echo_i "repeat previous tests without named -g"
echo_i "testing default logfile using named -L file ($n)" copy_setports ns1/named.plain.in ns1/named.conf
# Now stop the server again and test the -L option $PERL ../stop.pl --use-rndc --port ${CONTROLPORT} logfileconfig ns1
rm -f $DLFILE cp named1.args ns1/named.args
$PERL ../../stop.pl logfileconfig ns1 start_server --noclean --restart --port ${PORT} logfileconfig ns1
if ! test -f $PIDFILE; then
copy_setports $PLAINCONF named.conf
$myNAMED -L $DLFILE > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo_i "failed to start $myNAMED"
echo_i "exit status: $status"
exit $status
fi
waitforpidfile n=$((n+1))
echo_i "testing log file validity (only plain files allowed) ($n)"
ret=0
cat /dev/null > ns1/named_log
copy_setports ns1/named.plainconf.in ns1/named.conf
nextpart ns1/named.run > /dev/null
rndc_reconfig ns1 10.53.0.1 > rndc.out.test$n
wait_for_log 5 "reloading configuration succeeded" ns1/named.run || ret=1
if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
sleep 1 # Now try directory, expect failure
if [ -f "$DLFILE" ]; then n=$((n+1))
echo_i "testing default logfile using named -L succeeded" echo_i "testing directory as log file ($n)"
else ret=0
echo_i "testing default logfile using named -L failed" nextpart ns1/named.run > /dev/null
echo_i "exit status: 1" copy_setports ns1/named.dirconf.in ns1/named.conf
exit 1 rndc_reconfig ns1 10.53.0.1 > rndc.out.test$n
fi wait_for_log 5 "reloading configuration failed: invalid file" ns1/named.run || ret=1
if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
# Now try pipe file, expect failure
n=$((n+1))
echo_i "testing pipe file as log file ($n)"
ret=0
nextpart ns1/named.run > /dev/null
rm -f ns1/named_pipe
if mkfifo ns1/named_pipe >/dev/null 2>&1; then
copy_setports ns1/named.pipeconf.in ns1/named.conf
rndc_reconfig ns1 10.53.0.1 > rndc.out.test$n
wait_for_log 5 "reloading configuration failed: invalid file" ns1/named.run || ret=1
if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
else else
echo_i "failed to cleanly stop $myNAMED" echo_i "skipping pipe test (unable to create pipe)"
echo_i "exit status: 1" fi
exit 1
# Now try symlink file to plain file, expect success
n=$((n+1))
echo_i "testing symlink to plain file as log file ($n)"
ret=0
rm -f ns1/named_log ns1/named_sym
touch ns1/named_log
if ln -s $(pwd)/ns1/named_log $(pwd)/ns1/named_sym >/dev/null 2>&1; then
nextpart ns1/named.run > /dev/null
copy_setports ns1/named.symconf.in ns1/named.conf
rndc_reconfig ns1 10.53.0.1 > rndc.out.test$n
wait_for_log 5 "reloading configuration succeeded" ns1/named.run || ret=1
if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
else
echo_i "skipping symlink test (unable to create symlink)"
fi fi
echo_i "testing logging functionality" echo_i "testing logging functionality"
n=$((n+1))
n=`expr $n + 1` ret=0
echo_i "testing iso8601 timestamp ($n)" echo_i "testing iso8601 timestamp ($n)"
copy_setports $ISOCONF named.conf copy_setports ns1/named.iso8601.in ns1/named.conf
$myRNDC reconfig > rndc.out.test$n 2>&1 rndc_reconfig ns1 10.53.0.1 > rndc.out.test$n
if grep '^....-..-..T..:..:..\.... ' $ISOFILE > /dev/null; then grep '^....-..-..T..:..:..\.... ' ns1/named_iso8601 > /dev/null || ret=1
echo_i "testing iso8601 timestamp succeeded" if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
else status=$((status+ret))
echo_i "testing iso8601 timestamp failed"
status=`expr $status + 1`
fi
n=`expr $n + 1` n=$((n+1))
echo_i "testing iso8601-utc timestamp ($n)" echo_i "testing iso8601-utc timestamp ($n)"
copy_setports $ISOCONFUTC named.conf ret=0
$myRNDC reconfig > rndc.out.test$n 2>&1 copy_setports ns1/named.iso8601-utc.in ns1/named.conf
if grep '^....-..-..T..:..:..\....Z' $ISOUTCFILE > /dev/null; then rndc_reconfig ns1 10.53.0.1 > rndc.out.test$n
echo_i "testing iso8601-utc timestamp succeeded" grep '^....-..-..T..:..:..\....Z' ns1/named_iso8601_utc > /dev/null || ret=1
else if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
echo_i "testing iso8601-utc timestamp failed" status=$((status+ret))
status=`expr $status + 1`
fi
n=`expr $n + 1` n=$((n+1))
echo_i "testing explicit versions ($n)" echo_i "testing explicit versions ($n)"
copy_setports $VERSCONF named.conf ret=0
copy_setports ns1/named.versconf.in ns1/named.conf
# a seconds since epoch version number # a seconds since epoch version number
touch $VERSFILE.1480039317 touch ns1/named_vers.1480039317
t1=`$PERL -e 'print time()."\n";'` rndc_reconfig ns1 10.53.0.1 > rndc.out.test$n
$myRNDC reconfig > rndc.out.test$n 2>&1
$DIG version.bind txt ch @10.53.0.1 -p ${PORT} > dig.out.test$n $DIG version.bind txt ch @10.53.0.1 -p ${PORT} > dig.out.test$n
t2=`$PERL -e 'print time()."\n";'` grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
t=`expr ${t2:-0} - ${t1:-0}` # we are configured to retain five logfiles (a current file
if test ${t:-1000} -gt 5 # and 4 backups). so files with version number 5 or higher
then # should be removed.
echo_i "testing explicit versions failed: cleanup of old entries took too long ($t secs)" test_with_retry -f ns1/named_vers.1480039317 && ret=1
status=`expr $status + 1` test_with_retry -f ns1/named_vers.5 && ret=1
fi test_with_retry -f ns1/named_vers.4 || ret=1
if ! grep "status: NOERROR" dig.out.test$n > /dev/null if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
then status=$((status+ret))
echo_i "testing explicit versions failed: DiG lookup failed"
status=`expr $status + 1`
fi
if test_with_retry -f $VERSFILE.1480039317
then
echo_i "testing explicit versions failed: $VERSFILE.1480039317 not removed"
status=`expr $status + 1`
fi
if test_with_retry -f $VERSFILE.5
then
echo_i "testing explicit versions failed: $VERSFILE.5 exists"
status=`expr $status + 1`
fi
if test_with_retry ! -f $VERSFILE.4
then
echo_i "testing explicit versions failed: $VERSFILE.4 does not exist"
status=`expr $status + 1`
fi
n=`expr $n + 1` n=$((n+1))
echo_i "testing timestamped versions ($n)" echo_i "testing timestamped versions ($n)"
copy_setports $TSCONF named.conf ret=0
copy_setports ns1/named.tsconf.in ns1/named.conf
# a seconds since epoch version number # a seconds since epoch version number
touch $TSFILE.2015010112000012 touch ns1/named_ts.1480039317
t1=`$PERL -e 'print time()."\n";'` # a timestamp version number
$myRNDC reconfig > rndc.out.test$n 2>&1 touch ns1/named_ts.20150101120000120
$DIG version.bind txt ch @10.53.0.1 -p ${PORT} > dig.out.test$n rndc_reconfig ns1 10.53.0.1 > rndc.out.test$n
t2=`$PERL -e 'print time()."\n";'` _found2() (
t=`expr ${t2:-0} - ${t1:-0}` $DIG version.bind txt ch @10.53.0.1 -p ${PORT} > dig.out.test$n
if test ${t:-1000} -gt 5 grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
then
echo_i "testing timestamped versions failed: cleanup of old entries took too long ($t secs)"
status=`expr $status + 1`
fi
if ! grep "status: NOERROR" dig.out.test$n > /dev/null
then
echo_i "testing timestamped versions failed: DiG lookup failed"
status=`expr $status + 1`
fi
if test_with_retry -f $TSFILE.1480039317
then
echo_i "testing timestamped versions failed: $TSFILE.1480039317 not removed"
status=`expr $status + 1`
fi
n=`expr $n + 1` # we are configured to keep three versions, so the oldest
# timestamped versions should be gone, and there should
# be two new ones.
[ -f ns1/named_ts.1480039317 ] && return 1
[ -f ns1/named_ts.20150101120000120 ] && return 1
set -- ns1/named_ts.*
[ "$#" -eq 2 ] || return 1
)
retry_quiet 5 _found2 || ret=1
if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "testing unlimited versions ($n)" echo_i "testing unlimited versions ($n)"
copy_setports $UNLIMITEDCONF named.conf ret=0
copy_setports ns1/named.unlimited.in ns1/named.conf
# a seconds since epoch version number # a seconds since epoch version number
touch $UNLIMITEDFILE.1480039317 touch ns1/named_unlimited.1480039317
t1=`$PERL -e 'print time()."\n";'` rndc_reconfig ns1 10.53.0.1 > rndc.out.test$n
$myRNDC reconfig > rndc.out.test$n 2>&1
$DIG version.bind txt ch @10.53.0.1 -p ${PORT} > dig.out.test$n $DIG version.bind txt ch @10.53.0.1 -p ${PORT} > dig.out.test$n
t2=`$PERL -e 'print time()."\n";'` grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
t=`expr ${t2:-0} - ${t1:-0}` test_with_retry -f ns1/named_unlimited.1480039317 || ret=1
if test ${t:-1000} -gt 5 test_with_retry -f ns1/named_unlimited.4 || ret=1
then if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
echo_i "testing unlimited versions failed: took too long ($t secs)" status=$((status+ret))
status=`expr $status + 1`
fi n=$((n+1))
if ! grep "status: NOERROR" dig.out.test$n > /dev/null echo_i "testing default logfile using named -L file ($n)"
then ret=0
echo_i "testing unlimited versions failed: DiG lookup failed" $PERL ../stop.pl logfileconfig ns1
status=`expr $status + 1` cp named2.args ns1/named.args
fi test -f ns1/named.pid && ret=1
if test_with_retry ! -f $UNLIMITEDFILE.1480039317 rm -f ns1/named_deflog
then copy_setports ns1/named.plainconf.in ns1/named.conf
echo_i "testing unlimited versions failed: $UNLIMITEDFILE.1480039317 removed" start_server --noclean --restart --port ${PORT} logfileconfig ns1
status=`expr $status + 1` [ -f "ns1/named_deflog" ] || ret=1
fi if [ "$ret" -ne 0 ]; then echo_i "failed"; fi
if test_with_retry ! -f $UNLIMITEDFILE.4 status=$((status+ret))
then
echo_i "testing unlimited versions failed: $UNLIMITEDFILE.4 does not exist"
status=`expr $status + 1`
fi
echo_i "exit status: $status" echo_i "exit status: $status"
[ $status -eq 0 ] || exit 1 [ $status -eq 0 ] || exit 1

4
doc/notes/notes-current.rst
View File

@@ -100,3 +100,7 @@ Bug Fixes
- Reloading a catalog zone that referenced a missing/deleted zone - Reloading a catalog zone that referenced a missing/deleted zone
caused a crash. This has been fixed. :gl:`#2308` caused a crash. This has been fixed. :gl:`#2308`
- Logfiles using ``timestamp``-style suffixes were not always correctly
removed when the number of files exceeded the limit set by ``versions``.
:gl:`#828`

22
lib/isc/log.c
View File

@@ -1088,7 +1088,7 @@ greatest_version(isc_logfile_t *file, int versions, int *greatestp) {
} }
static void static void
insert_sort(int64_t to_keep[], int64_t versions, int version) { insert_sort(int64_t to_keep[], int64_t versions, int64_t version) {
int i = 0; int i = 0;
while (i < versions && version < to_keep[i]) { while (i < versions && version < to_keep[i]) {
i++; i++;
@@ -1105,12 +1105,13 @@ insert_sort(int64_t to_keep[], int64_t versions, int version) {
static int64_t static int64_t
last_to_keep(int64_t versions, isc_dir_t *dirp, char *bname, size_t bnamelen) { last_to_keep(int64_t versions, isc_dir_t *dirp, char *bname, size_t bnamelen) {
if (versions <= 0) {
return INT64_MAX;
}
int64_t to_keep[ISC_LOG_MAX_VERSIONS] = { 0 }; int64_t to_keep[ISC_LOG_MAX_VERSIONS] = { 0 };
int64_t version = 0; int64_t version = 0;
if (versions <= 0) {
return (INT64_MAX);
}
if (versions > ISC_LOG_MAX_VERSIONS) { if (versions > ISC_LOG_MAX_VERSIONS) {
versions = ISC_LOG_MAX_VERSIONS; versions = ISC_LOG_MAX_VERSIONS;
} }
@@ -1119,6 +1120,9 @@ last_to_keep(int64_t versions, isc_dir_t *dirp, char *bname, size_t bnamelen) {
*/ */
memset(to_keep, 0, sizeof(to_keep)); memset(to_keep, 0, sizeof(to_keep));
while (isc_dir_read(dirp) == ISC_R_SUCCESS) { while (isc_dir_read(dirp) == ISC_R_SUCCESS) {
char *digit_end = NULL;
char *ename = NULL;
if (dirp->entry.length <= bnamelen || if (dirp->entry.length <= bnamelen ||
strncmp(dirp->entry.name, bname, bnamelen) != 0 || strncmp(dirp->entry.name, bname, bnamelen) != 0 ||
dirp->entry.name[bnamelen] != '.') dirp->entry.name[bnamelen] != '.')
@@ -1126,8 +1130,7 @@ last_to_keep(int64_t versions, isc_dir_t *dirp, char *bname, size_t bnamelen) {
continue; continue;
} }
char *digit_end; ename = &dirp->entry.name[bnamelen + 1];
char *ename = &dirp->entry.name[bnamelen + 1];
version = strtoull(ename, &digit_end, 10); version = strtoull(ename, &digit_end, 10);
if (*digit_end == '\0') { if (*digit_end == '\0') {
insert_sort(to_keep, versions, version); insert_sort(to_keep, versions, version);
@@ -1145,12 +1148,13 @@ last_to_keep(int64_t versions, isc_dir_t *dirp, char *bname, size_t bnamelen) {
static isc_result_t static isc_result_t
remove_old_tsversions(isc_logfile_t *file, int versions) { remove_old_tsversions(isc_logfile_t *file, int versions) {
isc_result_t result; isc_result_t result;
char *bname, *digit_end; char *bname = NULL, *digit_end = NULL;
const char *dirname; const char *dirname = NULL;
int64_t version, last = INT64_MAX; int64_t version, last = INT64_MAX;
size_t bnamelen; size_t bnamelen;
isc_dir_t dir; isc_dir_t dir;
char sep = '/'; char sep = '/';
/* /*
* It is safe to DE_CONST the file.name because it was copied * It is safe to DE_CONST the file.name because it was copied
* with isc_mem_strdup(). * with isc_mem_strdup().

22
util/copyrights
View File

@@ -489,16 +489,18 @@
./bin/tests/system/limits/setup.sh SH 2018,2019,2020,2021 ./bin/tests/system/limits/setup.sh SH 2018,2019,2020,2021
./bin/tests/system/limits/tests.sh SH 2000,2001,2004,2007,2011,2012,2016,2018,2019,2020,2021 ./bin/tests/system/limits/tests.sh SH 2000,2001,2004,2007,2011,2012,2016,2018,2019,2020,2021
./bin/tests/system/logfileconfig/clean.sh SH 2011,2012,2014,2015,2016,2017,2018,2019,2020,2021 ./bin/tests/system/logfileconfig/clean.sh SH 2011,2012,2014,2015,2016,2017,2018,2019,2020,2021
./bin/tests/system/logfileconfig/ns1/named.dirconf X 2011,2013,2016,2018,2019,2020,2021 ./bin/tests/system/logfileconfig/named1.args X 2021
./bin/tests/system/logfileconfig/ns1/named.iso8601 X 2016,2018,2019,2020,2021 ./bin/tests/system/logfileconfig/named2.args X 2021
./bin/tests/system/logfileconfig/ns1/named.iso8601-utc X 2016,2018,2019,2020,2021 ./bin/tests/system/logfileconfig/ns1/named.dirconf.in X 2011,2013,2016,2018,2019,2020,2021
./bin/tests/system/logfileconfig/ns1/named.pipeconf X 2011,2013,2016,2018,2019,2020,2021 ./bin/tests/system/logfileconfig/ns1/named.iso8601-utc.in X 2016,2018,2019,2020,2021
./bin/tests/system/logfileconfig/ns1/named.plain X 2011,2013,2014,2016,2018,2019,2020 ./bin/tests/system/logfileconfig/ns1/named.iso8601.in X 2016,2018,2019,2020,2021
./bin/tests/system/logfileconfig/ns1/named.plainconf X 2014,2016,2018,2019,2020,2021 ./bin/tests/system/logfileconfig/ns1/named.pipeconf.in X 2011,2013,2016,2018,2019,2020,2021
./bin/tests/system/logfileconfig/ns1/named.symconf X 2011,2013,2016,2018,2019,2020,2021 ./bin/tests/system/logfileconfig/ns1/named.plain.in X 2011,2013,2014,2016,2018,2019,2020
./bin/tests/system/logfileconfig/ns1/named.tsconf X 2017,2018,2019,2020,2021 ./bin/tests/system/logfileconfig/ns1/named.plainconf.in X 2014,2016,2018,2019,2020,2021
./bin/tests/system/logfileconfig/ns1/named.unlimited X 2016,2018,2019,2020,2021 ./bin/tests/system/logfileconfig/ns1/named.symconf.in X 2011,2013,2016,2018,2019,2020,2021
./bin/tests/system/logfileconfig/ns1/named.versconf X 2016,2018,2019,2020,2021 ./bin/tests/system/logfileconfig/ns1/named.tsconf.in X 2017,2018,2019,2020,2021
./bin/tests/system/logfileconfig/ns1/named.unlimited.in X 2016,2018,2019,2020,2021
./bin/tests/system/logfileconfig/ns1/named.versconf.in X 2016,2018,2019,2020,2021
./bin/tests/system/logfileconfig/setup.sh SH 2011,2012,2014,2016,2018,2019,2020,2021 ./bin/tests/system/logfileconfig/setup.sh SH 2011,2012,2014,2016,2018,2019,2020,2021
./bin/tests/system/logfileconfig/tests.sh SH 2011,2012,2013,2014,2016,2017,2018,2019,2020,2021 ./bin/tests/system/logfileconfig/tests.sh SH 2011,2012,2013,2014,2016,2017,2018,2019,2020,2021
./bin/tests/system/makejournal.c C 2013,2015,2016,2017,2018,2019,2020,2021 ./bin/tests/system/makejournal.c C 2013,2015,2016,2017,2018,2019,2020,2021