[master] warn if key-directory doesn't exist

3694.	[bug]		Warn when a key-directory is configured for a zone,
			but does not exist or is not a directory. [RT #35109]

diff --git a/CHANGES b/CHANGES
index 7044c024f49cad3028c0090cdcf2dc3c1296c04a..5b791fd098c0aa3b76e70844e6300282a1b987ae 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3694.  [bug]           Warn when a key-directory is configured for a zone,
+                       but does not exist or is not a directory. [RT #35109]
+
 3693.  [security]      memcpy was incorrectly called with overlapping
                        ranges resulting in malformed names being generated
                        on some platforms.  This could cause INSIST failures

diff --git a/bin/tests/system/checkconf/clean.sh b/bin/tests/system/checkconf/clean.sh
index 94f09d9bc87df223fc1cf285f740d5b73f3e13f2..c7da3d2b210ae91adff588ad7383422289ff4842 100644 (file)
--- a/bin/tests/system/checkconf/clean.sh
+++ b/bin/tests/system/checkconf/clean.sh
@@ -17,3 +17,4 @@
 # $Id: clean.sh,v 1.2 2011/05/07 05:55:17 each Exp $
 
 rm -f good.conf.in good.conf.out badzero.conf
+rm -rf test.keydir

diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index af99a37634d1bdda8e6a5221ffafaec5646e48a0..5f5988113442e04db861deae2351f1e75e565fc3 100644 (file)
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -132,5 +132,21 @@ $CHECKCONF dlz-bad.conf 2>&1 | grep "'dlz' and 'database'" > /dev/null || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
+echo "I: checking for missing key directory warning"
+ret=0
+rm -rf test.keydir
+n=`$CHECKCONF warn-keydir.conf 2>&1 | grep "'test.keydir' does not exist" | wc -l`
+[ $n -eq 1 ] || ret=1
+touch test.keydir
+n=`$CHECKCONF warn-keydir.conf 2>&1 | grep "'test.keydir' is not a directory" | wc -l`
+[ $n -eq 1 ] || ret=1
+rm -f test.keydir
+mkdir test.keydir
+n=`$CHECKCONF warn-keydir.conf 2>&1 | grep "key-directory" | wc -l`
+[ $n -eq 0 ] || ret=1
+rm -rf test.keydir
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
 echo "I:exit status: $status"
 exit $status

diff --git a/bin/tests/system/checkconf/warn-keydir.conf b/bin/tests/system/checkconf/warn-keydir.conf
new file mode 100644 (file)
index 0000000..3ee8118
--- /dev/null
+++ b/bin/tests/system/checkconf/warn-keydir.conf
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * key-directory defined but doesn't exist.
+ */
+options {
+        directory ".";
+};
+
+zone dummy {
+       type master;
+       file "xxxx";
+        key-directory "test.keydir";
+};

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 1636bc0c49aff0ad381466bf9919ebc131b0d3d1..0285b4c76c659aebfa4e48709c82b6b3f1e0e539 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -25,6 +25,7 @@
 
 #include <isc/base64.h>
 #include <isc/buffer.h>
+#include <isc/file.h>
 #include <isc/log.h>
 #include <isc/mem.h>
 #include <isc/netaddr.h>
@@ -1914,6 +1915,35 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
                }
        }
 
+       /*
+        * Warn if key-directory doesn't exist
+        */
+       obj = NULL;
+       tresult = cfg_map_get(zoptions, "key-directory", &obj);
+       if (tresult == ISC_R_SUCCESS) {
+               const char *dir = cfg_obj_asstring(obj);
+               tresult = isc_file_isdirectory(dir);
+               switch (tresult) {
+               case ISC_R_SUCCESS:
+                       break;
+               case ISC_R_FILENOTFOUND:
+                       cfg_obj_log(obj, logctx, ISC_LOG_WARNING,
+                                   "key-directory: '%s' does not exist",
+                                   dir);
+                       break;
+               case ISC_R_INVALIDFILE:
+                       cfg_obj_log(obj, logctx, ISC_LOG_WARNING,
+                                   "key-directory: '%s' is not a directory",
+                                   dir);
+                       break;
+               default:
+                       cfg_obj_log(obj, logctx, ISC_LOG_WARNING,
+                                   "key-directory: '%s' %s",
+                                   dir, isc_result_totext(tresult));
+                       result = tresult;
+               }
+       }
+
        /*
         * Check various options.
         */