X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fconfig.c;h=0bd69e2b115c2a9742f77eb8add360d9b3191a2c;hb=9fc48ba2176a71585c13cd346968bdba499e80de;hp=67cfb29eb6553571cde13d75914ac64c91cb1cef;hpb=dd53acce112e59a9ba35e3389c9bad4ea81480ca;p=apps%2Fpfixtools.git

diff --git a/postlicyd/config.c b/postlicyd/config.c
index 67cfb29..0bd69e2 100644
--- a/postlicyd/config.c
+++ b/postlicyd/config.c
@@ -34,24 +34,50 @@
  */
 
 #include "file.h"
-#include "filter.h"
 #include "config.h"
 #include "str.h"
 
 #define config_param_register(Param)
 
-config_param_register("first_filter");
+/* 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");
 
-struct config_t {
-    A(filter_t)        filters;
-    A(filter_params_t) params;
-    int entry_point;
-};
+/* 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;
 }
 
@@ -82,6 +108,37 @@ static bool config_second_pass(config_t *config)
             break;
         }
     }}
+    if (!ok) {
+        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;
 }
@@ -238,7 +295,7 @@ read_param_value:
     READ_BLANK(goto badeof);
     READ_STRING("parameter value", value, value_len, ;);
     {
-        filter_params_t param;
+        filter_param_t param;
         param.type  = param_tokenize(key, key_len);
         if (param.type != ATK_UNKNOWN) {
             param.value = m_strdup(value);
@@ -297,7 +354,9 @@ badeof:
     syslog(LOG_ERR, "Unexpected end of file");
 
 error:
-    filter_wipe(&filter);
+    if (filter.name) {
+        filter_wipe(&filter);
+    }
     config_delete(&config);
     file_map_close(&map);
     return NULL;