mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

Check if key-store directory exists

Browse Source 
Similar to key-directory, check if the key-store directory exists and
if it is an actual directory.

This commit fixes an accidental test bug in checkconf where if
the "warn key-dir" test failed, the result was ignored.
This commit is contained in:
Matthijs Mekking
2022-02-09 12:19:06 +01:00
parent 594d4a81f1
commit 22d1fde1a5
3 changed files with 62 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/tests/system/checkconf/tests.sh
View File

@@ -300,20 +300,32 @@ n=$((n + 1))
echo_i "checking for missing key directory warning ($n)" echo_i "checking for missing key directory warning ($n)"
ret=0 ret=0
rm -rf test.keydir rm -rf test.keydir
rm -rf test.keystoredir
$CHECKCONF warn-keydir.conf >checkconf.out$n.1 2>&1 $CHECKCONF warn-keydir.conf >checkconf.out$n.1 2>&1
l=$(grep "'test.keydir' does not exist" <checkconf.out$n.1 | wc -l) l=$(grep "'test.keydir' does not exist" <checkconf.out$n.1 | wc -l)
[ $l -eq 1 ] || ret=1 [ $l -eq 1 ] || ret=1
l=$(grep "'test.keystoredir' does not exist" <checkconf.out$n.1 | wc -l)
[ $l -eq 1 ] || ret=1
touch test.keydir touch test.keydir
touch test.keystoredir
$CHECKCONF warn-keydir.conf >checkconf.out$n.2 2>&1 $CHECKCONF warn-keydir.conf >checkconf.out$n.2 2>&1
l=$(grep "'test.keydir' is not a directory" <checkconf.out$n.2 | wc -l) l=$(grep "'test.keydir' is not a directory" <checkconf.out$n.2 | wc -l)
[ $l -eq 1 ] || ret=1 [ $l -eq 1 ] || ret=1
l=$(grep "'test.keystoredir' is not a directory" <checkconf.out$n.2 | wc -l)
[ $l -eq 1 ] || ret=1
rm -f test.keydir rm -f test.keydir
rm -f test.keystoredir
mkdir test.keydir mkdir test.keydir
mkdir test.keystoredir
$CHECKCONF warn-keydir.conf >checkconf.out$n.3 2>&1 $CHECKCONF warn-keydir.conf >checkconf.out$n.3 2>&1
l=$(grep "key-directory" <checkconf.out$n.3 | wc -l) l=$(grep "key-directory" <checkconf.out$n.3 | wc -l)
[ $l -eq 0 ] || ret=1 [ $l -eq 0 ] || ret=1
l=$(grep "key-store directory" <checkconf.out$n.3 | wc -l)
[ $l -eq 0 ] || ret=1
rm -rf test.keydir rm -rf test.keydir
rm -rf test.keystoredir
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret))
n=$((n + 1)) n=$((n + 1))
echo_i "checking that named-checkconf -z catches conflicting ttl with max-ttl ($n)" echo_i "checking that named-checkconf -z catches conflicting ttl with max-ttl ($n)"

4
bin/tests/system/checkconf/warn-keydir.conf
View File

@@ -18,6 +18,10 @@ options {
directory "."; directory ".";
}; };
key-store "test" {
directory "test.keystoredir";
};
zone dummy { zone dummy {
type primary; type primary;
file "xxxx"; file "xxxx";

50
lib/isccfg/check.c
View File

@@ -1384,14 +1384,17 @@ check_options(const cfg_obj_t *options, const cfg_obj_t *config,
element = cfg_list_next(element)) element = cfg_list_next(element))
{ {
isc_result_t ret; isc_result_t ret;
const char *name; const char *val;
cfg_obj_t *kconfig = cfg_listelt_value(element); cfg_obj_t *kconfig = cfg_listelt_value(element);
const cfg_obj_t *kopt;
const cfg_obj_t *kobj = NULL;
if (!cfg_obj_istuple(kconfig)) { if (!cfg_obj_istuple(kconfig)) {
continue; continue;
} }
name = cfg_obj_asstring(cfg_tuple_get( val = cfg_obj_asstring(
cfg_listelt_value(element), "name")); cfg_tuple_get(kconfig, "name"));
if (strcmp(DNS_KEYSTORE_KEYDIRECTORY, name) == 0) { if (strcmp(DNS_KEYSTORE_KEYDIRECTORY, val) == 0)
{
cfg_obj_log(obj, logctx, ISC_LOG_ERROR, cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
"name '%s' not allowed", "name '%s' not allowed",
DNS_KEYSTORE_KEYDIRECTORY); DNS_KEYSTORE_KEYDIRECTORY);
@@ -1400,6 +1403,45 @@ check_options(const cfg_obj_t *options, const cfg_obj_t *config,
} }
} }
kopt = cfg_tuple_get(kconfig, "options");
if (cfg_map_get(kopt, "directory", &kobj) ==
ISC_R_SUCCESS) {
val = cfg_obj_asstring(kobj);
ret = isc_file_isdirectory(val);
switch (ret) {
case ISC_R_SUCCESS:
break;
case ISC_R_FILENOTFOUND:
cfg_obj_log(
obj, logctx,
ISC_LOG_WARNING,
"key-store directory: "
"'%s' does not exist",
val);
break;
case ISC_R_INVALIDFILE:
cfg_obj_log(
obj, logctx,
ISC_LOG_WARNING,
"key-store directory: "
"'%s' is not a "
"directory",
val);
break;
default:
cfg_obj_log(
obj, logctx,
ISC_LOG_WARNING,
"key-store directory: "
"'%s' %s",
val,
isc_result_totext(ret));
if (result == ISC_R_SUCCESS) {
result = ret;
}
}
}
ret = cfg_keystore_fromconfig( ret = cfg_keystore_fromconfig(
kconfig, mctx, logctx, &kslist, &ks); kconfig, mctx, logctx, &kslist, &ks);
if (ret != ISC_R_SUCCESS) { if (ret != ISC_R_SUCCESS) {