- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Streamline handling of connection rejects (bad password, G/K-line)
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: eba95bb0d240aa3c8791cb6eb830ced5023db0b0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=eba95bb0… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 18:33:45 2012 +0100 Streamline handling of connection rejects (bad password, G/K-line) - Use Client_Reject(), get rid of Reject_Client(). - Refactor Class_IsMember() to Class_GetMemberReason(), - New function Class_HandleServerBans(). --- src/ngircd/class.c | 57 ++++++++++++++++++++++++++++++++++++++++++++--- src/ngircd/class.h | 5 ++- src/ngircd/irc-login.c | 38 ++++++-------------------------- 3 files changed, 63 insertions(+), 37 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index b7a5cbc..0a8ae24 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.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 @@ -26,12 +26,15 @@ #include "client.h" #include "lists.h" #include "match.h" +#include "stdio.h" #include "exp.h" #include "class.h" struct list_head My_Classes[CLASS_COUNT]; +char Reject_Reason[COMMAND_LEN]; + GLOBAL void Class_Init(void) { @@ -46,15 +49,61 @@ Class_Exit(void) for (i = 0; i < CLASS_COUNT; Lists_Free(&My_Classes[i++])); } -GLOBAL bool -Class_IsMember(const int Class, CLIENT *Client) +GLOBAL char * +Class_GetMemberReason(const int Class, CLIENT *Client) { + char *reason; + assert(Class < CLASS_COUNT); assert(Client != NULL); - return Lists_Check(&My_Classes[Class], Client); + reason = Lists_CheckReason(&My_Classes[Class], Client); + if (!reason) + return NULL; + + if (!*reason) + reason = "listed"; + + switch(Class) { + case CLASS_GLINE: + snprintf(Reject_Reason, sizeof(Reject_Reason), + "\"%s\" (G-Line)", reason); + return Reject_Reason; + case CLASS_KLINE: + snprintf(Reject_Reason, sizeof(Reject_Reason), + "\"%s\" (K-Line)", reason); + return Reject_Reason; + } + return reason; +} + +/** + * Check if a client is banned from this server: GLINE, KLINE. + * + * If a client isn't allowed to connect, it will be disconnected again. + * + * @param Client The client to check. + * @return CONNECTED if client is allowed to join, DISCONNECTED if not. + */ +GLOBAL bool +Class_HandleServerBans(CLIENT *Client) +{ + char *rejectptr; + + assert(Client != NULL); + + rejectptr = Class_GetMemberReason(CLASS_GLINE, Client); + if (!rejectptr) + rejectptr = Class_GetMemberReason(CLASS_KLINE, Client); + if (rejectptr) { + Client_Reject(Client, rejectptr, true); + return DISCONNECTED; + } + + return CONNECTED; } + GLOBAL bool Class_AddMask(const int Class, const char *Mask, time_t ValidUntil, const char *Reason) diff --git a/src/ngircd/class.h b/src/ngircd/class.h index 8c06c2e..2a9dbba 100644 --- a/src/ngircd/class.h +++ b/src/ngircd/class.h @@ -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 @@ -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 bool Class_IsMember PARAMS((const int Class, CLIENT *Client)); +GLOBAL char *Class_GetMemberReason PARAMS((const int Class, CLIENT *Client)); +GLOBAL bool Class_HandleServerBans PARAMS((CLIENT *Client)); GLOBAL struct list_head *Class_GetList PARAMS((const int Class)); diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index bbb2f0d..54818fe 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -47,7 +47,6 @@ static bool Hello_User PARAMS(( CLIENT *Client )); static bool Hello_User_PostAuth PARAMS(( CLIENT *Client )); static void Kill_Nick PARAMS(( char *Nick, char *Reason )); static void Introduce_Client PARAMS((CLIENT *To, CLIENT *Client, int Type)); -static void Reject_Client PARAMS((CLIENT *Client, const char *InternalReason)); static void cb_introduceClient PARAMS((CLIENT *Client, CLIENT *Prefix, void *i)); @@ -945,7 +944,7 @@ Hello_User(CLIENT * Client) * passwords supplied are classified as "wrong". */ if(Client_Password(Client)[0] == '\0') return Hello_User_PostAuth(Client); - Reject_Client(Client, "non-empty password"); + Client_Reject(Client, "Non-empty password", false); return DISCONNECTED; } @@ -981,7 +980,7 @@ Hello_User(CLIENT * Client) /* Check global server password ... */ if (strcmp(Client_Password(Client), Conf_ServerPwd) != 0) { /* Bad password! */ - Reject_Client(Client, "bad server password"); + Client_Reject(Client, "Bad server password", false); return DISCONNECTED; } return Hello_User_PostAuth(Client); @@ -1026,7 +1025,7 @@ cb_Read_Auth_Result(int r_fd, UNUSED short events) if (len != sizeof(result)) { Log(LOG_CRIT, "Auth: Got malformed result!"); - Reject_Client(client, "internal error"); + Client_Reject(client, "Internal error", false); return; } @@ -1034,32 +1033,13 @@ cb_Read_Auth_Result(int r_fd, UNUSED short events) Client_SetUser(client, Client_OrigUser(client), true); (void)Hello_User_PostAuth(client); } else - Reject_Client(client, "bad password"); + Client_Reject(client, "Bad password", false); } #endif /** - * Reject a client because of wrong password. - * - * This function is called either when the global server password or a password - * checked using PAM has been wrong. - * - * @param Client The client to reject. - */ -static void -Reject_Client(CLIENT *Client, const char *InternalReason) -{ - Log(LOG_ERR, - "User \"%s\" rejected (connection %d): %s!", - Client_Mask(Client), Client_Conn(Client), InternalReason); - Conn_Close(Client_Conn(Client), InternalReason, - "Access denied! Bad password?", true); -} - - -/** * Finish client registration. * * Introduce the new client to the network and send all "hello messages" @@ -1071,14 +1051,10 @@ Reject_Client(CLIENT *Client, const char *InternalReason) static bool Hello_User_PostAuth(CLIENT *Client) { - if (Class_IsMember(CLASS_GLINE, Client)) { - Reject_Client(Client, "G-Line'd"); - return DISCONNECTED; - } - if (Class_IsMember(CLASS_KLINE, Client)) { - Reject_Client(Client, "K-Line'd"); + assert(Client != NULL); + + if (Class_HandleServerBans(Client) != CONNECTED) return DISCONNECTED; - } Introduce_Client(NULL, Client, CLIENT_USER);

