fixed small memory leak (free old devnull names when setting new ones)

[srvx.git] / src / mod-watchdog.c

diff --git a/src/mod-watchdog.c b/src/mod-watchdog.c
index 9b9ea446147395466ecd538f4f974fbb90854039..690ed0d2069d11cdb9531b44f141d7a6caf57ffb 100644 (file)
--- a/src/mod-watchdog.c
+++ b/src/mod-watchdog.c
@@ -23,6 +23,9 @@
  *     "watchdog" {
  *         "nick" "Watchdog";
  *         "modes" "+iok";
+           "ban_duration" "2h"; //only if the channel is registered with chanserv
+           "gline_duration" "1h";
+           "punishment_reason" "Your message contained a forbidden word.";
  *     };
  *  };
  *
@@ -34,6 +37,7 @@
 #include "modcmd.h"
 #include "saxdb.h"
 #include "timeq.h"
+#include "gline.h"
 
 #define KEY_BADWORDS "badwords"
 #define KEY_BADWORD_MASK "mask"
@@ -79,6 +83,9 @@ struct watchdog_channel {
 static struct {
     const char *nick;
     const char *modes;
+    const char *punishment_reason;
+    unsigned long ban_duration;
+    unsigned long gline_duration;
 } watchdog_conf;
 
 const char *watchdog_module_deps[] = { NULL };
@@ -149,6 +156,7 @@ static MODCMD_FUNC(cmd_setbad)
             if(!strcmp("MASK",setting)) {
                   free(badword->badword_mask);
                   badword->badword_mask = strdup(argv[3]);
+                  badword->triggered = 0;
                   reply("WDMSG_BADWORD_SET_DONE");
             }
             else if(!strcmp("ACTION",setting)) {
@@ -330,9 +338,58 @@ static MODCMD_FUNC(cmd_unregister)
 }
 
 static void
-watchdog_channel_message(struct userNode *user, struct chanNode *chan, const char *text, struct userNode *bot, unsigned int is_notice)
+watchdog_detected_badword(struct userNode *user, struct chanNode *chan, struct badword *badword) 
 {
-    //to be continued...
+    char *hostmask;
+    char *reason = watchdog_conf.punishment_reason;
+    char mask[IRC_NTOP_MAX_SIZE+3] = { '*', '@', '\0' };
+    switch(badword->action) {
+        case BADACTION_BAN:
+            hostmask = generate_hostmask(user, GENMASK_STRICT_HOST | GENMASK_ANY_IDENT);
+            sanitize_ircmask(hostmask);
+            if(chan->channel_info) {
+                //registered channel
+                add_channel_ban(chan->channel_info, hostmask, watchdog->nick, now, now, now + watchdog_conf.ban_duration, reason);
+            }
+            struct mod_chanmode change;
+            mod_chanmode_init(&change);
+            change.argc = 1;
+            change.args[0].mode = MODE_BAN;
+            change.args[0].u.hostmask = hostmask;
+            mod_chanmode_announce(watchdog, chan, &change);
+            free(hostmask);
+            
+        case BADACTION_KICK:
+            if(GetUserMode(chan, user))
+                KickChannelUser(user, chan, watchdog, reason); 
+            break;
+        case BADACTION_KILL:
+            DelUser(user, watchdog, 1, reason);
+            break;
+        case BADACTION_GLINE:
+            irc_ntop(mask + 2, sizeof(mask) - 2, &user->ip);
+            gline_add(watchdog->nick, mask, watchdog_conf.gline_duration, reason, now, now, 0, 1);
+            break;
+        default:
+            //error?
+            break;
+        }
+}
+
+static void
+watchdog_channel_message(struct userNode *user, struct chanNode *chan, const char *text, UNUSED_ARG(struct userNode *bot), UNUSED_ARG(unsigned int is_notice))
+{
+    dict_iterator_t it;
+
+    if(!watchdog || !dict_find(chanlist, chan->name, NULL))
+        return;
+
+    for (it = dict_first(shitlist); it; it = iter_next(it)) {
+        struct badword *badword = iter_data(it);
+        if(match_ircglob(text, badword->badword_mask)) {
+            watchdog_detected_badword(user, chan, badword);
+        }
+    }
 }
 
 static struct badword*
@@ -417,6 +474,16 @@ watchdog_conf_read(void)
     
     str = database_get_data(conf_node, "modes", RECDB_QSTRING);
     watchdog_conf.modes = (str ? str : NULL);
+    
+    str = database_get_data(conf_node, "ban_duration", RECDB_QSTRING);
+       watchdog_conf.ban_duration = str ? ParseInterval(str) : ParseInterval("2h");
+    
+    str = database_get_data(conf_node, "gline_duration", RECDB_QSTRING);
+       watchdog_conf.gline_duration = str ? ParseInterval(str) : ParseInterval("1h");
+    
+    str = database_get_data(conf_node, "punishment_reason", RECDB_QSTRING);
+       watchdog_conf.punishment_reason = (str ? str : "Your message contained a forbidden word.");
+    
 }
 
 static int
