X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-mode.c;h=ca4cdd0624f6db851d7fdd2e0920612835066a2f;hp=3cceaeb898af3d90dd8df5b35daca4c438a00893;hb=186ab51137886166ad56f1682d7caafff61cf304;hpb=7795b07c53f29bfdcfb2e4ebb5a9d18e283773c0 diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 3cceaeb8..ca4cdd06 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@barton.de) and Contributors. + * Copyright (c)2001-2012 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 @@ -36,18 +36,19 @@ #include "irc-mode.h" -static bool Client_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, - CLIENT *Target )); -static bool Channel_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, - CHANNEL *Channel )); +static bool Client_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, + CLIENT *Target)); +static bool Channel_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, + CHANNEL *Channel)); -static bool Add_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client, - CHANNEL *Channel, const char *Pattern)); -static bool Del_Ban_Invite PARAMS((int 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 char *Mode, CLIENT *Prefix, - CLIENT *Client, CHANNEL *Channel, const char *Mask)); +static bool Send_ListChange PARAMS((const bool IsAdd, const char ModeChar, + CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Mask)); /** @@ -102,6 +103,27 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) } /* IRC_MODE */ +/** + * Check if the "mode limit" for a client has been reached. + * + * This limit doesn't apply for servers or services! + * + * @param Client The client to check. + * @param Count The number of modes already handled. + * @return true if the limit has been reached. + */ +static bool +Mode_Limit_Reached(CLIENT *Client, int Count) +{ + if (Client_Type(Client) == CLIENT_SERVER + || Client_Type(Client) == CLIENT_SERVICE) + return false; + if (Count < MAX_HNDL_MODES_ARG) + return false; + return true; +} + + /** * Handle client mode requests * @@ -192,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 */ @@ -233,6 +256,14 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) ERR_RESTRICTED_MSG, Client_ID(Origin)); break; + case 'R': /* Registered (not [un]settable by clients) */ + if (Client_Type(Client) == CLIENT_SERVER) + x[0] = 'R'; + else + ok = IRC_WriteStrClient(Origin, + ERR_NICKREGISTER_MSG, + Client_ID(Origin)); + break; case 'x': /* Cloak hostname */ if (Client_HasMode(Client, 'r')) ok = IRC_WriteStrClient(Origin, @@ -253,7 +284,6 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) set ? '+' : '-', *mode_ptr); x[0] = '\0'; - goto client_exit; } else { Log(LOG_DEBUG, "Handling unknown mode \"%c%c\" from \"%s\" for \"%s\" ...", @@ -278,11 +308,10 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) strlcat(the_modes, x, sizeof(the_modes)); } } -client_exit: /* 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'; @@ -377,7 +406,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; @@ -430,6 +459,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 @@ -479,6 +510,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) case 'i': /* Invite only */ case 'm': /* Moderated */ case 'n': /* Only members can write */ + case 'R': /* Registered users only */ case 's': /* Secret channel */ case 't': /* Topic locked */ case 'z': /* Secure connections only */ @@ -490,6 +522,8 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Client_ID(Origin), Channel_Name(Channel)); break; case 'k': /* Channel key */ + if (Mode_Limit_Reached(Client, mode_arg_count++)) + goto chan_exit; if (!set) { if (modeok) x[0] = *mode_ptr; @@ -524,6 +558,8 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) } break; case 'l': /* Member limit */ + if (Mode_Limit_Reached(Client, mode_arg_count++)) + goto chan_exit; if (!set) { if (modeok) x[0] = *mode_ptr; @@ -634,14 +670,17 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) /* --- Channel lists --- */ case 'I': /* Invite lists */ case 'b': /* Ban lists */ + case 'e': /* Channel exception lists */ + if (Mode_Limit_Reached(Client, mode_arg_count++)) + goto chan_exit; if (arg_arg > mode_arg) { /* 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 { @@ -653,10 +692,17 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Req->argv[arg_arg][0] = '\0'; arg_arg++; } else { - if (*mode_ptr == 'I') + switch (*mode_ptr) { + case 'I': Channel_ShowInvites(Origin, Channel); - else + break; + case 'b': Channel_ShowBans(Origin, Channel); + break; + case 'e': + Channel_ShowExcepts(Origin, Channel); + break; + } } break; default: @@ -666,11 +712,10 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) set ? '+' : '-', *mode_ptr, Client_ID(Origin), Channel_Name(Channel)); connected = IRC_WriteStrClient(Origin, - ERR_UMODEUNKNOWNFLAG2_MSG, - Client_ID(Origin), - set ? '+' : '-', *mode_ptr); + ERR_UNKNOWNMODE_MSG, + Client_ID(Origin), *mode_ptr, + Channel_Name(Channel)); x[0] = '\0'; - goto chan_exit; } else { Log(LOG_DEBUG, "Handling unknown mode \"%c%c\" from \"%s\" on %s ...", @@ -804,82 +849,151 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req ) } /* IRC_AWAY */ +/** + * Add entries to channel invite, ban and exception lists. + * + * @param what Can be 'I' for invite, 'b' for ban, and 'e' for exception list. + * @param Prefix The originator of the command. + * @param Client The sender of the command. + * @param Channel The channel of which the list should be modified. + * @param Pattern The pattern to add to the list. + * @return CONNECTED or DISCONNECTED. + */ static bool -Add_Ban_Invite(int 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; - bool already; - bool ret; + struct list_head *list = NULL; + long int current_count; - assert( Client != NULL ); - assert( Channel != NULL ); - assert( Pattern != NULL ); - assert(what == 'I' || what == 'b'); + assert(Client != NULL); + assert(Channel != NULL); + assert(Pattern != NULL); + assert(what == 'I' || what == 'b' || what == 'e'); mask = Lists_MakeMask(Pattern); + current_count = Lists_Count(Channel_GetListInvites(Channel)) + + Lists_Count(Channel_GetListExcepts(Channel)) + + Lists_Count(Channel_GetListBans(Channel)); - already = Lists_CheckDupeMask(Channel_GetListInvites(Channel), mask); - if (!already) { - if (what == 'I') - ret = Channel_AddInvite(Channel, mask, false); - else - ret = Channel_AddBan(Channel, mask); - if (!ret) - return CONNECTED; + switch(what) { + case 'I': + list = Channel_GetListInvites(Channel); + break; + case 'b': + list = Channel_GetListBans(Channel); + break; + case 'e': + list = Channel_GetListExcepts(Channel); + break; } - if (already && (Client_Type(Prefix) == CLIENT_SERVER)) - return CONNECTED; - if (what == 'I') - return Send_ListChange("+I", Prefix, Client, Channel, mask); - return Send_ListChange("+b", Prefix, Client, Channel, mask); + if (Lists_CheckDupeMask(list, mask)) + return CONNECTED; + if (Client_Type(Client) == CLIENT_USER && + current_count >= MAX_HNDL_CHANNEL_LISTS) + return IRC_WriteStrClient(Client, ERR_LISTFULL_MSG, + Client_ID(Client), + Channel_Name(Channel), mask, + MAX_HNDL_CHANNEL_LISTS); + + switch (what) { + case 'I': + if (!Channel_AddInvite(Channel, mask, false)) + return CONNECTED; + break; + case 'b': + if (!Channel_AddBan(Channel, mask)) + return CONNECTED; + break; + case 'e': + if (!Channel_AddExcept(Channel, mask)) + return CONNECTED; + break; + } + return Send_ListChange(true, what, Prefix, Client, Channel, mask); } +/** + * Delete entries from channel invite, ban and exeption lists. + * + * @param what Can be 'I' for invite, 'b' for ban, and 'e' for exception list. + * @param Prefix The originator of the command. + * @param Client The sender of the command. + * @param Channel The channel of which the list should be modified. + * @param Pattern The pattern to add to the list. + * @return CONNECTED or DISCONNECTED. + */ static bool -Del_Ban_Invite(int 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; + struct list_head *list = NULL; - assert( Client != NULL ); - assert( Channel != NULL ); - assert( Pattern != NULL ); - assert(what == 'I' || what == 'b'); + assert(Client != NULL); + assert(Channel != NULL); + assert(Pattern != NULL); + assert(what == 'I' || what == 'b' || what == 'e'); - mask = Lists_MakeMask( Pattern ); + 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; + case 'e': + list = Channel_GetListExcepts(Channel); + break; + } + if (!Lists_CheckDupeMask(list, mask)) + return CONNECTED; Lists_Del(list, mask); - if (what == 'I') - return Send_ListChange( "-I", Prefix, Client, Channel, mask ); - return Send_ListChange( "-b", Prefix, Client, Channel, mask ); + + return Send_ListChange(false, what, Prefix, Client, Channel, mask); } +/** + * Send information about changed channel invite/ban/exception lists to clients. + * + * @param IsAdd true if the list item has been added, false otherwise. + * @param ModeChar The mode to use (e. g. 'b' or 'I') + * @param Prefix The originator of the mode list change. + * @param Client The sender of the command. + * @param Channel The channel of which the list has been modified. + * @param Mask The mask which has been added or removed. + * @return CONNECTED or DISCONNECTED. + */ static bool -Send_ListChange(const char *Mode, CLIENT *Prefix, CLIENT *Client, - CHANNEL *Channel, const char *Mask) +Send_ListChange(const bool IsAdd, const char ModeChar, CLIENT *Prefix, + CLIENT *Client, CHANNEL *Channel, const char *Mask) { - bool ok; + bool ok = true; - if( Client_Type( Client ) == CLIENT_USER ) - { - /* send confirmation to client */ - ok = IRC_WriteStrClientPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask ); - } - else ok = true; + /* Send confirmation to the client */ + if (Client_Type(Client) == CLIENT_USER) + ok = IRC_WriteStrClientPrefix(Client, Prefix, "MODE %s %c%c %s", + Channel_Name(Channel), + IsAdd ? '+' : '-', + ModeChar, Mask); /* to other servers */ - IRC_WriteStrServersPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask ); + IRC_WriteStrServersPrefix(Client, Prefix, "MODE %s %c%c %s", + Channel_Name(Channel), IsAdd ? '+' : '-', + ModeChar, Mask); /* and local users in channel */ - IRC_WriteStrChannelPrefix( Client, Channel, Prefix, false, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask ); - + IRC_WriteStrChannelPrefix(Client, Channel, Prefix, false, + "MODE %s %c%c %s", Channel_Name(Channel), + IsAdd ? '+' : '-', ModeChar, Mask ); + return ok; } /* Send_ListChange */