X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fconfig.c;h=b563ef3a30ca7bb90dff787021878f3d239bd1a4;hb=7e4bf3c72dfb5be45dcb6479c5fa69c0dde80449;hp=82f80f000ccdc037235b6a1c8f1aeb7c3c544f1f;hpb=6dcf855b7add63be72fbed3af6590f00532e1c76;p=apps%2Fpfixtools.git

diff --git a/postlicyd/config.c b/postlicyd/config.c
index 82f80f0..b563ef3 100644
--- a/postlicyd/config.c
+++ b/postlicyd/config.c
@@ -34,38 +34,122 @@
  */
 
 #include "file.h"
-#include "filter.h"
 #include "config.h"
+#include "str.h"
 
-struct config_t {
-    filter_t *filters;
-    int filters_len;
-    int filters_size;
+#define config_param_register(Param)
 
-    int entry_point;
-};
+/* Filter to execute on "CONNECT"
+ */
+config_param_register("client_filter");
+
+/* Filter to execute on "MAIL FROM"
+ */
+config_param_register("sender_filter");
+
+/* Filter to execute on "RCPT TO"
+ */
+config_param_register("recipient_filter");
+
+/* Filter to execute on "DATA"
+ */
+config_param_register("data_filter");
+
+/* Filter to execute on "END-OF-DATA"
+ */
+config_param_register("end_of_data_filter");
+
+/* Filter to execute on "ETRN"
+ */
+config_param_register("etrn_filter");
+
+/* Filter to execute on "HELO"
+ */
+config_param_register("helo_filter");
+config_param_register("ehlo_filter");
+
+/* Filter to execute on "VRFY"
+ */
+config_param_register("verify_filter");
 
 static inline config_t *config_new(void)
 {
     config_t *config = p_new(config_t, 1);
-    config->entry_point = -1;
+    for (int i = 0 ; i < SMTP_count ; ++i) {
+        config->entry_points[i] = -1;
+    }
     return config;
 }
 
 void config_delete(config_t **config)
 {
     if (*config) {
-        for (int i = 0 ; i < (*config)->filters_len ; ++i) {
-            filter_wipe((*config)->filters + i);
+        array_deep_wipe((*config)->filters, filter_wipe);
+        array_deep_wipe((*config)->params, filter_params_wipe);
+        p_delete(config);
+    }
+}
+
+
+static bool config_second_pass(config_t *config)
+{
+    bool ok = true;
+    if (config->filters.len > 0) {
+#       define QSORT_TYPE filter_t
+#       define QSORT_BASE config->filters.data
+#       define QSORT_NELT config->filters.len
+#       define QSORT_LT(a,b) strcmp(a->name, b->name) < 0
+#       include "qsort.c"
+    }
+
+    foreach (filter_t *filter, config->filters) {
+        if (!filter_update_references(filter, &config->filters)) {
+            ok = false;
+            break;
         }
-        p_delete(&(*config)->filters);
+    }}
+    if (!ok) {
+        return false;
     }
+    if (!filter_check_safety(&config->filters)) {
+        return false;
+    }
+
+    ok = false;
+    foreach (filter_param_t *param, config->params) {
+        switch (param->type) {
+#define   CASE(Param, State)                                                   \
+            case ATK_ ## Param ## _FILTER:                                     \
+              ok = true;                                                       \
+              config->entry_points[SMTP_ ## State]                             \
+                  = filter_find_with_name(&config->filters, param->value);     \
+              break;
+          CASE(CLIENT,      CONNECT)
+          CASE(EHLO,        EHLO)
+          CASE(HELO,        HELO)
+          CASE(SENDER,      MAIL)
+          CASE(RECIPIENT,   RCPT)
+          CASE(DATA,        DATA)
+          CASE(END_OF_DATA, END_OF_MESSAGE)
+          CASE(VERIFY,      VRFY)
+          CASE(ETRN,        ETRN)
+#undef    CASE
+          default: break;
+        }
+    }}
+    array_deep_wipe(config->params, filter_params_wipe);
+
+    if (!ok) {
+        syslog(LOG_ERR, "no entry point defined");
+    }
+
+    return ok;
 }
 
 config_t *config_read(const char *file)
 {
     config_t *config;
-    //filter_t *filter = NULL;
+    filter_t filter;
     file_map_t map;
     const char *p;
     int line = 0;
@@ -80,6 +164,7 @@ config_t *config_read(const char *file)
     }
 
     config = config_new();
+    filter_init(&filter);
     linep = p = map.map;
 
 #define READ_ERROR(Fmt, ...)                                                   \
@@ -182,6 +267,9 @@ config_t *config_read(const char *file)
             if (escaped) {                                                     \
                 ADD_IN_BUFFER(Buffer, Len, '\\');                              \
             }                                                                  \
+            while ((Len) > 0 && isspace((Buffer)[(Len) - 1])) {                \
+                (Buffer)[--(Len)] = '\0';                                      \
+            }                                                                  \
         }                                                                      \
         READ_NEXT(OnEOF);                                                      \
     } while(0)
@@ -212,13 +300,19 @@ read_section:
 read_param_value:
     READ_BLANK(goto badeof);
     READ_STRING("parameter value", value, value_len, ;);
-    /* TODO: Insert parameter in the configuration.
-     */
+    {
+        filter_param_t param;
+        param.type  = param_tokenize(key, key_len);
+        if (param.type != ATK_UNKNOWN) {
+            param.value     = p_dupstr(value, value_len);
+            param.value_len = value_len;
+            array_add(config->params, param);
+        }
+    }
     goto read_section;
 
 read_filter:
-    /* TODO: Create a filter with the given name.
-     */
+    filter_set_name(&filter, key, key_len);
     READ_BLANK(goto badeof);
     while (*p != '}') {
         READ_TOKEN("filter parameter name", key, key_len);
@@ -230,21 +324,47 @@ read_filter:
         READ_BLANK(goto badeof);
         READ_STRING("filter parameter value", value, value_len, goto badeof);
         READ_BLANK(goto badeof);
-        /* TODO: Insert parameter in the filter.
-         */
+        if (strcmp(key, "type") == 0) {
+            if (!filter_set_type(&filter, value, value_len)) {
+                READ_ERROR("unknow filter type (%s) for filter %s",
+                           value, filter.name);
+            }
+        } else if (key_len > 3 && strncmp(key, "on_", 3) == 0) {
+            if (!filter_add_hook(&filter, key + 3, key_len - 3,
+                                 value, value_len)) {
+                READ_ERROR("hook %s not supported by filter %s",
+                           key + 3, filter.name);
+            }
+        } else {
+            /* filter_add_param failure mean unknown type or unsupported type.
+             * this are non-fatal errors.
+             */
+            (void)filter_add_param(&filter, key, key_len, value, value_len);
+        }
     }
     READ_NEXT(;);
-    /* TODO: Check the filter.
-     */
+    if (!filter_build(&filter)) {
+        READ_ERROR("invalid filter %s", filter.name);
+    }
+    array_add(config->filters, filter);
+    filter_init(&filter);
     goto read_section;
 
 ok:
+    if (!config_second_pass(config)) {
+        goto error;
+    }
+    file_map_close(&map);
     return config;
 
 badeof:
     syslog(LOG_ERR, "Unexpected end of file");
 
 error:
+    if (filter.name) {
+        filter_wipe(&filter);
+    }
     config_delete(&config);
+    file_map_close(&map);
     return NULL;
 }