@@ -444,7 +511,7 @@ watchdog_saxdb_read_chanlist(const char *name, void *data, UNUSED_ARG(void *extr
     struct record_data *rd = data;
 
      if (rd->type == RECDB_OBJECT) {
-        dict_t obj = GET_RECORD_OBJECT(rd);
+        //dict_t obj = GET_RECORD_OBJECT(rd);
         /* nothing in here, yet */
 
         add_channel(name);
@@ -472,7 +539,6 @@ watchdog_saxdb_read(struct dict *db)
 static int
 watchdog_saxdb_write(struct saxdb_context *ctx)
 {
-    char str[10];
     dict_iterator_t it;
 
     saxdb_write_int(ctx, KEY_BADWORDID, last_badword_id);
@@ -481,13 +547,15 @@ watchdog_saxdb_write(struct saxdb_context *ctx)
         saxdb_start_record(ctx, KEY_BADWORDS, 1);
         for (it = dict_first(shitlist); it; it = iter_next(it)) {
             struct badword *badword = iter_data(it);
-            saxdb_start_record(ctx, iter_key(it), 0);
-            
-            saxdb_write_string(ctx, KEY_BADWORD_MASK, badword->badword_mask);
-            saxdb_write_int(ctx, KEY_BADWORD_TRIGGERED, badword->triggered);
-            saxdb_write_int(ctx, KEY_BADWORD_ACTION, badword->action);
-            
-            saxdb_end_record(ctx);
+            if(badword && badword->badword_mask) {
+                saxdb_start_record(ctx, iter_key(it), 0);
+                
+                saxdb_write_string(ctx, KEY_BADWORD_MASK, badword->badword_mask);
+                saxdb_write_int(ctx, KEY_BADWORD_TRIGGERED, badword->triggered);
+                saxdb_write_int(ctx, KEY_BADWORD_ACTION, badword->action);
+                
+                saxdb_end_record(ctx);
+            }
         }
         saxdb_end_record(ctx);
     }
@@ -496,9 +564,11 @@ watchdog_saxdb_write(struct saxdb_context *ctx)
         saxdb_start_record(ctx, KEY_CHANNELS, 1);
         for (it = dict_first(chanlist); it; it = iter_next(it)) {
             struct watchdog_channel *wc = iter_data(it);
-            saxdb_start_record(ctx, wc->channel->name, 0);
-            //anything else?
-            saxdb_end_record(ctx);
+            if(wc && wc->channel && wc->channel->name) {
+                saxdb_start_record(ctx, wc->channel->name, 0);
+                //anything else?
+                saxdb_end_record(ctx);
+            }
         }
         saxdb_end_record(ctx);
     }
@@ -568,5 +638,15 @@ watchdog_finalize(void) {
     
     str = database_get_data(conf_node, "modes", RECDB_QSTRING);
     if (str) watchdog_conf.modes = str;
+    
+    str = database_get_data(conf_node, "ban_duration", RECDB_QSTRING);
+       if (str) watchdog_conf.ban_duration = ParseInterval(str);
+    
+    str = database_get_data(conf_node, "gline_duration", RECDB_QSTRING);
+       if (str) watchdog_conf.gline_duration = ParseInterval(str);
+    
+    str = database_get_data(conf_node, "punishment_reason", RECDB_QSTRING);
+       if (str) watchdog_conf.punishment_reason = str;
+    
     return 1;
 }