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=5e36b02bef478ce9ac2a0d96e411deaf2e11c4cc;hp=77f7a81984c3defe315bdcb1f5e160955d256d39;hb=25dd193e9b49b38db39cf549f94df4ba11812fe9;hpb=adc1eedda3162f882ee59984a3b35064dfbde492 diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index 77f7a819..5e36b02b 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -1,31 +1,29 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de) * - * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen - * der GNU General Public License (GPL), wie von der Free Software Foundation - * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 - * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. - * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste - * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. - * - * $Id: irc-op.c,v 1.3 2002/06/02 15:23:46 alex Exp $ - * - * irc-op.c: Befehle zur Channel-Verwaltung + * 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. */ - #include "portab.h" +/** + * @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-write.h" #include "lists.h" #include "log.h" @@ -36,103 +34,187 @@ #include "irc-op.h" -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; - - assert( Client != NULL ); - assert( Req != NULL ); + CLIENT *target = Client_Search(nick); - /* Valider Client? */ - if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); + if (!target) + return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG, Client_ID(from), nick); - /* Falsche Anzahl Parameter? */ - if(( Req->argc < 2) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + Channel_Kick(peer, target, from, channel, reason); + return true; +} - 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] ); - - Channel_Kick( target, from, Req->argv[0], Req->argc == 3 ? Req->argv[2] : Client_ID( from )); - return CONNECTED; -} /* IRC_KICK */ - -GLOBAL BOOLEAN -IRC_BAN( CLIENT *Client, REQUEST *Req ) +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 ); - /* Valider Client? */ - if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); + if ((Req->argc < 2) || (Req->argc > 3)) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - /* Keine Parameter? */ - if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + while (*itemList) { + if (*itemList == ',') { + *itemList = '\0'; + channelCount++; + } + itemList++; + } - return CONNECTED; -} /* IRC_BAN */ + itemList = Req->argv[1]; + while (*itemList) { + if (*itemList == ',') { + *itemList = '\0'; + nickCount++; + } + 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); + + 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 */ + + +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 ); - /* Valider Client? */ - if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - - /* Falsche Anzahl Parameter? */ - if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - 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 ); - - /* User suchen */ - target = Client_Search( Req->argv[0] ); - if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] ); - - chan = Channel_Search( Req->argv[1] ); - - if( chan ) - { - /* Der Channel existiert bereits; ist der User Mitglied? */ - if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( Client ), Req->argv[1] ); - - /* Ist der Channel "invite-only"? */ - if( strchr( Channel_Modes( chan ), 'i' )) - { - /* Ja. Der User muss Channel-Operator sein! */ - if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan )); - remember = TRUE; + if (Req->argc != 2) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + 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]); + 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]); + + /* 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; } - /* Ist der Ziel-User bereits Mitglied? */ - if( Channel_IsMemberOf( chan, target )) return IRC_WriteStrClient( from, ERR_USERONCHANNEL_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] ); + /* 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 the target user is banned on that channel: remember invite */ + if (Lists_Check(Channel_GetListBans(chan), target)) + remember = true; - Log( LOG_DEBUG, "User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask( from ), Req->argv[0], Req->argv[1] ); - IRC_WriteStrClientPrefix( target, from, "INVITE %s %s", Req->argv[0], Req->argv[1] ); - if( remember ) Lists_AddInvited( Client_Mask( target ), chan ); + if (remember) { + /* We must remember this invite */ + if (!Channel_AddInvite(chan, Client_Mask(target), true)) + return CONNECTED; + } + } - if( Client_Conn( target ) > NONE ) - { - /* lokaler Zeil-Client, Status-Code melden */ - if( ! IRC_WriteStrClientPrefix( from, from, RPL_INVITING_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] )) return DISCONNECTED; + 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%s", Req->argv[0], + colon_if_necessary, Req->argv[1]); + + 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], 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 */