1 0

Alexander Barton : Update NEWS and ChangeLog files
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: 9882e578e9cbb9d86d235b45938fa57bf1e85e54 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9882e578… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 15:58:39 2012 +0100 Update NEWS and ChangeLog files --- ChangeLog | 17 ++++++++++++++++- NEWS | 26 +++++++++++++------------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d7606b..ca83f29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2011 Alexander Barton and Contributors. + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. @@ -11,6 +11,21 @@ ngIRCd Release 19 + - Implement channel exception list (mode 'e'). This allows a channel + operator to define exception masks that allow users to join the + channel even when a "ban" would match and prevent them from joining: + the exception list (e) overrides the ban list (b). + - PRIVMSG and NOTICE: Handle nick!user@host masks case-insensitive. + - Implement user mode 'C': If the target user of a PRIVMSG or NOTICE + command has the user mode 'C' set, it is required that both sender + and receiver are on the same channel. This prevents private flooding + by completely unknown clients. + - New RPL_WHOISREGNICK_MSG(307) numeric in WHOIS command replies: it + indicates if a nick name is registered (if user mode 'R' set). + - Limit channel invite, ban, and exception lists to 50 entries and fix + duplicate check and error messages when adding already listed entries + or deleting no (longer) existing ones. + - Fix both ERR_SUMMONDISABLED(445) and ERR_USERSDISABLED(446) replies. - MODE command: correctly return ERR_UNKNOWNMODE(472) numeric for unknown channel modes, instead of ERR_UMODEUNKNOWNFLAG(501). - ISUPPORT(005) numeric: add "O", "R", and "z" modes to "CHANMODES". diff --git a/NEWS b/NEWS index 523db0f..14bbe79 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,19 @@ ngIRCd Release 19 + - Implement channel exception list (mode 'e'). This allows a channel + operator to define exception masks that allow users to join the + channel even when a "ban" would match and prevent them from joining: + the exception list (e) overrides the ban list (b). + - Implement user mode 'C': If the target user of a PRIVMSG or NOTICE + command has the user mode 'C' set, it is required that both sender + and receiver are on the same channel. This prevents private flooding + by completely unknown clients. + - New RPL_WHOISREGNICK_MSG(307) numeric in WHOIS command replies: it + indicates if a nick name is registered (if user mode 'R' set). + - Limit channel invite, ban, and exception lists to 50 entries and fix + duplicate check and error messages when adding already listed entries + or deleting no (longer) existing ones. - Limit the number of list items in the reply of LIST (100), WHO (25), WHOIS (10), and WHOWAS (25) commands. - Limit the MODE command to handle a maximum number of 5 channel modes @@ -37,12 +50,6 @@ ngIRCd Release 19 Reported by Cahata, thanks! - Implement IRC commands "GLINE" and "KLINE" to ban users. G-Lines are synchronized between server on peering, K-Lines are local only. - - Xcode: update project file for Xcode 4.2. - - Only close "unrelated" sockets in forked child processes: This fixes - the problem that ngIRCd can't do any IDENT lookups because of the - socket has already been closed in the child process. - The bug has been introduced starting with ngIRCd 17 ... :-( - (commit ID 6ebb31ab35e) - Added doc/Modes.txt: document modes supported by ngIRCd. - Implement user mode "R": indicates that the nick name of this user is "registered". This mode isn't handled by ngIRCd itself, but must @@ -50,9 +57,6 @@ ngIRCd Release 19 - Implement channel mode "R": only registered users (having the user mode "R" set) are allowed to join this channel. - Test suite: bind to loopback (127.0.0.1) interface only. - - Disconnect directly linked servers sending QUIT. Without this, - the server becomes removed from the network and the client list, - but the connection isn't shut down at all ... - Handle unknown user and channel modes: these modes are saved and forwarded to other servers, but ignored otherwise. - Handle channel user modes 'a', 'h', and 'q' from remote servers. @@ -517,7 +521,3 @@ ngIRCd 0.0.2, 06.01.2002 ngIRCd 0.0.1, 31.12.2001 - erste oeffentliche Version von ngIRCd als "public preview" :-) - - --- -$Id: NEWS,v 1.88 2008/02/26 22:05:42 fw Exp $

