daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dns_conf: add error logs when config is invalid.

Browse Source
This commit is contained in:
Nick Peng
2023-11-14 22:38:33 +08:00
parent eb9fc6c13d
commit d54d7cf80a
3 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/dns_conf.c
View File

@@ -681,7 +681,10 @@ static int _config_server(int argc, char *argv[], dns_server_type_t type, int de
break; break;
} }
default: default:
tlog(TLOG_WARN, "invalid server option: %s", argv[optind - 1]); tlog(TLOG_WARN, "unknown server option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
syslog(LOG_WARNING, "unknown server option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
break; break;
} }
} }
@@ -2220,7 +2223,10 @@ static int _config_bind_ip(int argc, char *argv[], DNS_BIND_TYPE type)
break; break;
} }
default: default:
tlog(TLOG_WARN, "invalid bind option: %s", argv[optind - 1]); tlog(TLOG_WARN, "unknown bind option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
syslog(LOG_WARNING, "unknown bind option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
break; break;
} }
} }
@@ -2835,6 +2841,11 @@ static int _conf_domain_set(void *data, int argc, char *argv[])
goto errout; goto errout;
} }
if (access(domain_set->file, F_OK) != 0) {
tlog(TLOG_ERROR, "domain set file %s not readable. %s", domain_set->file, strerror(errno));
goto errout;
}
key = hash_string(set_name); key = hash_string(set_name);
hash_for_each_possible(dns_domain_set_name_table.names, domain_set_name_list, node, key) hash_for_each_possible(dns_domain_set_name_table.names, domain_set_name_list, node, key)
{ {
@@ -3262,7 +3273,10 @@ static int _conf_ip_rules(void *data, int argc, char *argv[])
break; break;
} }
default: default:
tlog(TLOG_WARN, "invalid ip-rules option: %s", argv[optind - 1]); tlog(TLOG_WARN, "unknown ip-rules option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
syslog(LOG_WARNING, "unknown ip-rules option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
break; break;
} }
} }
@@ -3331,6 +3345,11 @@ static int _conf_ip_set(void *data, int argc, char *argv[])
} }
/* clang-format on */ /* clang-format on */
if (access(ip_set->file, F_OK) != 0) {
tlog(TLOG_ERROR, "ip set file %s not readable. %s", ip_set->file, strerror(errno));
goto errout;
}
if (set_name[0] == 0 || ip_set->file[0] == 0) { if (set_name[0] == 0 || ip_set->file[0] == 0) {
tlog(TLOG_ERROR, "invalid parameter."); tlog(TLOG_ERROR, "invalid parameter.");
goto errout; goto errout;
@@ -3662,7 +3681,10 @@ static int _conf_domain_rules(void *data, int argc, char *argv[])
break; break;
} }
default: default:
tlog(TLOG_WARN, "invalid domain-rules option: %s", argv[optind - 1]); tlog(TLOG_WARN, "unknown domain-rules option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
syslog(LOG_WARNING, "unknown domain-rules option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
break; break;
} }
} }
@@ -4203,13 +4225,13 @@ static int _conf_printf(const char *file, int lineno, int ret)
case CONF_RET_ERR: case CONF_RET_ERR:
case CONF_RET_WARN: case CONF_RET_WARN:
case CONF_RET_BADCONF: case CONF_RET_BADCONF:
tlog(TLOG_WARN, "process config file '%s' failed at line %d.", file, lineno); tlog(TLOG_WARN, "process config failed at '%s:%d'.", file, lineno);
syslog(LOG_NOTICE, "process config file '%s' failed at line %d.", file, lineno); syslog(LOG_WARNING, "process config failed at '%s:%d'.", file, lineno);
return -1; return -1;
break; break;
case CONF_RET_NOENT: case CONF_RET_NOENT:
tlog(TLOG_WARN, "unsupported config at '%s:%d'.", file, lineno); tlog(TLOG_WARN, "unsupported config at '%s:%d'.", file, lineno);
syslog(LOG_NOTICE, "unsupported config at '%s:%d'.", file, lineno); syslog(LOG_WARNING, "unsupported config at '%s:%d'.", file, lineno);
return -1; return -1;
break; break;
default: default:
@@ -4247,9 +4269,9 @@ int config_additional_file(void *data, int argc, char *argv[])
} }
if (access(file_path, R_OK) != 0) { if (access(file_path, R_OK) != 0) {
tlog(TLOG_WARN, "conf file %s is not readable.", file_path); tlog(TLOG_WARN, "config file '%s' is not readable, %s", conf_file, strerror(errno));
syslog(LOG_NOTICE, "conf file %s is not readable.", file_path); syslog(LOG_WARNING, "config file '%s' is not readable, %s", conf_file, strerror(errno));
return 0; return -1;
} }
return load_conf(file_path, _config_item, _conf_printf); return load_conf(file_path, _config_item, _conf_printf);

4
src/include/conf.h
View File

@@ -122,9 +122,9 @@ struct config_enum {
.data = value, .min = min_value, .max = max_value \ .data = value, .min = min_value, .max = max_value \
} \ } \
} }
#define CONF_SSIZE(key, value, min_value, max_value) \ #define CONF_SSIZE(key, value, min_value, max_value) \
{ \ { \
key, conf_ssize, &(struct config_item_ssize) \ key, conf_ssize, &(struct config_item_ssize) \
{ \ { \
.data = value, .min = min_value, .max = max_value \ .data = value, .min = min_value, .max = max_value \
} \ } \

2
src/lib/conf.c
View File

@@ -24,6 +24,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h>
static const char *current_conf_file = NULL; static const char *current_conf_file = NULL;
static int current_conf_lineno = 0; static int current_conf_lineno = 0;
@@ -372,6 +373,7 @@ static int load_conf_file(const char *file, struct config_item *items, conf_erro
fp = fopen(file, "r"); fp = fopen(file, "r");
if (fp == NULL) { if (fp == NULL) {
fprintf(stderr, "open config file '%s' failed, %s\n", file, strerror(errno));
return -1; return -1;
} }