Match list patterns case-insensitive

[ngircd-alex.git] / src / ngircd / lists.c

diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c
index 45a4874b6e94f268aa2a0942cdf249c4aec12a24..247344e508a6e3daf3fc164d1e47ddbdc0e98152 100644 (file)
--- a/src/ngircd/lists.c
+++ b/src/ngircd/lists.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,26 +16,18 @@
  * Management of IRC lists: ban, invite, etc.
  */
 
-#include "imp.h"
 #include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <time.h>
 
-#include "defines.h"
 #include "conn.h"
-#include "channel.h"
 #include "log.h"
 #include "match.h"
-#include "messages.h"
-#include "irc-write.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
 
-#include "exp.h"
 #include "lists.h"
 
-#define MASK_LEN       (2*CLIENT_HOST_LEN)
-
 struct list_elem {
        struct list_elem *next; /** pointer to next list element */
        char mask[MASK_LEN];    /** IRC mask */
@@ -130,7 +122,8 @@ Lists_Add(struct list_head *h, const char *Mask, time_t ValidUntil,
        if (e) {
                e->valid_until = ValidUntil;
                if (Reason) {
-                       free(e->reason);
+                       if (e->reason)
+                               free(e->reason);
                        e->reason = strdup(Reason);
                }
                return true;
@@ -147,11 +140,8 @@ Lists_Add(struct list_head *h, const char *Mask, time_t ValidUntil,
 
        strlcpy(newelem->mask, Mask, sizeof(newelem->mask));
        if (Reason) {
-               newelem->reason = malloc(strlen(Reason) + 1);
-               if (newelem->reason)
-                       strlcpy(newelem->reason, Reason,
-                               sizeof(newelem->reason));
-               else
+               newelem->reason = strdup(Reason);
+               if (!newelem->reason)
                        Log(LOG_EMERG,
                            "Can't allocate memory for new list reason text!");
        }
@@ -264,17 +254,13 @@ Lists_CheckDupeMask(const struct list_head *h, const char *Mask )
 /**
  * Generate a valid IRC mask from "any" string given.
  *
- * Attention: This mask is only valid until the next call to Lists_MakeMask(),
- * because a single global buffer ist used! You have to copy the generated
- * mask to some sane location yourself!
- *
  * @param Pattern Source string to generate an IRC mask for.
- * @return Pointer to global result buffer.
+ * @param mask    Buffer to store the mask.
+ * @param len     Size of the buffer.
  */
-GLOBAL const char *
-Lists_MakeMask(const char *Pattern)
+GLOBAL void
+Lists_MakeMask(const char *Pattern, char *mask, size_t len)
 {
-       static char TheMask[MASK_LEN];
        char *excl, *at;
 
        assert(Pattern != NULL);
@@ -286,31 +272,24 @@ Lists_MakeMask(const char *Pattern)
                excl = NULL;
 
        if (!at && !excl) {
-               /* Neither "!" nor "@" found: use string as nick name */
-               strlcpy(TheMask, Pattern, sizeof(TheMask) - 5);
-               strlcat(TheMask, "!*@*", sizeof(TheMask));
-               return TheMask;
-       }
-
-       if (!at && excl) {
+               /* Neither "!" nor "@" found: use string as nickname */
+               strlcpy(mask, Pattern, len - 5);
+               strlcat(mask, "!*@*", len);
+       } else if (!at && excl) {
                /* Domain part is missing */
-               strlcpy(TheMask, Pattern, sizeof(TheMask) - 3);
-               strlcat(TheMask, "@*", sizeof(TheMask));
-               return TheMask;
-       }
-
-       if (at && !excl) {
+               strlcpy(mask, Pattern, len - 3);
+               strlcat(mask, "@*", len);
+       } else if (at && !excl) {
                /* User name is missing */
                *at = '\0'; at++;
-               strlcpy(TheMask, Pattern, sizeof(TheMask) - 5);
-               strlcat(TheMask, "!*@", sizeof(TheMask));
-               strlcat(TheMask, at, sizeof(TheMask));
-               return TheMask;
+               strlcpy(mask, Pattern, len - 5);
+               strlcat(mask, "!*@", len);
+               strlcat(mask, at, len);
+               at--; *at = '@';
+       } else {
+               /* All parts (nick, user and domain name) are given */
+               strlcpy(mask, Pattern, len);
        }
-
-       /* All parts (nick, user and domain name) are given */
-       strlcpy(TheMask, Pattern, sizeof(TheMask));
-       return TheMask;
 } /* Lists_MakeMask */
 
 /**
@@ -323,18 +302,20 @@ Lists_MakeMask(const char *Pattern)
 bool
 Lists_Check(struct list_head *h, CLIENT *Client)
 {
-       return Lists_CheckReason(h, Client) != NULL;
+       return Lists_CheckReason(h, Client, NULL, 0);
 }
 
 /**
- * Check if a client is listed in a list and return the "reason".
+ * Check if a client is listed in a list and store the reason.
  *
- * @param h List head.
+ * @param h      List head.
  * @param Client Client to check.
+ * @param reason Buffer to store the reason.
+ * @param len    Size of the buffer if reason should be saved.
  * @return true if client is listed, false if not.
  */
-char *
-Lists_CheckReason(struct list_head *h, CLIENT *Client)
+bool
+Lists_CheckReason(struct list_head *h, CLIENT *Client, char *reason, size_t len)
 {
        struct list_elem *e, *last, *next;
 
@@ -345,20 +326,22 @@ Lists_CheckReason(struct list_head *h, CLIENT *Client)
 
        while (e) {
                next = e->next;
-               if (Match(e->mask, Client_Mask(Client))) {
+               if (MatchCaseInsensitive(e->mask, Client_MaskCloaked(Client))) {
+                       if (len && e->reason)
+                               strlcpy(reason, e->reason, len);
                        if (e->valid_until == 1) {
                                /* Entry is valid only once, delete it */
                                LogDebug("Deleted \"%s\" from list (used).",
                                         e->mask);
                                Lists_Unlink(h, last, e);
                        }
-                       return e->reason ? e->reason : "";
+                       return true;
                }
                last = e;
                e = next;
        }
 
-       return NULL;
+       return false;
 }
 
 /**