April 2013 - ngIRCd GIT Updates

Alexander Barton : Rename "Mask" variables into "Pattern" in assert() statements
by alex＠arthur.barton.de 21 Apr '13

21 Apr '13

Module: ngircd.git Branch: master Commit: 27fd92d580f472e1ecacd3a9597416a5c23bd289 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=27fd92d5… Author: Alexander Barton <alex(a)barton.de> Date: Sun Apr 21 15:57:51 2013 +0200 Rename "Mask" variables into "Pattern" in assert() statements This completes commit 3ab00e3a11 which broke debug builds. --- src/ngircd/class.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index 156f943..b2b1aa3 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -104,7 +104,7 @@ Class_AddMask(const int Class, const char *Pattern, time_t ValidUntil, char mask[MASK_LEN]; assert(Class < CLASS_COUNT); - assert(Mask != NULL); + assert(Pattern != NULL); assert(Reason != NULL); Lists_MakeMask(Pattern, mask, sizeof(mask)); @@ -118,7 +118,7 @@ Class_DeleteMask(const int Class, const char *Pattern) char mask[MASK_LEN]; assert(Class < CLASS_COUNT); - assert(Mask != NULL); + assert(Pattern != NULL); Lists_MakeMask(Pattern, mask, sizeof(mask)); Lists_Del(&My_Classes[Class], mask);

1 0

Federico G. Schwindt : Ensure there is enough space for the mask
by alex＠arthur.barton.de 21 Apr '13

21 Apr '13

Module: ngircd.git Branch: master Commit: 51e5ba94b3f28f84aadc140f0c340d03d2a11d6c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=51e5ba94… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sat Apr 20 10:53:16 2013 +0100 Ensure there is enough space for the mask As pointed by Alex while strl{cat,cpy} take the full length we need to leave space to ensure a proper mask is always created so revert the removal of - N from my last change. --- src/ngircd/lists.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index d98dc6c..b0accd4 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -279,16 +279,16 @@ Lists_MakeMask(const char *Pattern, char *mask, size_t len) if (!at && !excl) { /* Neither "!" nor "@" found: use string as nickname */ - strlcpy(mask, Pattern, len); + strlcpy(mask, Pattern, len - 5); strlcat(mask, "!*@*", len); } else if (!at && excl) { /* Domain part is missing */ - strlcpy(mask, Pattern, len); + strlcpy(mask, Pattern, len - 3); strlcat(mask, "@*", len); } else if (at && !excl) { /* User name is missing */ *at = '\0'; at++; - strlcpy(mask, Pattern, len); + strlcpy(mask, Pattern, len - 5); strlcat(mask, "!*@", len); strlcat(mask, at, len); } else {

1 0

Federico G. Schwindt : Better description for Lists_CheckReason()
by alex＠arthur.barton.de 21 Apr '13

21 Apr '13

Module: ngircd.git Branch: master Commit: b4d0a4038398c23d015bd3faf6247a0dd91016a9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b4d0a403… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Fri Apr 19 23:51:42 2013 +0100 Better description for Lists_CheckReason() --- src/ngircd/lists.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 9ebd890..d98dc6c 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -311,13 +311,12 @@ Lists_Check(struct list_head *h, CLIENT *Client) } /** - * Check if a client is listed in a list and store the reason if a buffer - * is provided. + * Check if a client is listed in a list and store the reason. * * @param h List head. * @param Client Client to check. - * @param reason Result buffer to store the reason. - * @param len Size of the buffer. + * @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. */ bool

1 0

Federico G. Schwindt : Change Lists_MakeMask() to receive a buffer for the mask
by alex＠arthur.barton.de 21 Apr '13

21 Apr '13

Module: ngircd.git Branch: master Commit: 3ab00e3a11acfd22741e58aa409bb2026e0665ba URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3ab00e3a… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sat Apr 20 00:19:03 2013 +0100 Change Lists_MakeMask() to receive a buffer for the mask Change callers accordingly so they don't rely on a global buffer and rename Mask to Pattern where it makes sense since some functions where indeed receiving a pattern and not a mask. --- src/ngircd/class.c | 14 ++++++++++---- src/ngircd/class.h | 4 ++-- src/ngircd/defines.h | 4 +++- src/ngircd/irc-mode.c | 8 ++++---- src/ngircd/lists.c | 46 ++++++++++++++++------------------------------ src/ngircd/lists.h | 2 +- 6 files changed, 36 insertions(+), 42 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index 800e993..156f943 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -98,24 +98,30 @@ Class_HandleServerBans(CLIENT *Client) GLOBAL bool -Class_AddMask(const int Class, const char *Mask, time_t ValidUntil, +Class_AddMask(const int Class, const char *Pattern, time_t ValidUntil, const char *Reason) { + char mask[MASK_LEN]; + assert(Class < CLASS_COUNT); assert(Mask != NULL); assert(Reason != NULL); - return Lists_Add(&My_Classes[Class], Lists_MakeMask(Mask), + Lists_MakeMask(Pattern, mask, sizeof(mask)); + return Lists_Add(&My_Classes[Class], mask, ValidUntil, Reason); } GLOBAL void -Class_DeleteMask(const int Class, const char *Mask) +Class_DeleteMask(const int Class, const char *Pattern) { + char mask[MASK_LEN]; + assert(Class < CLASS_COUNT); assert(Mask != NULL); - Lists_Del(&My_Classes[Class], Lists_MakeMask(Mask)); + Lists_MakeMask(Pattern, mask, sizeof(mask)); + Lists_Del(&My_Classes[Class], mask); } GLOBAL struct list_head * diff --git a/src/ngircd/class.h b/src/ngircd/class.h index ba2e160..f118284 100644 --- a/src/ngircd/class.h +++ b/src/ngircd/class.h @@ -25,9 +25,9 @@ GLOBAL void Class_Init PARAMS((void)); GLOBAL void Class_Exit PARAMS((void)); -GLOBAL bool Class_AddMask PARAMS((const int Class, const char *Mask, +GLOBAL bool Class_AddMask PARAMS((const int Class, const char *Pattern, const time_t ValidUntil, const char *Reason)); -GLOBAL void Class_DeleteMask PARAMS((const int Class, const char *Mask)); +GLOBAL void Class_DeleteMask PARAMS((const int Class, const char *Pattern)); GLOBAL bool Class_GetMemberReason PARAMS((const int Class, CLIENT *Client, char *reason, size_t len)); diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 6b92a69..cffbfad 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -50,7 +50,6 @@ /** Max. length of random salt */ #define RANDOM_SALT_LEN 32 - /* Size of structures */ /** Max. count of configurable servers. */ @@ -114,6 +113,9 @@ /** Max. host name length (including NULL). */ #define CLIENT_HOST_LEN 64 +/** Max. mask lenght (including NULL). */ +#define MASK_LEN (2 * CLIENT_HOST_LEN) + /** Max. length of all client modes (including NULL). */ #define CLIENT_MODE_LEN 21 diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index b5f28fa..765de39 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -980,7 +980,7 @@ static bool Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern) { - const char *mask; + char mask[MASK_LEN]; struct list_head *list = NULL; long int current_count; @@ -989,7 +989,7 @@ Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, assert(Pattern != NULL); assert(what == 'I' || what == 'b' || what == 'e'); - mask = Lists_MakeMask(Pattern); + Lists_MakeMask(Pattern, mask, sizeof(mask)); current_count = Lists_Count(Channel_GetListInvites(Channel)) + Lists_Count(Channel_GetListExcepts(Channel)) + Lists_Count(Channel_GetListBans(Channel)); @@ -1047,7 +1047,7 @@ static bool Del_From_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern) { - const char *mask; + char mask[MASK_LEN]; struct list_head *list = NULL; assert(Client != NULL); @@ -1055,7 +1055,7 @@ Del_From_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, assert(Pattern != NULL); assert(what == 'I' || what == 'b' || what == 'e'); - mask = Lists_MakeMask(Pattern); + Lists_MakeMask(Pattern, mask, sizeof(mask)); switch (what) { case 'I': diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index bab30f2..9ebd890 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -34,8 +34,6 @@ #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 */ @@ -262,17 +260,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); @@ -285,30 +279,22 @@ Lists_MakeMask(const char *Pattern) if (!at && !excl) { /* Neither "!" nor "@" found: use string as nickname */ - strlcpy(TheMask, Pattern, sizeof(TheMask) - 5); - strlcat(TheMask, "!*@*", sizeof(TheMask)); - return TheMask; - } - - if (!at && excl) { + strlcpy(mask, Pattern, len); + 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); + 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); + strlcat(mask, "!*@", len); + strlcat(mask, at, len); + } 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 */ /** diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index eb863db..db0f11a 100644 --- a/src/ngircd/lists.h +++ b/src/ngircd/lists.h @@ -42,7 +42,7 @@ GLOBAL unsigned long Lists_Count PARAMS((struct list_head *h)); GLOBAL void Lists_Free PARAMS((struct list_head *head)); -GLOBAL const char *Lists_MakeMask PARAMS((const char *Pattern)); +GLOBAL void Lists_MakeMask PARAMS((const char *Pattern, char *mask, size_t len)); GLOBAL const char *Lists_GetMask PARAMS((const struct list_elem *e)); GLOBAL const char *Lists_GetReason PARAMS((const struct list_elem *e)); GLOBAL time_t Lists_GetValidity PARAMS((const struct list_elem *e));

1 0

Federico G. Schwindt : Fix use-after-free on Lists_CheckReason()
by alex＠arthur.barton.de 21 Apr '13

21 Apr '13

Module: ngircd.git Branch: master Commit: cde2e8a2775e8b01266627a60a08e2560eac42c8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cde2e8a2… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Fri Apr 19 23:51:42 2013 +0100 Fix use-after-free on Lists_CheckReason() Change Lists_CheckReason() to receive a buffer where the reason will be stored and its length. Change callers accordingly. Change Class_GetMemberReason() (and its callers) in a similar way so it doesn't rely on a global buffer for the rejected reason. --- src/ngircd/class.c | 41 +++++++++++++++++------------------------ src/ngircd/class.h | 3 ++- src/ngircd/lists.c | 22 ++++++++++++++-------- src/ngircd/lists.h | 3 ++- 4 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index 0f617b8..800e993 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -33,8 +33,6 @@ struct list_head My_Classes[CLASS_COUNT]; -char Reject_Reason[COMMAND_LEN]; - GLOBAL void Class_Init(void) { @@ -49,32 +47,29 @@ Class_Exit(void) for (i = 0; i < CLASS_COUNT; Lists_Free(&My_Classes[i++])); } -GLOBAL char * -Class_GetMemberReason(const int Class, CLIENT *Client) +GLOBAL bool +Class_GetMemberReason(const int Class, CLIENT *Client, char *reason, size_t len) { - char *reason; + char str[COMMAND_LEN] = "listed"; assert(Class < CLASS_COUNT); assert(Client != NULL); - reason = Lists_CheckReason(&My_Classes[Class], Client); - if (!reason) - return NULL; - - if (!*reason) - reason = "listed"; + if (!Lists_CheckReason(&My_Classes[Class], Client, str, sizeof(str))) + return false; switch(Class) { case CLASS_GLINE: - snprintf(Reject_Reason, sizeof(Reject_Reason), - "\"%s\" (G-Line)", reason); - return Reject_Reason; + snprintf(reason, len, "\"%s\" (G-Line)", str); + break; case CLASS_KLINE: - snprintf(Reject_Reason, sizeof(Reject_Reason), - "\"%s\" (K-Line)", reason); - return Reject_Reason; + snprintf(reason, len, "\"%s\" (K-Line)", str); + break; + default: + snprintf(reason, len, "%s", str); + break; } - return reason; + return true; } /** @@ -88,15 +83,13 @@ Class_GetMemberReason(const int Class, CLIENT *Client) GLOBAL bool Class_HandleServerBans(CLIENT *Client) { - char *rejectptr; + char reject[COMMAND_LEN]; assert(Client != NULL); - rejectptr = Class_GetMemberReason(CLASS_GLINE, Client); - if (!rejectptr) - rejectptr = Class_GetMemberReason(CLASS_KLINE, Client); - if (rejectptr) { - Client_Reject(Client, rejectptr, true); + if (Class_GetMemberReason(CLASS_GLINE, Client, reject, sizeof(reject)) || + Class_GetMemberReason(CLASS_KLINE, Client, reject, sizeof(reject))) { + Client_Reject(Client, reject, true); return DISCONNECTED; } diff --git a/src/ngircd/class.h b/src/ngircd/class.h index 2a9dbba..ba2e160 100644 --- a/src/ngircd/class.h +++ b/src/ngircd/class.h @@ -29,7 +29,8 @@ GLOBAL bool Class_AddMask PARAMS((const int Class, const char *Mask, const time_t ValidUntil, const char *Reason)); GLOBAL void Class_DeleteMask PARAMS((const int Class, const char *Mask)); -GLOBAL char *Class_GetMemberReason PARAMS((const int Class, CLIENT *Client)); +GLOBAL bool Class_GetMemberReason PARAMS((const int Class, CLIENT *Client, + char *reason, size_t len)); GLOBAL bool Class_HandleServerBans PARAMS((CLIENT *Client)); GLOBAL struct list_head *Class_GetList PARAMS((const int Class)); diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 21058a0..bab30f2 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -130,7 +130,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; @@ -320,18 +321,21 @@ 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 if a buffer + * is provided. * - * @param h List head. + * @param h List head. * @param Client Client to check. + * @param reason Result buffer to store the reason. + * @param len Size of the buffer. * @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; @@ -343,19 +347,21 @@ Lists_CheckReason(struct list_head *h, CLIENT *Client) while (e) { next = e->next; if (Match(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; } /** diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index 24504df..eb863db 100644 --- a/src/ngircd/lists.h +++ b/src/ngircd/lists.h @@ -30,7 +30,8 @@ GLOBAL struct list_elem *Lists_GetFirst PARAMS((const struct list_head *)); GLOBAL struct list_elem *Lists_GetNext PARAMS((const struct list_elem *)); GLOBAL bool Lists_Check PARAMS((struct list_head *head, CLIENT *client)); -GLOBAL char *Lists_CheckReason PARAMS((struct list_head *head, CLIENT *client)); +GLOBAL bool Lists_CheckReason PARAMS((struct list_head *head, CLIENT *client, + char *reason, size_t len)); GLOBAL struct list_elem *Lists_CheckDupeMask PARAMS((const struct list_head *head, const char *mask));

1 0

Alexander Barton : Update doc/Platforms.txt a little bit ...
by alex＠arthur.barton.de 01 Apr '13

01 Apr '13

Module: ngircd.git Branch: master Commit: 528c8fc244cb689d83d10203330718ba6b593458 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=528c8fc2… Author: Alexander Barton <alex(a)barton.de> Date: Mon Apr 1 17:23:49 2013 +0200 Update doc/Platforms.txt a little bit ... --- doc/Platforms.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 9ff3b6c..e9c19a4 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2012 Alexander Barton and Contributors. + (c)2001-2013 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. @@ -26,7 +26,7 @@ list can be updated. Thanks for your help! Platform Compiler ngIRCd Date Tester C M T R See --------------------------- ------------ ---------- -------- ------ - - - - --- alpha/unknown/netbsd3.0 gcc 3.3.3 CVSHEAD 06-05-07 fw Y Y Y Y (3) -armv6l/unkn./linux-gnueabi gcc 4.4.5 19.1 12-06-04 goetz Y Y Y Y (5) +armv6l/unkn./linux-gnueabi gcc 4.7.2 20.2 13-03-08 goetz Y Y Y Y (5) armv7l/unkn./linux-gnueabi gcc 4.4.3 19.1 12-04-29 goetz Y Y Y Y (5) hppa/unknown/openbsd3.5 gcc 2.95.3 CVSHEAD 04-05-25 alex Y Y Y Y hppa1.1/unknown/linux-gnu gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y @@ -73,10 +73,10 @@ powerpc/unknown/openbsd3.6 gcc 2.95.3 0.10.0 06-10-08 alex Y Y N Y sparc/sun/solaris2.6 gcc 2.95.3 0.7.x-CVS 03-04-22 alex Y Y Y Y sparc/sun/solaris2.7 gcc 3.3 0.8.0 04-05-30 alex Y Y Y Y sparc/unkn./netbsdelf1.6.1 gcc 2.95.3 0.8.0 04-05-30 alex Y Y Y Y -x86_64/apple/darwin12.2.0 gcc 4.2.1 20~rc1 12-11-13 alex Y Y Y Y (3) +x86_64/apple/darwin12.3.0 gcc 4.2.1 20.2 13-04-01 alex Y Y Y Y (3) x86_64/unknown/freebsd8.1 gcc 4.2.1 20~rc1 12-11-13 alex Y Y Y Y (3) x86_64/unkn./freebsd8.1-gnu gcc 4.4.5 19 12-02-26 alex Y Y Y Y (3) -x86_64/unknown/linux-gnu gcc 4.4.5 20~rc1 12-02-26 alex Y Y Y Y (1) +x86_64/unknown/linux-gnu gcc 4.4.5 20.2 13-04-01 alex Y Y Y Y (1) x86_64/unknown/openbsd4.7 gcc 3.3.5 20~rc1 12-02-26 alex Y Y Y Y (3) x86_64/unknown/openbsd4.8 gcc 4.2.1 20~rc1 12-11-13 alex Y Y Y Y (3)

1 0