1 0

Alexander Barton : Fix ERR_{SUMMON|USERS}DISABLED: don' t repeat command name in reply
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: 73781c1b381d6b15c3d3610392deed72737d766c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=73781c1b… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 15:41:21 2012 +0100 Fix ERR_{SUMMON|USERS}DISABLED: don't repeat command name in reply --- src/ngircd/irc-info.c | 8 ++++---- src/ngircd/messages.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index a248e8a..93c43b7 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -648,10 +648,10 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) * therefore answers with ERR_SUMMONDISABLED. */ GLOBAL bool -IRC_SUMMON(CLIENT * Client, REQUEST * Req) +IRC_SUMMON(CLIENT * Client, UNUSED REQUEST * Req) { return IRC_WriteStrClient(Client, ERR_SUMMONDISABLED_MSG, - Client_ID(Client), Req->command); + Client_ID(Client)); } /* IRC_SUMMON */ @@ -741,10 +741,10 @@ IRC_USERHOST(CLIENT *Client, REQUEST *Req) * See RFC 2812 section 4.6. As suggested there the command is disabled. */ GLOBAL bool -IRC_USERS(CLIENT * Client, REQUEST * Req) +IRC_USERS(CLIENT * Client, UNUSED REQUEST * Req) { return IRC_WriteStrClient(Client, ERR_USERSDISABLED_MSG, - Client_ID(Client), Req->command); + Client_ID(Client)); } /* IRC_USERS */ diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 26be69a..340f5f4 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -114,8 +114,8 @@ #define ERR_USERNOTINCHANNEL_MSG "441 %s %s %s :They aren't on that channel" #define ERR_NOTONCHANNEL_MSG "442 %s %s :You are not on that channel" #define ERR_USERONCHANNEL_MSG "443 %s %s %s :is already on channel" -#define ERR_SUMMONDISABLED_MSG "445 %s %s :SUMMON has been disabled" -#define ERR_USERSDISABLED_MSG "446 %s %s :USERS has been disabled" +#define ERR_SUMMONDISABLED_MSG "445 %s :SUMMON has been disabled" +#define ERR_USERSDISABLED_MSG "446 %s :USERS has been disabled" #define ERR_NOTREGISTERED_MSG "451 %s :Connection not registered" #define ERR_NOTREGISTEREDSERVER_MSG "451 %s :Connection not registered as server link" #define ERR_NEEDMOREPARAMS_MSG "461 %s %s :Syntax error"

