*/
config_param_register("verify_filter");
+
+/* Where to bind the server.
+ */
+config_param_register("port");
+
+
+static config_t *global_config = NULL;
+
static inline config_t *config_new(void)
{
config_t *config = p_new(config_t, 1);
+ global_config = config;
+ return config;
+}
+
+static void config_close(config_t *config)
+{
for (int i = 0 ; i < SMTP_count ; ++i) {
config->entry_points[i] = -1;
}
- return config;
+ array_deep_wipe(config->filters, filter_wipe);
+ array_deep_wipe(config->params, filter_params_wipe);
}
void config_delete(config_t **config)
{
if (*config) {
- array_deep_wipe((*config)->filters, filter_wipe);
- array_deep_wipe((*config)->params, filter_params_wipe);
+ config_close(*config);
p_delete(config);
+ global_config = NULL;
}
}
+static void config_exit()
+{
+ if (global_config) {
+ config_delete(&global_config);
+ }
+}
+module_exit(config_exit);
static bool config_second_pass(config_t *config)
{
if (!ok) {
return false;
}
+ if (!filter_check_safety(&config->filters)) {
+ return false;
+ }
ok = false;
+#define PARSE_CHECK(Expr, Fmt, ...) \
+ if (!(Expr)) { \
+ err(Fmt, ##__VA_ARGS__); \
+ return false; \
+ }
foreach (filter_param_t *param, config->params) {
switch (param->type) {
#define CASE(Param, State) \
ok = true; \
config->entry_points[SMTP_ ## State] \
= filter_find_with_name(&config->filters, param->value); \
+ PARSE_CHECK(config->entry_points[SMTP_ ## State] >= 0, \
+ "invalid filter name %s", param->value); \
break;
CASE(CLIENT, CONNECT)
CASE(EHLO, EHLO)
CASE(VERIFY, VRFY)
CASE(ETRN, ETRN)
#undef CASE
+ FILTER_PARAM_PARSE_INT(PORT, config->port);
default: break;
}
}}
array_deep_wipe(config->params, filter_params_wipe);
if (!ok) {
- syslog(LOG_ERR, "no entry point defined");
+ err("no entry point defined");
}
return ok;
}
-config_t *config_read(const char *file)
+static bool config_load(config_t *config)
{
- config_t *config;
filter_t filter;
file_map_t map;
const char *p;
int line = 0;
const char *linep;
+ bool in_section = false;
+ bool end_of_section = false;
char key[BUFSIZ];
char value[BUFSIZ];
- ssize_t key_len, value_len;
+ int key_len, value_len;
- if (!file_map_open(&map, file, false)) {
+ if (!file_map_open(&map, config->filename, false)) {
return false;
}
- config = config_new();
+ config_close(config);
filter_init(&filter);
linep = p = map.map;
+#define READ_LOG(Lev, Fmt, ...) \
+ __log(LOG_ ## Lev, "config file %s:%d:%d: " Fmt, config->filename, \
+ line + 1, (int)(p - linep + 1), ##__VA_ARGS__)
#define READ_ERROR(Fmt, ...) \
do { \
- syslog(LOG_ERR, "config file %s:%d:%d: " Fmt, file, line + 1, \
- p - linep + 1, ##__VA_ARGS__); \
+ READ_LOG(ERR, Fmt, ##__VA_ARGS__); \
goto error; \
} while (0)
#define ADD_IN_BUFFER(Buffer, Len, Char) \
(Buffer)[(Len)++] = (Char); \
(Buffer)[(Len)] = '\0'; \
} while (0)
-#define READ_NEXT(OnEOF) \
+#define READ_NEXT \
do { \
if (*p == '\n') { \
++line; \
linep = p + 1; \
} \
if (++p >= map.end) { \
- OnEOF; \
+ if (!end_of_section) { \
+ if (in_section) { \
+ goto badeof; \
+ } else { \
+ goto ok; \
+ } \
+ } \
} \
} while (0)
-#define READ_BLANK(OnEOF) \
+#define READ_BLANK \
do { \
bool in_comment = false; \
while (in_comment || isspace(*p) || *p == '#') { \
} else if (*p == '#') { \
in_comment = true; \
} \
- READ_NEXT(OnEOF); \
+ READ_NEXT; \
} \
} while (0)
#define READ_TOKEN(Name, Buffer, Len) \
} \
do { \
ADD_IN_BUFFER(Buffer, Len, *p); \
- READ_NEXT(goto badeof); \
+ READ_NEXT; \
} while (isalnum(*p) || *p == '_'); \
} while (0)
-#define READ_STRING(Name, Buffer, Len, OnEOF) \
+#define READ_STRING(Name, Buffer, Len, Ignore) \
do { \
(Len) = 0; \
(Buffer)[0] = '\0'; \
if (*p == '"') { \
bool escaped = false; \
while (*p == '"') { \
- READ_NEXT(goto badeof); \
+ READ_NEXT; \
while (true) { \
if (*p == '\n') { \
READ_ERROR("string must not contain EOL"); \
} else if (*p == '\\') { \
escaped = true; \
} else if (*p == '"') { \
- READ_NEXT(goto badeof); \
+ READ_NEXT; \
break; \
} else { \
ADD_IN_BUFFER(Buffer, Len, *p); \
} \
- READ_NEXT(goto badeof); \
+ READ_NEXT; \
} \
- READ_BLANK(goto badeof); \
+ READ_BLANK; \
} \
if (*p != ';') { \
READ_ERROR("%s must end with a ';'", Name); \
while (*p != ';' && isascii(*p) && (isprint(*p) || isspace(*p))) { \
if (escaped) { \
if (*p == '\r' || *p == '\n') { \
- READ_BLANK(goto badeof); \
+ READ_BLANK; \
} else { \
ADD_IN_BUFFER(Buffer, Len, '\\'); \
} \
} else { \
ADD_IN_BUFFER(Buffer, Len, *p); \
} \
- READ_NEXT(goto badeof); \
+ READ_NEXT; \
} \
if (escaped) { \
ADD_IN_BUFFER(Buffer, Len, '\\'); \
} \
+ while ((Len) > 0 && isspace((Buffer)[(Len) - 1])) { \
+ (Buffer)[--(Len)] = '\0'; \
+ } \
} \
- READ_NEXT(OnEOF); \
+ end_of_section = Ignore; \
+ READ_NEXT; \
} while(0)
value[0] = key[0] = '\0';
value_len = key_len = 0;
- READ_BLANK(goto ok);
+ in_section = end_of_section = false;
+ READ_BLANK;
+ in_section = true;
READ_TOKEN("section name", key, key_len);
- READ_BLANK(goto badeof);
+ READ_BLANK;
switch (*p) {
case '=':
- READ_NEXT(goto badeof);
+ READ_NEXT;
goto read_param_value;
case '{':
- READ_NEXT(goto badeof);
+ READ_NEXT;
goto read_filter;
default:
READ_ERROR("invalid character '%c', expected '=' or '{'", *p);
}
read_param_value:
- READ_BLANK(goto badeof);
- READ_STRING("parameter value", value, value_len, ;);
+ READ_BLANK;
+ READ_STRING("parameter value", value, value_len, true);
{
filter_param_t param;
param.type = param_tokenize(key, key_len);
if (param.type != ATK_UNKNOWN) {
- param.value = m_strdup(value);
+ param.value = p_dupstr(value, value_len);
+ param.value_len = value_len;
array_add(config->params, param);
+ } else {
+ READ_LOG(INFO, "unknown parameter %.*s", key_len, key);
}
}
goto read_section;
read_filter:
filter_set_name(&filter, key, key_len);
- READ_BLANK(goto badeof);
+ READ_BLANK;
while (*p != '}') {
READ_TOKEN("filter parameter name", key, key_len);
- READ_BLANK(goto badeof);
+ READ_BLANK;
if (*p != '=') {
READ_ERROR("invalid character '%c', expected '='", *p);
}
- READ_NEXT(goto badeof);
- READ_BLANK(goto badeof);
- READ_STRING("filter parameter value", value, value_len, goto badeof);
- READ_BLANK(goto badeof);
+ READ_NEXT;
+ READ_BLANK;
+ READ_STRING("filter parameter value", value, value_len, false);
+ READ_BLANK;
if (strcmp(key, "type") == 0) {
if (!filter_set_type(&filter, value, value_len)) {
READ_ERROR("unknow filter type (%s) for filter %s",
(void)filter_add_param(&filter, key, key_len, value, value_len);
}
}
- READ_NEXT(;);
+ end_of_section = true;
+ READ_NEXT;
if (!filter_build(&filter)) {
READ_ERROR("invalid filter %s", filter.name);
}
goto error;
}
file_map_close(&map);
- return config;
+ return true;
badeof:
- syslog(LOG_ERR, "Unexpected end of file");
+ err("Unexpected end of file");
error:
if (filter.name) {
filter_wipe(&filter);
}
- config_delete(&config);
file_map_close(&map);
- return NULL;
+ return false;
+}
+
+bool config_reload(config_t *config)
+{
+ return config_load(config);
+}
+
+config_t *config_read(const char *file)
+{
+ config_t *config = config_new();
+ config->filename = file;
+ if (!config_reload(config)) {
+ config_delete(&config);
+ return NULL;
+ }
+ return config;
}
projects / apps / pfixtools.git / blobdiff