1 files changed, 363 insertions, 92 deletions

diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 2bbd1e05..9ea19e6a 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -3,7 +3,7 @@
  * Monitoring check_dig plugin
  *
  * License: GPL
- * Copyright (c) 2002-2024 Monitoring Plugins Development Team
+ * Copyright (c) 2002-2025 Monitoring Plugins Development Team
  *
  * Description:
  *
@@ -33,105 +33,132 @@
  *  because on some architectures those strings are in non-writable memory */
 
 const char *progname = "check_dig";
-const char *copyright = "2002-2024";
+const char *copyright = "2002-2025";
 const char *email = "devel@monitoring-plugins.org";
 
+#include <ctype.h>
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
 #include "runcmd.h"
 
-static int process_arguments(int /*argc*/, char ** /*argv*/);
-static int validate_arguments(void);
+#include "check_dig.d/config.h"
+#include "states.h"
+
+typedef struct {
+        int errorcode;
+        check_dig_config config;
+} check_dig_config_wrapper;
+static check_dig_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static check_dig_config_wrapper validate_arguments(check_dig_config_wrapper /*config_wrapper*/);
+
 static void print_help(void);
 void print_usage(void);
 
-#define UNDEFINED     0
-#define DEFAULT_PORT  53
-#define DEFAULT_TRIES 2
-
-static char *query_address = NULL;
-static char *record_type = "A";
-static char *expected_address = NULL;
-static char *dns_server = NULL;
-static char *dig_args = "";
-static char *query_transport = "";
-static bool verbose = false;
-static int server_port = DEFAULT_PORT;
-static int number_tries = DEFAULT_TRIES;
-static double warning_interval = UNDEFINED;
-static double critical_interval = UNDEFINED;
-static struct timeval tv;
+static int verbose = 0;
 