1 0

Alexander Barton : Implement channel exception list (mode 'e')
by alex＠arthur.barton.de 21 Jan '12

21 Jan '12

Module: ngircd.git Branch: master Commit: f2fa1045e24f81e5c844dd50d6e299cb1ad9acb2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f2fa1045… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 21 19:59:57 2012 +0100 Implement channel exception list (mode 'e') This allows a channel operator to define exception masks that allow users to join the channel even when a "ban" would match and prevent them from joining: the exception list (e) overrides the ban list (b). --- src/ngircd/channel.c | 47 +++++++++++++++++++++++++++++++++++++++++++-- src/ngircd/channel.h | 11 +++++++-- src/ngircd/defines.h | 2 +- src/ngircd/irc-channel.c | 5 ++- src/ngircd/irc-mode.c | 32 ++++++++++++++++++++++++------ src/ngircd/messages.h | 6 +++- 6 files changed, 85 insertions(+), 18 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=f2fa…

1 0

Alexander Barton : {Add|Del}_Ban_Invite > {Add_To|Del_From}_List(): more generic
by alex＠arthur.barton.de 21 Jan '12

21 Jan '12

Module: ngircd.git Branch: master Commit: 33a165721b79bf896a1895e79fa0809fd6f71174 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=33a16572… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 21 19:27:03 2012 +0100 {Add|Del}_Ban_Invite > {Add_To|Del_From}_List(): more generic --- src/ngircd/irc-mode.c | 63 ++++++++++++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 26 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 3dd61e7..71c9f79 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -41,10 +41,10 @@ static bool Client_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, static bool Channel_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)); -static bool Add_Ban_Invite PARAMS((char what, CLIENT *Prefix, CLIENT *Client, - CHANNEL *Channel, const char *Pattern)); -static bool Del_Ban_Invite PARAMS((char what, CLIENT *Prefix, CLIENT *Client, - CHANNEL *Channel, const char *Pattern)); +static bool Add_To_List PARAMS((char what, CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Pattern)); +static bool Del_From_List PARAMS((char what, CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Pattern)); static bool Send_ListChange PARAMS((const bool IsAdd, const char ModeChar, CLIENT *Prefix, CLIENT *Client, @@ -668,10 +668,10 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) /* modify list */ if (modeok) { connected = set - ? Add_Ban_Invite(*mode_ptr, Origin, + ? Add_To_List(*mode_ptr, Origin, Client, Channel, Req->argv[arg_arg]) - : Del_Ban_Invite(*mode_ptr, Origin, + : Del_From_List(*mode_ptr, Origin, Client, Channel, Req->argv[arg_arg]); } else { @@ -834,7 +834,7 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req ) /** - * Add entries to channel ban and invite lists. + * Add entries to channel invite, ban and exception lists. * * @param what Can be 'I' for invite or 'b' for ban list. * @param Prefix The originator of the command. @@ -844,8 +844,8 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req ) * @return CONNECTED or DISCONNECTED. */ static bool -Add_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, - const char *Pattern) +Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, + const char *Pattern) { const char *mask; struct list_head *list; @@ -857,10 +857,14 @@ Add_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, mask = Lists_MakeMask(Pattern); - if (what == 'I') - list = Channel_GetListInvites(Channel); - else - list = Channel_GetListBans(Channel); + switch(what) { + case 'I': + list = Channel_GetListInvites(Channel); + break; + case 'b': + list = Channel_GetListBans(Channel); + break; + } if (Lists_CheckDupeMask(list, mask)) return CONNECTED; @@ -871,19 +875,22 @@ Add_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, Channel_Name(Channel), mask, MAX_HNDL_CHANNEL_LISTS); - if (what == 'I') { - if (!Channel_AddInvite(Channel, mask, false)) - return CONNECTED; - } else { - if (!Channel_AddBan(Channel, mask)) - return CONNECTED; + switch (what) { + case 'I': + if (!Channel_AddInvite(Channel, mask, false)) + return CONNECTED; + break; + case 'b': + if (!Channel_AddBan(Channel, mask)) + return CONNECTED; + break; } return Send_ListChange(true, what, Prefix, Client, Channel, mask); } /** - * Delete entries from channel ban and invite lists. + * Delete entries from channel invite, ban and exeption lists. * * @param what Can be 'I' for invite or 'b' for ban list. * @param Prefix The originator of the command. @@ -893,8 +900,8 @@ Add_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, * @return CONNECTED or DISCONNECTED. */ static bool -Del_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, - const char *Pattern) +Del_From_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, + const char *Pattern) { const char *mask; struct list_head *list; @@ -906,10 +913,14 @@ Del_Ban_Invite(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, mask = Lists_MakeMask(Pattern); - if (what == 'I') - list = Channel_GetListInvites(Channel); - else - list = Channel_GetListBans(Channel); + switch (what) { + case 'I': + list = Channel_GetListInvites(Channel); + break; + case 'b': + list = Channel_GetListBans(Channel); + break; + } if (!Lists_CheckDupeMask(list, mask)) return CONNECTED;

1 0

Alexander Barton : Rename ShowInvitesBans() to ShowChannelList(), make it more flexible
by alex＠arthur.barton.de 21 Jan '12

21 Jan '12

Module: ngircd.git Branch: master Commit: a3a4b5f6966c4378dc023ed37942e0e8f315aa56 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a3a4b5f6… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 21 13:48:31 2012 +0100 Rename ShowInvitesBans() to ShowChannelList(), make it more flexible --- src/ngircd/channel.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 4d323f2..781d91a 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1028,24 +1028,25 @@ Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce) static bool -ShowInvitesBans(struct list_head *head, CLIENT *Client, CHANNEL *Channel, bool invite) +ShowChannelList(struct list_head *head, CLIENT *Client, CHANNEL *Channel, + char *msg, char *msg_end) { struct list_elem *e; - char *msg = invite ? RPL_INVITELIST_MSG : RPL_BANLIST_MSG; - char *msg_end; - assert( Client != NULL ); - assert( Channel != NULL ); + assert (Client != NULL); + assert (Channel != NULL); e = Lists_GetFirst(head); while (e) { - if( ! IRC_WriteStrClient( Client, msg, Client_ID( Client ), - Channel_Name( Channel ), Lists_GetMask(e) )) return DISCONNECTED; + if (!IRC_WriteStrClient(Client, msg, Client_ID(Client), + Channel_Name(Channel), + Lists_GetMask(e))) + return DISCONNECTED; e = Lists_GetNext(e); } - msg_end = invite ? RPL_ENDOFINVITELIST_MSG : RPL_ENDOFBANLIST_MSG; - return IRC_WriteStrClient( Client, msg_end, Client_ID( Client ), Channel_Name( Channel )); + return IRC_WriteStrClient(Client, msg_end, Client_ID(Client), + Channel_Name(Channel)); } @@ -1057,7 +1058,8 @@ Channel_ShowBans( CLIENT *Client, CHANNEL *Channel ) assert( Channel != NULL ); h = Channel_GetListBans(Channel); - return ShowInvitesBans(h, Client, Channel, false); + return ShowChannelList(h, Client, Channel, RPL_BANLIST_MSG, + RPL_ENDOFBANLIST_MSG); } @@ -1069,7 +1071,8 @@ Channel_ShowInvites( CLIENT *Client, CHANNEL *Channel ) assert( Channel != NULL ); h = Channel_GetListInvites(Channel); - return ShowInvitesBans(h, Client, Channel, true); + return ShowChannelList(h, Client, Channel, RPL_INVITELIST_MSG, + RPL_ENDOFINVITELIST_MSG); }

