X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-op.c;h=23fcc71cc14cfe8a352138a433d6a7e1e2a7f82b;hp=648da5c3c24d051961f3b39555f6bd18ff94a5af;hb=a14eb495b75c8c2a2a32ddb6eecf50dc174f811c;hpb=ff2c1efae8b8b1bf30013123bb17243dc682f7d3 diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index 648da5c3..23fcc71c 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -1,30 +1,30 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2013 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 * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. - * - * Channel operator commands */ - #include "portab.h" -static char UNUSED id[] = "$Id: irc-op.c,v 1.12 2003/12/05 11:57:28 alex Exp $"; +/** + * @file + * Channel operator commands + */ #include "imp.h" #include #include #include +#include "defines.h" #include "conn.h" -#include "client.h" #include "channel.h" -#include "defines.h" +#include "irc-macros.h" #include "irc-write.h" #include "lists.h" #include "log.h" @@ -34,93 +34,193 @@ static char UNUSED id[] = "$Id: irc-op.c,v 1.12 2003/12/05 11:57:28 alex Exp $"; #include "exp.h" #include "irc-op.h" +/* Local functions */ -GLOBAL BOOLEAN -IRC_KICK( CLIENT *Client, REQUEST *Req ) +static bool +try_kick(CLIENT *peer, CLIENT* from, const char *nick, const char *channel, + const char *reason) { - CLIENT *target, *from; - + CLIENT *target = Client_Search(nick); + + if (!target) + return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG, Client_ID(from), nick); + + Channel_Kick(peer, target, from, channel, reason); + return true; +} + +/* Global functions */ + +/** + * Handler for the IRC command "KICK". + * + * @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_KICK(CLIENT *Client, REQUEST *Req) +{ + CLIENT *from; + char *itemList = Req->argv[0]; + const char* currentNick, *currentChannel, *reason; + unsigned int channelCount = 1; + unsigned int nickCount = 1; + assert( Client != NULL ); assert( Req != NULL ); - /* Falsche Anzahl Parameter? */ - if(( Req->argc < 2) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 2, 3) + _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) + + while (*itemList) { + if (*itemList == ',') { + *itemList = '\0'; + channelCount++; + } + itemList++; + } - if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); - else from = Client; - if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); - - /* Ziel-User suchen */ - target = Client_Search( Req->argv[1] ); - if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[1] ); + itemList = Req->argv[1]; + while (*itemList) { + if (*itemList == ',') { + *itemList = '\0'; + nickCount++; + } + itemList++; + } - Channel_Kick( target, from, Req->argv[0], Req->argc == 3 ? Req->argv[2] : Client_ID( from )); - return CONNECTED; -} /* IRC_KICK */ + reason = Req->argc == 3 ? Req->argv[2] : Client_ID(from); + currentNick = Req->argv[1]; + currentChannel = Req->argv[0]; + if (channelCount == 1) { + while (nickCount > 0) { + if (!try_kick(Client, from, currentNick, + currentChannel, reason)) + return false; + + while (*currentNick) + currentNick++; + + currentNick++; + nickCount--; + } + } else if (channelCount == nickCount) { + while (nickCount > 0) { + if (!try_kick(Client, from, currentNick, + currentChannel, reason)) + return false; + + while (*currentNick) + currentNick++; + while (*currentChannel) + currentChannel++; -GLOBAL BOOLEAN -IRC_INVITE( CLIENT *Client, REQUEST *Req ) + currentNick++; + currentChannel++; + nickCount--; + } + } else { + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + } + return true; +} /* IRC_KICK */ + +/** + * Handler for the IRC command "INVITE". + * + * @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_INVITE(CLIENT *Client, REQUEST *Req) { CHANNEL *chan; CLIENT *target, *from; - BOOLEAN remember = FALSE; + const char *colon_if_necessary; + bool remember = false; assert( Client != NULL ); assert( Req != NULL ); - /* Wrong number of parameters? */ - if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2) + _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) - if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); - else from = Client; - if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); - /* Search user */ - target = Client_Search( Req->argv[0] ); - if(( ! target ) || ( Client_Type( target ) != CLIENT_USER )) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] ); - - chan = Channel_Search( Req->argv[1] ); + target = Client_Search(Req->argv[0]); + if (!target || (Client_Type(target) != CLIENT_USER)) + return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->argv[0]); - if( chan ) - { + chan = Channel_Search(Req->argv[1]); + if (chan) { /* Channel exists. Is the user a valid member of the channel? */ - if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( Client ), Req->argv[1] ); + if (!Channel_IsMemberOf(chan, from)) + return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, Client_ID(Client), Req->argv[1]); + + /* Is the channel "invite-disallow"? */ + if (strchr(Channel_Modes(chan), 'V')) + return IRC_WriteStrClient(from, ERR_NOINVITE_MSG, + Client_ID(from), Channel_Name(chan)); /* Is the channel "invite-only"? */ - if( strchr( Channel_Modes( chan ), 'i' )) - { - /* Yes. The user must be channel operator! */ - if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan )); - remember = TRUE; + if (strchr(Channel_Modes(chan), 'i')) { + /* Yes. The user must be channel owner/admin/operator/halfop! */ + if (!strchr(Channel_UserModes(chan, from), 'q') && + !strchr(Channel_UserModes(chan, from), 'a') && + !strchr(Channel_UserModes(chan, from), 'o') && + !strchr(Channel_UserModes(chan, from), 'h')) + return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG, + Client_ID(from), Channel_Name(chan)); + remember = true; } /* Is the target user already member of the channel? */ - if( Channel_IsMemberOf( chan, target )) return IRC_WriteStrClient( from, ERR_USERONCHANNEL_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] ); + if (Channel_IsMemberOf(chan, target)) + return IRC_WriteStrClient(from, ERR_USERONCHANNEL_MSG, + Client_ID(from), Req->argv[0], Req->argv[1]); /* If the target user is banned on that channel: remember invite */ - if( Lists_CheckBanned( target, chan )) remember = TRUE; + if (Lists_Check(Channel_GetListBans(chan), target)) + remember = true; - if( remember ) - { - /* We must memember this invite */ - if( ! Lists_AddInvited( from, Client_Mask( target ), chan, TRUE )) return CONNECTED; + if (remember) { + /* We must remember this invite */ + if (!Channel_AddInvite(chan, Client_Mask(target), true)) + return CONNECTED; } } - Log( LOG_DEBUG, "User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask( from ), Req->argv[0], Req->argv[1] ); - + LogDebug("User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask(from), + Req->argv[0], Req->argv[1]); + + /* + * RFC 2812 says: + * 'There is no requirement that the channel [..] must exist or be a valid channel' + * The problem with this is that this allows the "channel" to contain spaces, + * in which case we must prefix its name with a colon to make it clear that + * it is only a single argument. + */ + colon_if_necessary = strchr(Req->argv[1], ' ') ? ":":""; /* Inform target client */ - IRC_WriteStrClientPrefix( target, from, "INVITE %s %s", Req->argv[0], Req->argv[1] ); + IRC_WriteStrClientPrefix(target, from, "INVITE %s %s%s", Req->argv[0], + colon_if_necessary, Req->argv[1]); - if( Client_Conn( target ) > NONE ) - { + if (Client_Conn(target) > NONE) { /* The target user is local, so we have to send the status code */ - if( ! IRC_WriteStrClientPrefix( from, target, RPL_INVITING_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] )) return DISCONNECTED; + if (!IRC_WriteStrClientPrefix(from, target, RPL_INVITING_MSG, + Client_ID(from), Req->argv[0], colon_if_necessary, Req->argv[1])) + return DISCONNECTED; + + if (strchr(Client_Modes(target), 'a') && + !IRC_WriteStrClient(from, RPL_AWAY_MSG, Client_ID(from), + Client_ID(target), Client_Away(target))) + return DISCONNECTED; } - return CONNECTED; } /* IRC_INVITE */ - /* -eof- */