-int main(int argc, char **argv) {
-        char *command_line;
-        output chld_out;
-        output chld_err;
-        char *msg = NULL;
-        size_t i;
-        char *t;
-        long microsec;
-        double elapsed_time;
-        int result = STATE_UNKNOWN;
-        int timeout_interval_dig;
+/* helpers for flag parsing */
+static flag_list parse_flags_line(const char *line);
+static flag_list split_csv_trim(const char *csv);
+static bool flag_list_contains(const flag_list *list, const char *needle);
+static void free_flag_list(flag_list *list);
 
+int main(int argc, char **argv) {
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
 
         /* Set signal handling and alarm */
-        if (signal(SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR)
+        if (signal(SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
                 usage_va(_("Cannot catch SIGALRM"));
+        }
 
         /* Parse extra opts if any */
         argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments(argc, argv) == ERROR)
+        check_dig_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
                 usage_va(_("Could not parse arguments"));
+        }
+
+        const check_dig_config config = tmp_config.config;
 
         /* dig applies the timeout to each try, so we need to work around this */
-        timeout_interval_dig = timeout_interval / number_tries + number_tries;
+        int timeout_interval_dig = ((int)timeout_interval / config.number_tries) + config.number_tries;
 
+        char *command_line;
         /* get the command to run */
-        xasprintf(&command_line, "%s %s %s -p %d @%s %s %s +retry=%d +time=%d", PATH_TO_DIG, dig_args, query_transport, server_port, dns_server,
-                          query_address, record_type, number_tries, timeout_interval_dig);
+        xasprintf(&command_line, "%s %s %s -p %d @%s %s %s +retry=%d +time=%d", PATH_TO_DIG,
+                          config.dig_args, config.query_transport, config.server_port, config.dns_server,
+                          config.query_address, config.record_type, config.number_tries, timeout_interval_dig);
 
         alarm(timeout_interval);
-        gettimeofday(&tv, NULL);
+        struct timeval start_time;
+        gettimeofday(&start_time, NULL);
 
         if (verbose) {
                 printf("%s\n", command_line);
-                if (expected_address != NULL) {
-                        printf(_("Looking for: '%s'\n"), expected_address);
+                if (config.expected_address != NULL) {
+                        printf(_("Looking for: '%s'\n"), config.expected_address);
                 } else {
-                        printf(_("Looking for: '%s'\n"), query_address);
+                        printf(_("Looking for: '%s'\n"), config.query_address);
                 }
         }
 
+        output chld_out;
+        output chld_err;
+        char *msg = NULL;
+        flag_list dig_flags = {.items = NULL, .count = 0};
+        mp_state_enum result = STATE_UNKNOWN;
+
         /* run the command */
         if (np_runcmd(command_line, &chld_out, &chld_err, 0) != 0) {
                 result = STATE_WARNING;
                 msg = (char *)_("dig returned an error status");
         }
 
-        for (i = 0; i < chld_out.lines; i++) {
+        /* extract ';; flags: ...' from stdout (first occurrence) */
+        for (size_t i = 0; i < chld_out.lines; i++) {
+                if (strstr(chld_out.line[i], "flags:")) {
+                        if (verbose) {
+                                printf("Raw flags line: %s\n", chld_out.line[i]);
+                        }
+
+                        dig_flags = parse_flags_line(chld_out.line[i]);
+
+                        if (verbose && dig_flags.count > 0) {
+                                printf(_("Parsed flags:"));
+                                for (size_t k = 0; k < dig_flags.count; k++) {
+                                        printf(" %s", dig_flags.items[k]);
+                                }
+                                printf("\n");
+                        }
+                        break;
+                }
+        }
+
+        for (size_t i = 0; i < chld_out.lines; i++) {
                 /* the server is responding, we just got the host name... */
                 if (strstr(chld_out.line[i], ";; ANSWER SECTION:")) {
 
                         /* loop through the whole 'ANSWER SECTION' */
                         for (; i < chld_out.lines; i++) {
                                 /* get the host address */
-                                if (verbose)
+                                if (verbose) {
                                         printf("%s\n", chld_out.line[i]);
+                                }
 
-                                if (strcasestr(chld_out.line[i], (expected_address == NULL ? query_address : expected_address)) != NULL) {
+                                if (strcasestr(chld_out.line[i], (config.expected_address == NULL
+                                                                                                          ? config.query_address
+                                                                                                          : config.expected_address)) != NULL) {
                                         msg = chld_out.line[i];
                                         result = STATE_OK;
 
                                         /* Translate output TAB -> SPACE */
-                                        t = msg;
-                                        while ((t = strchr(t, '\t')) != NULL)
-                                                *t = ' ';
+                                        char *temp = msg;
+                                        while ((temp = strchr(temp, '\t')) != NULL) {
+                                                *temp = ' ';
+                                        }
                                         break;
                                 }
                         }
@@ -154,43 +181,84 @@ int main(int argc, char **argv) {
         /* If we get anything on STDERR, at least set warning */
         if (chld_err.buflen > 0) {
                 result = max_state(result, STATE_WARNING);
-                if (!msg)
-                        for (i = 0; i < chld_err.lines; i++) {
+                if (!msg) {
+                        for (size_t i = 0; i < chld_err.lines; i++) {
                                 msg = strchr(chld_err.line[0], ':');
                                 if (msg) {
                                         msg++;
                                         break;
                                 }
                         }
+                }
         }
 
-        microsec = deltime(tv);
-        elapsed_time = (double)microsec / 1.0e6;
+        long microsec = deltime(start_time);
+        double elapsed_time = (double)microsec / 1.0e6;
 
-        if (critical_interval > UNDEFINED && elapsed_time > critical_interval)
+        if (config.critical_interval > UNDEFINED && elapsed_time > config.critical_interval) {
                 result = STATE_CRITICAL;
+        }
 
-        else if (warning_interval > UNDEFINED && elapsed_time > warning_interval)
+        else if (config.warning_interval > UNDEFINED && elapsed_time > config.warning_interval) {
                 result = STATE_WARNING;
+        }
+
+        /* Optional: evaluate dig flags only if -E/-X were provided */
+        if ((config.require_flags.count > 0) || (config.forbid_flags.count > 0)) {
+                if (dig_flags.count > 0) {
+                        for (size_t r = 0; r < config.require_flags.count; r++) {
+                                if (!flag_list_contains(&dig_flags, config.require_flags.items[r])) {
+                                        result = STATE_CRITICAL;
+                                        if (!msg) {
+                                                xasprintf(&msg, _("Missing required DNS flag: %s"),
+                                                                  config.require_flags.items[r]);
+                                        } else {
+                                                char *newmsg = NULL;
+                                                xasprintf(&newmsg, _("%s; missing required DNS flag: %s"), msg,
+                                                                  config.require_flags.items[r]);
+                                                msg = newmsg;
+                                        }
+                                }
+                        }
+
+                        for (size_t r = 0; r < config.forbid_flags.count; r++) {
+                                if (flag_list_contains(&dig_flags, config.forbid_flags.items[r])) {
+                                        result = STATE_CRITICAL;
+                                        if (!msg) {
+                                                xasprintf(&msg, _("Forbidden DNS flag present: %s"),
+                                                                  config.forbid_flags.items[r]);
+                                        } else {
+                                                char *newmsg = NULL;
+                                                xasprintf(&newmsg, _("%s; forbidden DNS flag present: %s"), msg,
+                                                                  config.forbid_flags.items[r]);
+                                                msg = newmsg;
+                                        }
+                                }
+                        }
+                }
+        }
+
+        /* cleanup flags buffer */
+        free_flag_list(&dig_flags);
 
         printf("DNS %s - %.3f seconds response time (%s)|%s\n", state_text(result), elapsed_time,
                    msg ? msg : _("Probably a non-existent host/domain"),
-                   fperfdata("time", elapsed_time, "s", (warning_interval > UNDEFINED ? true : false), warning_interval,
-                                         (critical_interval > UNDEFINED ? true : false), critical_interval, true, 0, false, 0));
-        return result;
+                   fperfdata("time", elapsed_time, "s", (config.warning_interval > UNDEFINED),
+                                         config.warning_interval, (config.critical_interval > UNDEFINED),
+                                         config.critical_interval, true, 0, false, 0));
+        exit(result);
 }
 
 /* process command-line arguments */
-int process_arguments(int argc, char **argv) {
-        int c;
-
-        int option = 0;
+check_dig_config_wrapper process_arguments(int argc, char **argv) {
         static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
                                                                            {"query_address", required_argument, 0, 'l'},
                                                                            {"warning", required_argument, 0, 'w'},
                                                                            {"critical", required_argument, 0, 'c'},
                                                                            {"timeout", required_argument, 0, 't'},
                                                                            {"dig-arguments", required_argument, 0, 'A'},
+                                                                           {"require-flags", required_argument, 0, 'E'},
+                                                                           {"forbid-flags", required_argument, 0, 'X'},
                                                                            {"verbose", no_argument, 0, 'v'},
                                                                            {"version", no_argument, 0, 'V'},
                                                                            {"help", no_argument, 0, 'h'},
@@ -201,16 +269,26 @@ int process_arguments(int argc, char **argv) {
                                                                            {"use-ipv6", no_argument, 0, '6'},
                                                                            {0, 0, 0, 0}};
 
-        if (argc < 2)
-                return ERROR;
+        check_dig_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_dig_config_init(),
+        };
+
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-        while (1) {
-                c = getopt_long(argc, argv, "hVvt:l:H:w:c:T:p:a:A:46", longopts, &option);
+        int option = 0;
+        while (true) {
+                int option_index =
+                        getopt_long(argc, argv, "hVvt:l:H:w:c:T:p:a:A:E:X:46", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_index == -1 || option_index == EOF) {
                         break;
+                }
 
-                switch (c) {
+                switch (option_index) {
                 case 'h': /* help */
                         print_help();
                         exit(STATE_UNKNOWN);
@@ -219,28 +297,28 @@ int process_arguments(int argc, char **argv) {
                         exit(STATE_UNKNOWN);
                 case 'H': /* hostname */
                         host_or_die(optarg);
-                        dns_server = optarg;
+                        result.config.dns_server = optarg;
                         break;
                 case 'p': /* server port */
                         if (is_intpos(optarg)) {
-                                server_port = atoi(optarg);
+                                result.config.server_port = atoi(optarg);
                         } else {
                                 usage_va(_("Port must be a positive integer - %s"), optarg);
                         }
                         break;
                 case 'l': /* address to lookup */
-                        query_address = optarg;
+                        result.config.query_address = optarg;
                         break;
                 case 'w': /* warning */
                         if (is_nonnegative(optarg)) {
-                                warning_interval = strtod(optarg, NULL);
+                                result.config.warning_interval = strtod(optarg, NULL);
                         } else {
                                 usage_va(_("Warning interval must be a positive integer - %s"), optarg);
                         }
                         break;
                 case 'c': /* critical */
                         if (is_nonnegative(optarg)) {
-                                critical_interval = strtod(optarg, NULL);
+                                result.config.critical_interval = strtod(optarg, NULL);
                         } else {
                                 usage_va(_("Critical interval must be a positive integer - %s"), optarg);
                         }
@@ -253,48 +331,56 @@ int process_arguments(int argc, char **argv) {
                         }
                         break;
                 case 'A': /* dig arguments */
-                        dig_args = strdup(optarg);
+                        result.config.dig_args = strdup(optarg);
+                        break;
+                case 'E': /* require flags */
+                        result.config.require_flags = split_csv_trim(optarg);
+                        break;
+                case 'X': /* forbid flags */
+                        result.config.forbid_flags = split_csv_trim(optarg);
                         break;
                 case 'v': /* verbose */
-                        verbose = true;
+                        verbose++;
                         break;
                 case 'T':
-                        record_type = optarg;
+                        result.config.record_type = optarg;
                         break;
                 case 'a':
-                        expected_address = optarg;
+                        result.config.expected_address = optarg;
                         break;
                 case '4':
-                        query_transport = "-4";
+                        result.config.query_transport = "-4";
                         break;
                 case '6':
-                        query_transport = "-6";
+                        result.config.query_transport = "-6";
                         break;
                 default: /* usage5 */
                         usage5();
                 }
         }
 
-        c = optind;
-        if (dns_server == NULL) {
-                if (c < argc) {
-                        host_or_die(argv[c]);
-                        dns_server = argv[c];
+        int index = optind;
+        if (result.config.dns_server == NULL) {
+                if (index < argc) {
+                        host_or_die(argv[index]);
+                        result.config.dns_server = argv[index];
                 } else {
-                        if (strcmp(query_transport, "-6") == 0)
-                                dns_server = strdup("::1");
-                        else
-                                dns_server = strdup("127.0.0.1");
+                        if (strcmp(result.config.query_transport, "-6") == 0) {
+                                result.config.dns_server = strdup("::1");
+                        } else {
+                                result.config.dns_server = strdup("127.0.0.1");
+                        }
                 }
         }
 
-        return validate_arguments();
+        return validate_arguments(result);
 }
 
-int validate_arguments(void) {
-        if (query_address != NULL)
-                return OK;
-        return ERROR;
+check_dig_config_wrapper validate_arguments(check_dig_config_wrapper config_wrapper) {
+        if (config_wrapper.config.query_address == NULL) {
+                config_wrapper.errorcode = ERROR;
+        }
+        return config_wrapper;
 }
 
 void print_help(void) {
@@ -328,10 +414,15 @@ void print_help(void) {
         printf(" %s\n", "-T, --record_type=STRING");
         printf("    %s\n", _("Record type to lookup (default: A)"));
         printf(" %s\n", "-a, --expected_address=STRING");
-        printf("    %s\n", _("An address expected to be in the answer section. If not set, uses whatever"));
+        printf("    %s\n",
+                   _("An address expected to be in the answer section. If not set, uses whatever"));
         printf("    %s\n", _("was in -l"));
         printf(" %s\n", "-A, --dig-arguments=STRING");
         printf("    %s\n", _("Pass STRING as argument(s) to dig"));
+        printf(" %s\n", "-E, --require-flags=LIST");
+        printf("    %s\n", _("Comma-separated dig flags that must be present (e.g. 'aa,qr')"));
+        printf(" %s\n", "-X, --forbid-flags=LIST");
+        printf("    %s\n", _("Comma-separated dig flags that must NOT be present"));
         printf(UT_WARN_CRIT);
         printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
         printf(UT_VERBOSE);
@@ -348,5 +439,185 @@ void print_usage(void) {
         printf("%s\n", _("Usage:"));
         printf("%s -l <query_address> [-H <host>] [-p <server port>]\n", progname);
         printf(" [-T <query type>] [-w <warning interval>] [-c <critical interval>]\n");
-        printf(" [-t <timeout>] [-a <expected answer address>] [-v]\n");
+        printf(" [-t <timeout>] [-a <expected answer address>] [-E <flags>] [-X <flags>] [-v]\n");
+}
+
+/* helpers */
+
+/**
+ * parse_flags_line - Parse a dig output line and extract DNS header flags.
+ *
+ * Input:
+ *   line - NUL terminated dig output line, e.g. ";; flags: qr rd ra; ..."
+ *
+ * Returns:
+ *   flag_list where:
+ *     - items: array of NUL terminated flag strings (heap allocated)
+ *     - count: number of entries in items
+ *   On parse failure or if no flags were found, count is 0 and items is NULL.
+ */
+static flag_list parse_flags_line(const char *line) {
+        flag_list result = {.items = NULL, .count = 0};
+
+        if (!line) {
+                return result;
+        }
+
+        /* Locate start of DNS header flags in dig output */
+        const char *p = strstr(line, "flags:");
+        if (!p) {
+                return result;
+        }
+        p += 6; /* skip literal "flags:" */
+
+        /* Skip whitespace after "flags:" */
+        while (*p && isspace((unsigned char)*p)) {
+                p++;
+        }
+
+        /* Flags are terminated by the next semicolon e.g. "qr rd ra;" */
+        const char *q = strchr(p, ';');
+        if (!q) {
+                return result;
+        }
+
+        /* Extract substring containing the flag block */
+        size_t len = (size_t)(q - p);
+        if (len == 0) {
+                return result;
+        }
+
+        char *buf = (char *)malloc(len + 1);
+        if (!buf) {
+                return result;
+        }
+        memcpy(buf, p, len);
+        buf[len] = '\0';
+
+        /* Tokenize flags separated by whitespace */
+        char **arr = NULL;
+        size_t cnt = 0;
+        char *saveptr = NULL;
+        char *tok = strtok_r(buf, " \t", &saveptr);
+
+        while (tok) {
+                /* Expand array for the next flag token */
+                char **tmp = (char **)realloc(arr, (cnt + 1) * sizeof(char *));
+                if (!tmp) {
+                        /* On allocation failure keep what we have and return it */
+                        break;
+                }
+                arr = tmp;
+                arr[cnt++] = strdup(tok);
+                tok = strtok_r(NULL, " \t", &saveptr);
+        }
+
+        free(buf);
+
+        result.items = arr;
+        result.count = cnt;
+        return result;
+}
+
+/**
+ * split_csv_trim - Split a comma separated string into trimmed tokens.
+ *
+ * Input:
+ *   csv - NUL terminated string, e.g. "aa, qr , rd"
+ *
+ * Returns:
+ *   flag_list where:
+ *     - items: array of NUL terminated tokens (heap allocated, whitespace trimmed)
+ *     - count: number of tokens
+ *   On empty input, count is 0 and items is NULL
+ */
+static flag_list split_csv_trim(const char *csv) {
+        flag_list result = {.items = NULL, .count = 0};
+
+        if (!csv || !*csv) {
+                return result;
+        }
+
+        char *tmp = strdup(csv);
+        if (!tmp) {
+                return result;
+        }
+
+        char *s = tmp;
+        char *token = NULL;
+
+        /* Split CSV by commas, trimming whitespace on each token */
+        while ((token = strsep(&s, ",")) != NULL) {
+                /* trim leading whitespace */
+                while (*token && isspace((unsigned char)*token)) {
+                        token++;
+                }
+
+                /* trim trailing whitespace */
+                char *end = token + strlen(token);
+                while (end > token && isspace((unsigned char)end[-1])) {
+                        *--end = '\0';
+                }
+
+                if (*token) {
+                        /* Expand the items array and append the token */
+                        char **arr = (char **)realloc(result.items, (result.count + 1) * sizeof(char *));
+                        if (!arr) {
+                                /* Allocation failed, stop and return what we have */
+                                break;
+                        }
+                        result.items = arr;
+                        result.items[result.count++] = strdup(token);
+                }
+        }
+
+        free(tmp);
+        return result;
+}
+
+/**
+ * flag_list_contains - Case-insensitive membership test in a flag_list.
+ *
+ * Input:
+ *   list   - pointer to a flag_list
+ *   needle - NUL terminated string to search for
+ *
+ * Returns:
+ *   true  if needle is contained in list (strcasecmp)
+ *   false otherwise
+ */
+static bool flag_list_contains(const flag_list *list, const char *needle) {
+        if (!list || !needle || !*needle) {
+                return false;
+        }
+
+        for (size_t i = 0; i < list->count; i++) {
+                if (strcasecmp(list->items[i], needle) == 0) {
+                        return true;
+                }
+        }
+        return false;
+}
+
+/**
+ * free_flag_list - Release all heap allocations held by a flag_list.
+ *
+ * Input:
+ *   list - pointer to a flag_list whose items were allocated by
+ *          parse_flags_line() or split_csv_trim().
+ *
+ * After this call list->items is NULL and list->count is 0.
+ */
+static void free_flag_list(flag_list *list) {
+        if (!list || !list->items) {
+                return;
+        }
+
+        for (size_t i = 0; i < list->count; i++) {
+                free(list->items[i]);
+        }
+        free(list->items);
+
+        list->items = NULL;
+        list->count = 0;
 }