1 0

Alexander Barton : PRIVMSG/NOTICE: handle nick!user@ host masks case-insensitive
by alex＠arthur.barton.de 21 Jan '12

21 Jan '12

Module: ngircd.git Branch: master Commit: 39412d648652b3fcb387cf04bf7fa9004cfcd8ba URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=39412d64… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 21 13:21:36 2012 +0100 PRIVMSG/NOTICE: handle nick!user@host masks case-insensitive And enhance our test suite to check this a little bit better :-) --- src/ngircd/irc.c | 4 ++-- src/testsuite/message-test.e | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 5af7939..9508ecc 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -440,8 +440,8 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) Client_Type(cl) != CLIENT_SERVICE) continue; if (nick != NULL && host != NULL) { - if (strcmp(nick, Client_ID(cl)) == 0 && - strcmp(user, Client_User(cl)) == 0 && + if (strcasecmp(nick, Client_ID(cl)) == 0 && + strcasecmp(user, Client_User(cl)) == 0 && strcasecmp(host, Client_HostnameCloaked(cl)) == 0) break; else diff --git a/src/testsuite/message-test.e b/src/testsuite/message-test.e index eb26ac4..d0ffcef 100644 --- a/src/testsuite/message-test.e +++ b/src/testsuite/message-test.e @@ -35,7 +35,7 @@ expect { "@* PRIVMSG nick :test\r*@* PRIVMSG nick :test" } -send "privmsg nick,#testChannel,nick :test\r" +send "privmsg Nick,#testChannel,nick :test\r" expect { timeout { exit 1 } "@* PRIVMSG nick :test\r*401*@* PRIVMSG nick :test" @@ -47,7 +47,7 @@ expect { "401" } -send "privmsg ~user(a)ngircd.test.server :test\r" +send "privmsg ~UsEr(a)ngIRCd.Test.Server :test\r" expect { timeout { exit 1 } "@* PRIVMSG nick :test" @@ -65,7 +65,7 @@ expect { # "@* PRIVMSG nick :test" #} # -#send "privmsg nick!~user@localhost :test\r" +#send "privmsg Nick!~User@LocalHost :test\r" #expect { # timeout { exit 1 } # "@* PRIVMSG nick :test"

1 0

Alexander Barton : Implement user mode 'C': require "same channel" to send message
by alex＠arthur.barton.de 16 Jan '12

16 Jan '12

Module: ngircd.git Branch: master Commit: 1f4711a5474d2f0ea4664bd9b54f036af11f96cd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1f4711a5… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 16 11:43:22 2012 +0100 Implement user mode 'C': require "same channel" to send message If the target user of a PRIVMSG or NOTICE command has the user mode 'C' set, it is required that both sender and receiver are on the same channel. This prevents private flooding by completely unknown clients. --- doc/Modes.txt | 1 + src/ngircd/defines.h | 2 +- src/ngircd/irc-mode.c | 1 + src/ngircd/irc.c | 19 +++++++++++++++++++ src/ngircd/messages.h | 1 + 5 files changed, 23 insertions(+), 1 deletions(-) diff --git a/doc/Modes.txt b/doc/Modes.txt index 20e927b..0b0e488 100644 --- a/doc/Modes.txt +++ b/doc/Modes.txt @@ -23,6 +23,7 @@ channels he is using at the moment. a 0.3.0 User is away. c 17 IRC operator wants to receive connect/disconnect NOTICEs. + C 19 Only users that share a channel are allowed to send messages. i 0.0.1 User is "invisible". o 0.0.1 User is IRC operator. r 0.0.1 User is restricted. diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index e7a14ef..9dc5e92 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -158,7 +158,7 @@ #endif /** Supported user modes. */ -#define USERMODES "aciorRswx" +#define USERMODES "acCiorRswx" /** Supported channel modes. */ #define CHANMODES "biIklmnoOPRstvz" diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index c85faa0..3dd61e7 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -214,6 +214,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) /* Validate modes */ x[0] = '\0'; switch (*mode_ptr) { + case 'C': /* Only messages from clients sharing a channel */ case 'i': /* Invisible */ case 's': /* Server messages */ case 'w': /* Wallops messages */ diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 10e3e45..2b94e33 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -349,6 +349,7 @@ static bool Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) { CLIENT *cl, *from; + CL2CHAN *cl2chan; CHANNEL *chan; char *currentTarget = Req->argv[0]; char *lastCurrentTarget = NULL; @@ -485,6 +486,23 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) } #endif + if (Client_HasMode(cl, 'C')) { + cl2chan = Channel_FirstChannelOf(cl); + while (cl2chan) { + chan = Channel_GetChannel(cl2chan); + if (Channel_IsMemberOf(chan, from)) + break; + cl2chan = Channel_NextChannelOf(cl, cl2chan); + } + if (!cl2chan) { + if (SendErrors && !IRC_WriteStrClient( + from, ERR_NOTONSAMECHANNEL_MSG, + Client_ID(from), Client_ID(cl))) + return DISCONNECTED; + goto send_next_target; + } + } + if (SendErrors && (Client_Type(Client) != CLIENT_SERVER) && strchr(Client_Modes(cl), 'a')) { /* Target is away */ @@ -522,6 +540,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) return DISCONNECTED; } + send_next_target: currentTarget = strtok_r(NULL, ",", &lastCurrentTarget); if (currentTarget) Conn_SetPenalty(Client_Conn(Client), 1); diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 0070e70..6a784fe 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -134,6 +134,7 @@ #define ERR_CANTKILLSERVER_MSG "483 %s :You can't kill a server!" #define ERR_RESTRICTED_MSG "484 %s :Your connection is restricted" #define ERR_NOOPERHOST_MSG "491 %s :Not configured for your host" +#define ERR_NOTONSAMECHANNEL_MSG "493 %s :You must share a common channel with %s" #define ERR_UMODEUNKNOWNFLAG_MSG "501 %s :Unknown mode" #define ERR_UMODEUNKNOWNFLAG2_MSG "501 %s :Unknown mode \"%c%c\""

1 0

Alexander Barton : PRIVMSG/NOTICE: don' t stop list processing on invalid target
by alex＠arthur.barton.de 16 Jan '12

16 Jan '12

Module: ngircd.git Branch: master Commit: c1656256df687c4a093ceb502de84bf4b0447f3c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c1656256… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 16 12:37:37 2012 +0100 PRIVMSG/NOTICE: don't stop list processing on invalid target Process further targets, even if one has been a server ID: just skip this one with an error message and continue. --- src/ngircd/irc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 2b94e33..5af7939 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -469,11 +469,11 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) #else if (Client_Type(cl) != ForceType) { #endif - if (!SendErrors) - return CONNECTED; - return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG, - Client_ID(from), - currentTarget); + if (SendErrors && !IRC_WriteStrClient( + from, ERR_NOSUCHNICK_MSG,Client_ID(from), + currentTarget)) + return DISCONNECTED; + goto send_next_target; } #ifndef STRICT_RFC

1 0

Alexander Barton : New RPL_WHOISREGNICK_MSG(307) numeric: indicate if nick is registered
by alex＠arthur.barton.de 16 Jan '12

16 Jan '12

Module: ngircd.git Branch: master Commit: 4d0069c3a8021c32b5bdeeec57f1d41d369587ce URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4d0069c3… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 16 02:18:24 2012 +0100 New RPL_WHOISREGNICK_MSG(307) numeric: indicate if nick is registered --- src/ngircd/irc-info.c | 6 ++++++ src/ngircd/messages.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index f383dac..a248e8a 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1108,6 +1108,12 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) Client_ID(c))) return DISCONNECTED; + /* Registered nick name? */ + if (Client_HasMode(c, 'R') && + !IRC_WriteStrClient(from, RPL_WHOISREGNICK_MSG, + Client_ID(from), Client_ID(c))) + return DISCONNECTED; + /* Idle and signon time (local clients only!) */ if (!Conf_MorePrivacy && Client_Conn(c) > NONE && !IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG, diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index c5d8336..0070e70 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -56,6 +56,7 @@ #define RPL_ISON_MSG "303 %s :" #define RPL_UNAWAY_MSG "305 %s :You are no longer marked as being away" #define RPL_NOWAWAY_MSG "306 %s :You have been marked as being away" +#define RPL_WHOISREGNICK_MSG "307 %s %s :is a registered nick" #define RPL_WHOISUSER_MSG "311 %s %s %s %s * :%s" #define RPL_WHOISSERVER_MSG "312 %s %s %s :%s" #define RPL_WHOISOPERATOR_MSG "313 %s %s :is an IRC operator"

1 0