- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : New function IRC_CheckListTooBig() to check size of list replies
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: f8405b1a4f032a125372b03711f6bed1ecac2bd6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f8405b1a… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 20:05:07 2012 +0100 New function IRC_CheckListTooBig() to check size of list replies It the limit is reached, a NOTICE is sent to the client and list processing should stop. --- src/ngircd/irc.c | 31 ++++++++++++++++++++++++++++++- src/ngircd/irc.h | 5 ++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 7a87137..10e3e45 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2004 Alexander Barton <alex(a)barton.de> + * Copyright (c)2001-2012 Alexander Barton (alex(a)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 @@ -45,6 +45,35 @@ static bool Send_Message_Mask PARAMS((CLIENT *from, char *command, bool SendErrors)); +/** + * Check if a list limit is reached and inform client accordingly. + * + * @param From The client. + * @param Count Reply item count. + * @param Limit Reply limit. + * @param Name Name of the list. + * @return true if list limit has been reached; false otherwise. + */ +GLOBAL bool +IRC_CheckListTooBig(CLIENT *From, const int Count, const int Limit, + const char *Name) +{ + assert(From != NULL); + assert(Count >= 0); + assert(Limit > 0); + assert(Name != NULL); + + if (Count < Limit) + return false; + + (void)IRC_WriteStrClient(From, + "NOTICE %s :%s list limit (%d) reached!", + Client_ID(From), Name, Limit); + IRC_SetPenalty(From, 2); + return true; +} + + GLOBAL bool IRC_ERROR( CLIENT *Client, REQUEST *Req ) { diff --git a/src/ngircd/irc.h b/src/ngircd/irc.h index cdeb745..c2f9b66 100644 --- a/src/ngircd/irc.h +++ b/src/ngircd/irc.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2012 Alexander Barton (alex(a)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 @@ -17,6 +17,9 @@ * IRC commands (header) */ +GLOBAL bool IRC_CheckListTooBig PARAMS((CLIENT *From, const int Count, + const int Limit, const char *Name)); + GLOBAL bool IRC_ERROR PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_KILL PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_NOTICE PARAMS((CLIENT *Client, REQUEST *Req));

1 0

Alexander Barton : LIST command: compare pattern case insensitive
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: fdfc27265ef27e445de89217d08f9a57219355df URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fdfc2726… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 19:55:21 2012 +0100 LIST command: compare pattern case insensitive --- src/ngircd/irc-channel.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index c5eb369..94a8a4d 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -645,10 +645,12 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) while (pattern) { /* Loop through all the channels */ + if (Req->argc > 0) + ngt_LowerStr(pattern); chan = Channel_First(); while (chan) { /* Check search pattern */ - if (Match(pattern, Channel_Name(chan))) { + if (MatchCaseInsensitive(pattern, Channel_Name(chan))) { /* Gotcha! */ if (!strchr(Channel_Modes(chan), 's') || Channel_IsMemberOf(chan, from)) {

1 0

Alexander Barton : Limit list replies of LIST, WHO, WHOIS, and MAX_RPL_WHOWAS
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: c5beca8aabab6d1822f63e86e5db02649d7b1a41 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c5beca8a… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 20:06:25 2012 +0100 Limit list replies of LIST, WHO, WHOIS, and MAX_RPL_WHOWAS Introduce new #define's MAX_RPL_LIST(100), MAX_RPL_WHO(25), MAX_RPL_WHOIS(10), and MAX_RPL_WHOWAS(25). --- src/ngircd/defines.h | 18 +++++++++++++++--- src/ngircd/irc-channel.c | 8 ++++++++ src/ngircd/irc-info.c | 23 +++++++++++++++++++---- 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 2613a35..e758668 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -178,12 +178,24 @@ /* Defaults and limits for IRC commands */ -/** Default count of WHOWAS command replies */ -#define DEF_RPL_WHOWAS 5 +/** Max. number of LIST replies. */ +#define MAX_RPL_LIST 100 -/** Max. number of channel modes with arguments per MODE command */ +/** Max. number of channel modes with arguments per MODE command. */ #define MAX_HNDL_MODES_ARG 5 +/** Max. number of WHO replies. */ +#define MAX_RPL_WHO 25 + +/** Max. number of WHOIS replies. */ +#define MAX_RPL_WHOIS 10 + +/** Default count of WHOWAS command replies. */ +#define DEF_RPL_WHOWAS 5 + +/** Max count of WHOWAS command replies. */ +#define MAX_RPL_WHOWAS 25 + #endif diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 94a8a4d..52ba093 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -31,6 +31,7 @@ #include "match.h" #include "messages.h" #include "parse.h" +#include "irc.h" #include "irc-info.h" #include "irc-write.h" #include "conf.h" @@ -602,6 +603,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) char *pattern; CHANNEL *chan; CLIENT *from, *target; + int count = 0; assert(Client != NULL); assert(Req != NULL); @@ -654,12 +656,17 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) /* Gotcha! */ if (!strchr(Channel_Modes(chan), 's') || Channel_IsMemberOf(chan, from)) { + if (IRC_CheckListTooBig(from, count, + MAX_RPL_LIST, + "LIST")) + break; if (!IRC_WriteStrClient(from, RPL_LIST_MSG, Client_ID(from), Channel_Name(chan), Channel_MemberCount(chan), Channel_Topic( chan ))) return DISCONNECTED; + count++; } } chan = Channel_Next(chan); @@ -672,6 +679,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) pattern = NULL; } + IRC_SetPenalty(from, 2); return IRC_WriteStrClient(from, RPL_LISTEND_MSG, Client_ID(from)); } /* IRC_LIST */ diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 8c87d93..fd4cbee 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -37,6 +37,7 @@ #include "match.h" #include "tool.h" #include "parse.h" +#include "irc.h" #include "irc-write.h" #include "exp.h" @@ -833,6 +834,7 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) const char *chan_user_modes; char flags[8]; CLIENT *c; + int count = 0; assert( Client != NULL ); assert( Chan != NULL ); @@ -855,6 +857,9 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) is_visible = strchr(client_modes, 'i') == NULL; if (is_member || is_visible) { + if (IRC_CheckListTooBig(Client, count, MAX_RPL_WHO, "WHO")) + break; + strcpy(flags, who_flags_status(client_modes)); if (is_ircop) strlcat(flags, "*", sizeof(flags)); @@ -866,6 +871,7 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) if (!write_whoreply(Client, c, Channel_Name(Chan), flags)) return DISCONNECTED; + count++; } } return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client), @@ -889,6 +895,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps) CHANNEL *chan; bool client_match, is_visible; char flags[4]; + int count = 0; assert (Client != NULL); @@ -939,13 +946,16 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps) if (!is_visible) /* target user is not visible */ continue; + if (IRC_CheckListTooBig(Client, count, MAX_RPL_WHO, "WHO")) + break; + strcpy(flags, who_flags_status(Client_Modes(c))); if (strchr(Client_Modes(c), 'o')) strlcat(flags, "*", sizeof(flags)); if (!write_whoreply(Client, c, "*", flags)) return DISCONNECTED; - + count++; } return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client), @@ -1182,7 +1192,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) * - no wildcards for remote clients * - only one wildcard target per local client * - * also, at most ten matches are returned. + * Also, at most MAX_RPL_WHOIS matches are returned. */ if (!has_wildcards || is_remote) { c = Client_Search(query); @@ -1208,13 +1218,18 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) got_wildcard = true; IRC_SetPenalty(Client, 3); - for (c = Client_First(); c && match_count < 10; c = Client_Next(c)) { + for (c = Client_First(); c; c = Client_Next(c)) { + if (IRC_CheckListTooBig(Client, match_count, + MAX_RPL_WHOIS, "WHOIS")) + break; + if (Client_Type(c) != CLIENT_USER) continue; if (!MatchCaseInsensitive(query, Client_ID(c))) continue; if (!IRC_WHOIS_SendReply(Client, from, c)) return DISCONNECTED; + match_count++; } @@ -1310,7 +1325,7 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req ) if (Req->argc > 1) { max = atoi(Req->argv[1]); if (max < 1) - max = MAX_WHOWAS; + max = MAX_RPL_WHOWAS; } /*

1 0

Alexander Barton : DEFAULT_WHOWAS->DEF_RPL_WHOWAS; MAX_CMODES_ARG-> MAX_HNDL_MODES_ARG
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: 9260759cec948b5b3f1a5e84c435d7afe4313718 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9260759c… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 18:56:53 2012 +0100 DEFAULT_WHOWAS->DEF_RPL_WHOWAS; MAX_CMODES_ARG->MAX_HNDL_MODES_ARG To streamline naming, in preparation for MAX_RPL_WHO and MAX_RPL_WHOWAS :-) --- src/ngircd/defines.h | 4 ++-- src/ngircd/irc-info.c | 4 ++-- src/ngircd/irc-mode.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 4d982c7..2613a35 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -179,10 +179,10 @@ /* Defaults and limits for IRC commands */ /** Default count of WHOWAS command replies */ -#define DEFAULT_WHOWAS 5 +#define DEF_RPL_WHOWAS 5 /** Max. number of channel modes with arguments per MODE command */ -#define MAX_CMODES_ARG 5 +#define MAX_HNDL_MODES_ARG 5 #endif diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index c241265..8c87d93 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1306,7 +1306,7 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req ) if (last < 0) last = 0; - max = DEFAULT_WHOWAS; + max = DEF_RPL_WHOWAS; if (Req->argc > 1) { max = atoi(Req->argv[1]); if (max < 1) @@ -1568,7 +1568,7 @@ IRC_Send_ISUPPORT(CLIENT * Client) return IRC_WriteStrClient(Client, RPL_ISUPPORT2_MSG, Client_ID(Client), CHANNEL_NAME_LEN - 1, Conf_MaxNickLength - 1, COMMAND_LEN - 23, CLIENT_AWAY_LEN - 1, - COMMAND_LEN - 113, MAX_CMODES_ARG); + COMMAND_LEN - 113, MAX_HNDL_MODES_ARG); } /* IRC_Send_ISUPPORT */ diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 7eb81cf..0c63e72 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -491,7 +491,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Client_ID(Origin), Channel_Name(Channel)); break; case 'k': /* Channel key */ - if (mode_arg_count++ >= MAX_CMODES_ARG) + if (mode_arg_count++ >= MAX_HNDL_MODES_ARG) goto chan_exit; if (!set) { if (modeok) @@ -527,7 +527,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) } break; case 'l': /* Member limit */ - if (mode_arg_count++ >= MAX_CMODES_ARG) + if (mode_arg_count++ >= MAX_HNDL_MODES_ARG) goto chan_exit; if (!set) { if (modeok) @@ -639,7 +639,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) /* --- Channel lists --- */ case 'I': /* Invite lists */ case 'b': /* Ban lists */ - if (mode_arg_count++ >= MAX_CMODES_ARG) + if (mode_arg_count++ >= MAX_HNDL_MODES_ARG) goto chan_exit; if (arg_arg > mode_arg) { /* modify list */

1 0

Alexander Barton : IRC_LIST(): Code cleanup
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: a4d1e6007fe50e14888769aab2b650ba1792fa9f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a4d1e600… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 19:54:23 2012 +0100 IRC_LIST(): Code cleanup --- src/ngircd/irc-channel.c | 86 ++++++++++++++++++++++------------------------ 1 files changed, 41 insertions(+), 45 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 6ddad88..c5eb369 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -592,9 +592,9 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) * This implementation handles the local case as well as the forwarding of the * LIST command to other servers in the IRC network. * - * @param Client The client from which this command has been received - * @param Req Request structure with prefix and all parameters - * @returns CONNECTED or DISCONNECTED + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. */ GLOBAL bool IRC_LIST( CLIENT *Client, REQUEST *Req ) @@ -603,78 +603,74 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) CHANNEL *chan; CLIENT *from, *target; - assert( Client != NULL ); - assert( Req != NULL ); + assert(Client != NULL); + assert(Req != NULL); /* Bad number of prameters? */ - if( Req->argc > 2 ) - return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID( Client ), Req->command ); + if (Req->argc > 2) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - if( Req->argc > 0 ) - pattern = strtok( Req->argv[0], "," ); + if (Req->argc > 0) + pattern = strtok(Req->argv[0], ","); else pattern = "*"; /* Get sender from prefix, if any */ - if( Client_Type( Client ) == CLIENT_SERVER ) - from = Client_Search( Req->prefix ); + if (Client_Type(Client) == CLIENT_SERVER) + from = Client_Search(Req->prefix); else from = Client; - if( ! from ) - return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, - Client_ID( Client ), Req->prefix ); + if (!from) + return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG, + Client_ID(Client), Req->prefix); - if( Req->argc == 2 ) - { + if (Req->argc == 2) { /* Forward to other server? */ - target = Client_Search( Req->argv[1] ); - if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) - return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, - Client_ID( Client ), Req->argv[1] ); + target = Client_Search(Req->argv[1]); + if (! target || Client_Type(target) != CLIENT_SERVER) + return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG, + Client_ID(Client), + Req->argv[1]); - if( target != Client_ThisServer( )) - { + if (target != Client_ThisServer()) { /* Target is indeed an other server, forward it! */ - return IRC_WriteStrClientPrefix( target, from, - "LIST %s :%s", Client_ID( from ), - Req->argv[1] ); + return IRC_WriteStrClientPrefix(target, from, + "LIST %s :%s", + Client_ID(from), + Req->argv[1]); } } - while( pattern ) - { + while (pattern) { /* Loop through all the channels */ - chan = Channel_First( ); - while( chan ) - { + chan = Channel_First(); + while (chan) { /* Check search pattern */ - if( Match( pattern, Channel_Name( chan ))) - { + if (Match(pattern, Channel_Name(chan))) { /* Gotcha! */ - if( ! strchr( Channel_Modes( chan ), 's' ) || - Channel_IsMemberOf( chan, from )) - { - if( ! IRC_WriteStrClient( from, - RPL_LIST_MSG, Client_ID( from ), - Channel_Name( chan ), - Channel_MemberCount( chan ), - Channel_Topic( chan ))) + if (!strchr(Channel_Modes(chan), 's') + || Channel_IsMemberOf(chan, from)) { + if (!IRC_WriteStrClient(from, + RPL_LIST_MSG, Client_ID(from), + Channel_Name(chan), + Channel_MemberCount(chan), + Channel_Topic( chan ))) return DISCONNECTED; } } - chan = Channel_Next( chan ); + chan = Channel_Next(chan); } /* Get next name ... */ - if( Req->argc > 0 ) - pattern = strtok( NULL, "," ); + if(Req->argc > 0) + pattern = strtok(NULL, ","); else pattern = NULL; } - return IRC_WriteStrClient( from, RPL_LISTEND_MSG, Client_ID( from )); + return IRC_WriteStrClient(from, RPL_LISTEND_MSG, Client_ID(from)); } /* IRC_LIST */

1 0

Alexander Barton : defines.h: Code cleanup and (a little bit) more documentation
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: c2ac1ad3ba67a36018e5b4833928d5f2b5e658ef URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c2ac1ad3… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 18:25:10 2012 +0100 defines.h: Code cleanup and (a little bit) more documentation --- src/ngircd/defines.h | 232 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 152 insertions(+), 80 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index b894dbc..4d982c7 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2012 Alexander Barton (alex(a)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 @@ -17,101 +17,173 @@ * Global constants ("#defines") used by the ngIRCd. */ + +/* Internal flags */ + +/** Flag: there is no connection. */ #define NONE -1 -#define FNAME_LEN 256 /* Max. length of file name */ - -#define LINE_LEN 256 /* Max. length of a line in the - configuration file */ - -#define HOST_LEN 256 /* Max. lenght of fully qualified host - names (e. g. "abc.domain.tld") */ - -#define MAX_SERVERS 16 /* Max. count of configurable servers */ - -#define MAX_WHOWAS 64 /* Max. number of WHOWAS items */ -#define DEFAULT_WHOWAS 5 /* default count for WHOWAS command */ - -#define MAX_CMODES_ARG 5 /* Max. number of channel modes with - * arguments per MODE command */ - -#define CONNECTION_POOL 100 /* Size of default connection pool */ - -#define CLIENT_ID_LEN 64 /* Max. length of an IRC ID; see RFC - RFC 2812 section 1.1 and 1.2.1 */ -#define CLIENT_NICK_LEN_DEFAULT 10 /* Default nick length, see. RFC 2812 - * section 1.2.1 */ -#define CLIENT_NICK_LEN 32 /* Maximum nick name length */ -#define CLIENT_PASS_LEN 21 /* Max. password length */ -#define CLIENT_USER_LEN 10 /* Max. length of user name ("login") - see RFC 2812, section 1.2.1 */ -#define CLIENT_NAME_LEN 32 /* Max. length of "real names" */ -#define CLIENT_HOST_LEN 64 /* Max. host name length */ -#define CLIENT_MODE_LEN 16 /* Max. length of all client modes */ -#define CLIENT_INFO_LEN 64 /* Max. length of server info texts */ -#define CLIENT_AWAY_LEN 128 /* Max. length of away messages */ -#define CLIENT_FLAGS_LEN 16 /* Max. length of client flags */ - -#define CHANNEL_NAME_LEN 51 /* Max. length of a channel name, see - RFC 2812 section 1.3 */ -#define CHANNEL_MODE_LEN 9 /* Max. length of channel modes */ - -#define COMMAND_LEN 513 /* Max. IRC command length, see. RFC - 2812 section 3.2 */ - -#define READBUFFER_LEN 2048 /* Size of the read buffer of a - connection in bytes. */ -#define WRITEBUFFER_FLUSH_LEN 4096 /* Size of a write buffer that triggers - buffer flushing if more space is - needed for storing data. */ -#define WRITEBUFFER_MAX_LEN 32768 /* Maximum size of the write buffer of a - connection in bytes. */ -#define WRITEBUFFER_SLINK_LEN 65536 /* Maximum size of the write buffer of a - server link connection in bytes. */ - -#define PROTOVER "0210" /* Implemented IRC protocol version, - see RFC 2813 section 4.1.1. */ -#define PROTOIRC "-IRC" /* Protocol suffix, see RFC 2813 - section 4.1.1 */ -#define PROTOIRCPLUS "-IRC+" /* Protocol suffix used by the IRC+ - protocol, see doc/Protocol.txt */ +/** Flag: connection is (still) established. */ +#define CONNECTED true + +/** Flag: connection isn't established (any more). */ +#define DISCONNECTED false + +/** Tag for outbound server links. */ +#define TOKEN_OUTBOUND -2 + + +/* Generic buffer sizes */ + +/** Max. length of a line in the configuration file. */ +#define LINE_LEN 256 + +/** Max. length of a log message. */ +#define MAX_LOG_MSG_LEN 256 + +/** Max. length of file name. */ +#define FNAME_LEN 256 + +/** Max. lenght of fully qualified host names (e. g. "abc.domain.tld"). */ +#define HOST_LEN 256 + + +/* Size of structures */ + +/** Max. count of configurable servers. */ +#define MAX_SERVERS 16 + +/** Max. number of WHOWAS list items that can be stored. */ +#define MAX_WHOWAS 64 + +/** Size of default connection pool. */ +#define CONNECTION_POOL 100 + + +/* Hard-coded (default) options */ + +/** Delay after startup before outgoing connections are initiated in seconds. */ +#define STARTUP_DELAY 1 + +/** Time to delay re-connect attempts in seconds. */ +#define RECONNECT_DELAY 3 + +/** Configuration file name. */ +#define CONFIG_FILE "/ngircd.conf" + +/** Name of the MOTD file. */ +#define MOTD_FILE "/ngircd.motd" + +/** Default chroot() directory. */ +#define CHROOT_DIR "" + +/** Default file for the process ID. */ +#define PID_FILE "" + + +/* Sizes of "IRC elements": nicks, users, ... */ + +/** Max. length of an IRC ID (incl. NULL); see RFC 2812 section 1.1 and 1.2.1. */ +#define CLIENT_ID_LEN 64 + +/** Default nick length (including NULL), see. RFC 2812 section 1.2.1. */ +#define CLIENT_NICK_LEN_DEFAULT 10 + +/** Maximum nick name length (including NULL). */ +#define CLIENT_NICK_LEN 32 + +/** Max. password length (including NULL). */ +#define CLIENT_PASS_LEN 21 + +/** Max. length of user name ("login"; incl. NULL), RFC 2812, section 1.2.1. */ +#define CLIENT_USER_LEN 10 + +/** Max. length of "real names" (including NULL). */ +#define CLIENT_NAME_LEN 32 + +/** Max. host name length (including NULL). */ +#define CLIENT_HOST_LEN 64 + +/** Max. length of all client modes (including NULL). */ +#define CLIENT_MODE_LEN 16 + +/** Max. length of server info texts (including NULL). */ +#define CLIENT_INFO_LEN 64 + +/** Max. length of away messages (including NULL). */ +#define CLIENT_AWAY_LEN 128 + +/** Max. length of client flags (including NULL). */ +#define CLIENT_FLAGS_LEN 16 + +/** Max. length of a channel name (including NULL), see RFC 2812 section 1.3. */ +#define CHANNEL_NAME_LEN 51 + +/** Max. length of channel modes (including NULL). */ +#define CHANNEL_MODE_LEN 9 + +/** Max. IRC command length (including NULL), see. RFC 2812 section 3.2. */ +#define COMMAND_LEN 513 + + +/* Read and write buffer sizes */ + +/** Size of the read buffer of a connection in bytes. */ +#define READBUFFER_LEN 2048 + +/** Size that triggers write buffer flushing if more space is needed. */ +#define WRITEBUFFER_FLUSH_LEN 4096 + +/** Maximum size of the write buffer of a connection in bytes. */ +#define WRITEBUFFER_MAX_LEN 32768 + +/** Maximum size of the write buffer of a server link connection in bytes. */ +#define WRITEBUFFER_SLINK_LEN 65536 + + +/* IRC/IRC+ protocol */ + +/** Implemented IRC protocol version, see RFC 2813 section 4.1.1. */ +#define PROTOVER "0210" + +/** Protocol suffix, see RFC 2813 section 4.1.1. */ +#define PROTOIRC "-IRC" + +/** Protocol suffix used by the IRC+ protocol, see <doc/Protocol.txt>. */ +#define PROTOIRCPLUS "-IRC+" #ifdef IRCPLUS -# define IRCPLUSFLAGS "CHLS" /* Standard IRC+ flags */ +/** Standard IRC+ flags. */ +# define IRCPLUSFLAGS "CHLS" #endif -#define STARTUP_DELAY 1 /* Delay outgoing connections n seconds - after startup. */ -#define RECONNECT_DELAY 3 /* Time to delay re-connect attempts - in seconds. */ +/** Supported user modes. */ +#define USERMODES "aciorRswx" -#define USERMODES "aciorRswx" /* Supported user modes. */ -#define CHANMODES "biIklmnoOPRstvz" /* Supported channel modes. */ +/** Supported channel modes. */ +#define CHANMODES "biIklmnoOPRstvz" -#define CONNECTED true /* Internal status codes. */ -#define DISCONNECTED false +/** Away message for users connected to linked servers. */ +#define DEFAULT_AWAY_MSG "Away" -#define DEFAULT_AWAY_MSG "Away" /* Away message for users connected to - linked servers. */ +/** Default ID for "topic owner". */ +#define DEFAULT_TOPIC_ID "-Server-" -#define DEFAULT_TOPIC_ID "-Server-" /* Default ID for "topic owner". */ +/** Prefix for NOTICEs from the server to users. Some servers use '*'. */ +#define NOTICE_TXTPREFIX "" -#define CONFIG_FILE "/ngircd.conf" /* Configuration file name. */ -#define MOTD_FILE "/ngircd.motd" /* Name of the MOTD file. */ -#define CHROOT_DIR "" /* Default chroot() directory. */ -#define PID_FILE "" /* Default file for the process ID. */ +/** Suffix for oversized messages that have been shortened and cut off. */ +#define CUT_TXTSUFFIX "[CUT]" -#define ERROR_DIR "/tmp" /* Error directory used in debug mode */ -#define MAX_LOG_MSG_LEN 256 /* Max. length of a log message. */ +/* Defaults and limits for IRC commands */ -#define TOKEN_OUTBOUND -2 /* Tag for outbound server links. */ +/** Default count of WHOWAS command replies */ +#define DEFAULT_WHOWAS 5 -#define NOTICE_TXTPREFIX "" /* Prefix for NOTICEs from the server - to users. Some servers use '*'. */ +/** Max. number of channel modes with arguments per MODE command */ +#define MAX_CMODES_ARG 5 -#define CUT_TXTSUFFIX "[CUT]" /* Suffix for oversized messages that - have been shortened and cut off. */ #endif

1 0

Alexander Barton : RPL_ISUPPORT (numeric 005): Report MODES=<MAX_CMODES_ARG >
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: 470d2e236258ce72c6d574b04f1400c0fedc4a3a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=470d2e23… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 17:46:52 2012 +0100 RPL_ISUPPORT (numeric 005): Report MODES=<MAX_CMODES_ARG> "Maximum number of channel modes with parameter allowed per MODE command." See <http://www.irc.org/tech_docs/005.html> for details. --- src/ngircd/irc-info.c | 4 ++-- src/ngircd/messages.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 42b2264..c241265 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2012 Alexander Barton (alex(a)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 @@ -1568,7 +1568,7 @@ IRC_Send_ISUPPORT(CLIENT * Client) return IRC_WriteStrClient(Client, RPL_ISUPPORT2_MSG, Client_ID(Client), CHANNEL_NAME_LEN - 1, Conf_MaxNickLength - 1, COMMAND_LEN - 23, CLIENT_AWAY_LEN - 1, - COMMAND_LEN - 113); + COMMAND_LEN - 113, MAX_CMODES_ARG); } /* IRC_Send_ISUPPORT */ diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 7bf7367..cf11ca5 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton <alex(a)barton.de> + * Copyright (c)2001-2012 Alexander Barton (alex(a)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 @@ -22,7 +22,7 @@ #define RPL_CREATED_MSG "003 %s :This server has been started %s" #define RPL_MYINFO_MSG "004 %s %s ngircd-%s %s %s" #define RPL_ISUPPORT1_MSG "005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=bI,k,l,imnPst CHANLIMIT=#&+:%d :are supported on this server" -#define RPL_ISUPPORT2_MSG "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d PENALTY :are supported on this server" +#define RPL_ISUPPORT2_MSG "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d PENALTY :are supported on this server" #define RPL_TRACELINK_MSG "200 %s Link %s-%s %s %s V%s %ld %d %d" #define RPL_TRACEOPERATOR_MSG "204 %s Oper 2 :%s"

1 0

Alexander Barton : Channel modes: really break handling when MAX_CMODES_ARG is hit
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: 888664435aa81f20b204e2f9629678b606697bc5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=88866443… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 17:42:52 2012 +0100 Channel modes: really break handling when MAX_CMODES_ARG is hit This fixes 98493077. --- src/ngircd/irc-mode.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 9afe907..7eb81cf 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -492,7 +492,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) break; case 'k': /* Channel key */ if (mode_arg_count++ >= MAX_CMODES_ARG) - break; + goto chan_exit; if (!set) { if (modeok) x[0] = *mode_ptr; @@ -528,7 +528,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) break; case 'l': /* Member limit */ if (mode_arg_count++ >= MAX_CMODES_ARG) - break; + goto chan_exit; if (!set) { if (modeok) x[0] = *mode_ptr; @@ -640,7 +640,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) case 'I': /* Invite lists */ case 'b': /* Ban lists */ if (mode_arg_count++ >= MAX_CMODES_ARG) - break; + goto chan_exit; if (arg_arg > mode_arg) { /* modify list */ if (modeok) {

1 0

Alexander Barton : channel modes: only handle MAX_CMODES_ARG modes with arguments
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: 98493077a2d044aa08ee5cb4bd7054579e30fb57 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=98493077… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 17:27:29 2012 +0100 channel modes: only handle MAX_CMODES_ARG modes with arguments Limit the MODE command to handle a maximum of MAX_CMODES_ARG (5) channel modes that require an argument (+Ibkl) per call. Please note: Further modes that require arguments are silently ignored and end the handling of any further modes. This is similar to the behavior of ircd2.11 (silently ignores but seems to handle other modes) as well as ircd-seven (silently ignores but handles some(!) other modes) ... --- src/ngircd/defines.h | 5 ++++- src/ngircd/irc-mode.c | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 4bcb6af..b894dbc 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) * * 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 @@ -32,6 +32,9 @@ #define MAX_WHOWAS 64 /* Max. number of WHOWAS items */ #define DEFAULT_WHOWAS 5 /* default count for WHOWAS command */ +#define MAX_CMODES_ARG 5 /* Max. number of channel modes with + * arguments per MODE command */ + #define CONNECTION_POOL 100 /* Size of default connection pool */ #define CLIENT_ID_LEN 64 /* Max. length of an IRC ID; see RFC diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 01f8762..9afe907 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -375,7 +375,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) char the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], argadd[CLIENT_PASS_LEN], *mode_ptr; bool connected, set, skiponce, retval, onchannel, modeok, use_servermode; - int mode_arg, arg_arg; + int mode_arg, arg_arg, mode_arg_count = 0; CLIENT *client; long l; size_t len; @@ -491,6 +491,8 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Client_ID(Origin), Channel_Name(Channel)); break; case 'k': /* Channel key */ + if (mode_arg_count++ >= MAX_CMODES_ARG) + break; if (!set) { if (modeok) x[0] = *mode_ptr; @@ -525,6 +527,8 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) } break; case 'l': /* Member limit */ + if (mode_arg_count++ >= MAX_CMODES_ARG) + break; if (!set) { if (modeok) x[0] = *mode_ptr; @@ -635,6 +639,8 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) /* --- Channel lists --- */ case 'I': /* Invite lists */ case 'b': /* Ban lists */ + if (mode_arg_count++ >= MAX_CMODES_ARG) + break; if (arg_arg > mode_arg) { /* modify list */ if (modeok) {

1 0

Alexander Barton : Fix handling of channel mode sequence with/ without arguments
by alex＠arthur.barton.de 06 Jan '12

06 Jan '12

Module: ngircd.git Branch: master Commit: 1fa2af5b3a95cad24c3e8b56ee7e57aa5084bfdb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1fa2af5b… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 6 17:24:55 2012 +0100 Fix handling of channel mode sequence with/without arguments For example, don't generate wrong error messages when handling "MODE #chan +IIIIItn *!aa@b *!bb@c *!cc@d *!dd@e *!ee@f". --- src/ngircd/irc-mode.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index d8329b1..01f8762 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2012 Alexander Barton (alex(a)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 @@ -280,7 +280,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) /* Are there changed modes? */ if (the_modes[1]) { - /* Remoce needless action modifier characters */ + /* Remove needless action modifier characters */ len = strlen(the_modes) - 1; if (the_modes[len] == '+' || the_modes[len] == '-') the_modes[len] = '\0'; @@ -428,6 +428,8 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) mode_ptr++; if (!*mode_ptr) { /* Try next argument if there's any */ + if (arg_arg < 0) + break; if (arg_arg > mode_arg) mode_arg = arg_arg; else

1 0