X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fchannel.c;h=3282a8d0460533301ca0c4f58675548fa35db833;hb=dc6807338e240d8093f43337dab7bfe488c35c4a;hp=00aafe05a170102a3e22053af73861b50b14e112;hpb=3ee98d9f72449c88861744aebdd0a2e570bc3bc5;p=ngircd-alex.git diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 00aafe05..3282a8d0 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors. + * Copyright (c)2001-2014 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 @@ -18,41 +18,34 @@ * Channel management */ -#include "imp.h" #include #include #include #include #include #include +#include -#include "defines.h" #include "conn-func.h" -#include "exp.h" #include "channel.h" -#include "imp.h" #include "irc-write.h" #include "conf.h" #include "hash.h" -#include "lists.h" #include "log.h" #include "messages.h" #include "match.h" - -#include "exp.h" - +#include "parse.h" +#include "irc-mode.h" #define REMOVE_PART 0 #define REMOVE_QUIT 1 #define REMOVE_KICK 2 - static CHANNEL *My_Channels; static CL2CHAN *My_Cl2Chan; - static CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client )); static CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client )); static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const char *Reason, bool InformServer )); @@ -102,9 +95,11 @@ GLOBAL void Channel_InitPredefined( void ) { CHANNEL *new_chan; + REQUEST Req; const struct Conf_Channel *conf_chan; - const char *c; - size_t i, channel_count = array_length(&Conf_Channels, sizeof(*conf_chan)); + char *c; + char modes[COMMAND_LEN], name[CHANNEL_NAME_LEN]; + size_t i, n, channel_count = array_length(&Conf_Channels, sizeof(*conf_chan)); conf_chan = array_start(&Conf_Channels); @@ -131,25 +126,65 @@ Channel_InitPredefined( void ) new_chan = Channel_Create(conf_chan->name); if (!new_chan) { - Log(LOG_ERR, "Can't create pre-defined channel \"%s\"", + Log(LOG_ERR, "Can't create pre-defined channel \"%s\"!", conf_chan->name); continue; } - Log(LOG_INFO, "Created pre-defined channel \"%s\"", - conf_chan->name); - Channel_ModeAdd(new_chan, 'P'); if (conf_chan->topic[0]) Channel_SetTopic(new_chan, NULL, conf_chan->topic); - c = conf_chan->modes; - while (*c) - Channel_ModeAdd(new_chan, *c++); + /* Evaluate modes strings with fake requests */ + if (conf_chan->modes_num) { + /* Prepare fake request structure */ + strlcpy(name, conf_chan->name, sizeof(name)); + Log(LOG_INFO, "Evaluating predefined channel modes for \"%s\".", name); + Req.argv[0] = name; + Req.prefix = Client_ID(Client_ThisServer()); + Req.command = "MODE"; + + /* Iterate over channel modes strings */ + for (n = 0; n < conf_chan->modes_num; n++) { + Req.argc = 1; + strlcpy(modes, conf_chan->modes[n], sizeof(modes)); + Log(LOG_DEBUG, "Evaluate \"MODE %s %s\".", name, modes); + c = strtok(modes, " "); + while (c && Req.argc < 15) { + Req.argv[Req.argc++] = c; + c = strtok(0, " "); + } + + if (Req.argc > 1) { + /* Handling of legacy "Key" and "MaxUsers" settings: + * Enforce setting the respective mode(s), to support + * the legacy "Mode = kl" notation, which was valid but + * is an invalid MODE string: key and limit are missing! + * So set them manually when "k" or "l" are detected in + * the first MODE parameter ... */ + if (Req.argc > 1 && strchr(Req.argv[1], 'k')) { + Channel_SetKey(new_chan, conf_chan->key); + Channel_ModeAdd(new_chan, 'k'); + } + if (strchr(Req.argv[1], 'l')) { + Channel_SetMaxUsers(new_chan, conf_chan->maxusers); + Channel_ModeAdd(new_chan, 'l'); + } + + IRC_MODE(Client_ThisServer(), &Req); + } + + /* Original channel modes srings are no longer needed */ + free(conf_chan->modes[n]); + } + } - Channel_SetKey(new_chan, conf_chan->key); - Channel_SetMaxUsers(new_chan, conf_chan->maxusers); Set_KeyFile(new_chan, conf_chan->keyfile); + + Log(LOG_INFO, + "Created pre-defined channel \"%s\", mode \"%s\" (key \"%s\", limit %d).", + new_chan->name, new_chan->modes, new_chan->key, + new_chan->maxusers); } if (channel_count) array_free(&Conf_Channels); @@ -223,7 +258,7 @@ Channel_Join( CLIENT *Client, const char *Name ) /* Check that the channel name is valid */ if (! Channel_IsValidName(Name)) { - IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG, + IRC_WriteErrClient(Client, ERR_NOSUCHCHANNEL_MSG, Client_ID(Client), Name); return false; } @@ -268,14 +303,14 @@ Channel_Part(CLIENT * Client, CLIENT * Origin, const char *Name, const char *Rea /* Check that specified channel exists */ chan = Channel_Search(Name); if (!chan) { - IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG, + IRC_WriteErrClient(Client, ERR_NOSUCHCHANNEL_MSG, Client_ID(Client), Name); return false; } /* Check that the client is in the channel */ if (!Get_Cl2Chan(chan, Client)) { - IRC_WriteStrClient(Client, ERR_NOTONCHANNEL_MSG, + IRC_WriteErrClient(Client, ERR_NOTONCHANNEL_MSG, Client_ID(Client), Name); return false; } @@ -299,7 +334,6 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name, const char *Reason ) { CHANNEL *chan; - char *ptr, *target_modes; bool can_kick = false; assert(Peer != NULL); @@ -310,9 +344,9 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name, /* Check that channel exists */ chan = Channel_Search( Name ); - if( ! chan ) - { - IRC_WriteStrClient( Origin, ERR_NOSUCHCHANNEL_MSG, Client_ID( Origin ), Name ); + if (!chan) { + IRC_WriteErrClient(Origin, ERR_NOSUCHCHANNEL_MSG, + Client_ID(Origin), Name); return; } @@ -320,75 +354,68 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name, Client_Type(Origin) != CLIENT_SERVICE) { /* Check that user is on the specified channel */ if (!Channel_IsMemberOf(chan, Origin)) { - IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, - Client_ID(Origin), Name); + IRC_WriteErrClient(Origin, ERR_NOTONCHANNEL_MSG, + Client_ID(Origin), Name); return; } } + /* Check that the client to be kicked is on the specified channel */ + if (!Channel_IsMemberOf(chan, Target)) { + IRC_WriteErrClient(Origin, ERR_USERNOTINCHANNEL_MSG, + Client_ID(Origin), Client_ID(Target), Name ); + return; + } + if(Client_Type(Peer) == CLIENT_USER) { /* Channel mode 'Q' and user mode 'q' on target: nobody but * IRC Operators and servers can kick the target user */ - if ((strchr(Channel_Modes(chan), 'Q') + if ((Channel_HasMode(chan, 'Q') || Client_HasMode(Target, 'q') || Client_Type(Target) == CLIENT_SERVICE) && !Client_HasMode(Origin, 'o')) { - IRC_WriteStrClient(Origin, ERR_KICKDENY_MSG, + IRC_WriteErrClient(Origin, ERR_KICKDENY_MSG, Client_ID(Origin), Name, Client_ID(Target)); return; } /* Check if client has the rights to kick target */ - ptr = Channel_UserModes(chan, Peer); - target_modes = Channel_UserModes(chan, Target); - while(*ptr) { - /* Owner can kick everyone */ - if ( *ptr == 'q') { - can_kick = true; - break; - } - /* Admin can't kick owner */ - if ( *ptr == 'a' ) { - if (!strchr(target_modes, 'q')) { - can_kick = true; - break; - } - } - /* Op can't kick owner | admin */ - if ( *ptr == 'o' ) { - if (!strchr(target_modes, 'q') && - !strchr(target_modes, 'a')) { - can_kick = true; - break; - } - } - /* Half Op can't kick owner | admin | op */ - if ( *ptr == 'h' ) { - if (!strchr(target_modes, 'q') && - !strchr(target_modes, 'a') && - !strchr(target_modes, 'o')) { - can_kick = true; - break; - } - } - ptr++; - } + + /* Owner can kick everyone */ + if (Channel_UserHasMode(chan, Peer, 'q')) + can_kick = true; + + /* Admin can't kick owner */ + else if (Channel_UserHasMode(chan, Peer, 'a') && + !Channel_UserHasMode(chan, Target, 'q')) + can_kick = true; + + /* Op can't kick owner | admin */ + else if (Channel_UserHasMode(chan, Peer, 'o') && + !Channel_UserHasMode(chan, Target, 'q') && + !Channel_UserHasMode(chan, Target, 'a')) + can_kick = true; + + /* Half Op can't kick owner | admin | op */ + else if (Channel_UserHasMode(chan, Peer, 'h') && + !Channel_UserHasMode(chan, Target, 'q') && + !Channel_UserHasMode(chan, Target, 'a') && + !Channel_UserHasMode(chan, Target, 'o')) + can_kick = true; + + /* IRC operators & IRCd with OperCanMode enabled + * can kick anyways regardless of privilege */ + else if(Client_HasMode(Origin, 'o') && Conf_OperCanMode) + can_kick = true; if(!can_kick) { - IRC_WriteStrClient(Origin, ERR_CHANOPPRIVTOOLOW_MSG, - Client_ID(Origin), Name); + IRC_WriteErrClient(Origin, ERR_CHANOPPRIVTOOLOW_MSG, + Client_ID(Origin), Name); return; } } - /* Check that the client to be kicked is on the specified channel */ - if (!Channel_IsMemberOf(chan, Target)) { - IRC_WriteStrClient(Origin, ERR_USERNOTINCHANNEL_MSG, - Client_ID(Origin), Client_ID(Target), Name ); - return; - } - /* Kick Client from channel */ Remove_Client( REMOVE_KICK, chan, Target, Origin, Reason, true); } /* Channel_Kick */ @@ -433,7 +460,7 @@ Channel_CountVisible (CLIENT *Client) c = My_Channels; while(c) { if (Client) { - if (!strchr(Channel_Modes(c), 's') + if (!Channel_HasMode(c, 's') || Channel_IsMemberOf(c, Client)) count++; } else @@ -499,6 +526,14 @@ Channel_Modes( CHANNEL *Chan ) } /* Channel_Modes */ +GLOBAL bool +Channel_HasMode( CHANNEL *Chan, char Mode ) +{ + assert( Chan != NULL ); + return strchr( Chan->modes, Mode ) != NULL; +} /* Channel_HasMode */ + + GLOBAL char * Channel_Key( CHANNEL *Chan ) { @@ -636,7 +671,7 @@ Channel_ModeAdd( CHANNEL *Chan, char Mode ) assert( Chan != NULL ); x[0] = Mode; x[1] = '\0'; - if( ! strchr( Chan->modes, x[0] )) + if( ! Channel_HasMode( Chan, x[0] )) { /* Channel does not have this mode yet, set it */ strlcat( Chan->modes, x, sizeof( Chan->modes )); @@ -745,6 +780,13 @@ Channel_UserModes( CHANNEL *Chan, CLIENT *Client ) } /* Channel_UserModes */ +GLOBAL bool +Channel_UserHasMode( CHANNEL *Chan, CLIENT *Client, char Mode ) +{ + return strchr(Channel_UserModes(Chan, Client), Mode) != NULL; +} /* Channel_UserHasMode */ + + GLOBAL bool Channel_IsMemberOf( CHANNEL *Chan, CLIENT *Client ) { @@ -873,15 +915,15 @@ Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From) if (Channel_IsMemberOf(Chan, From)) { is_member = true; - if (strchr(Channel_UserModes(Chan, From), 'v')) + if (Channel_UserHasMode(Chan, From, 'v')) has_voice = true; - if (strchr(Channel_UserModes(Chan, From), 'h')) + if (Channel_UserHasMode(Chan, From, 'h')) is_halfop = true; - if (strchr(Channel_UserModes(Chan, From), 'o')) + if (Channel_UserHasMode(Chan, From, 'o')) is_op = true; - if (strchr(Channel_UserModes(Chan, From), 'a')) + if (Channel_UserHasMode(Chan, From, 'a')) is_chanadmin = true; - if (strchr(Channel_UserModes(Chan, From), 'q')) + if (Channel_UserHasMode(Chan, From, 'q')) is_owner = true; } @@ -891,17 +933,17 @@ Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From) * If channel mode n set: non-members cannot send to channel. * If channel mode m set: need voice. */ - if (strchr(Channel_Modes(Chan), 'n') && !is_member) + if (Channel_HasMode(Chan, 'n') && !is_member) return false; - if (strchr(Channel_Modes(Chan), 'M') && !Client_HasMode(From, 'R') + if (Channel_HasMode(Chan, 'M') && !Client_HasMode(From, 'R') && !Client_HasMode(From, 'o')) return false; if (has_voice || is_halfop || is_op || is_chanadmin || is_owner) return true; - if (strchr(Channel_Modes(Chan), 'm')) + if (Channel_HasMode(Chan, 'm')) return false; if (Lists_Check(&Chan->list_excepts, From)) @@ -918,19 +960,20 @@ Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command, if (!Can_Send_To_Channel(Chan, From)) { if (! SendErrors) return CONNECTED; /* no error, see RFC 2812 */ - if (strchr(Channel_Modes(Chan), 'M')) - return IRC_WriteStrClient(From, ERR_NEEDREGGEDNICK_MSG, + if (Channel_HasMode(Chan, 'M')) + return IRC_WriteErrClient(From, ERR_NEEDREGGEDNICK_MSG, Client_ID(From), Channel_Name(Chan)); else - return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG, + return IRC_WriteErrClient(From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID(From), Channel_Name(Chan)); } if (Client_Conn(From) > NONE) Conn_UpdateIdle(Client_Conn(From)); - return IRC_WriteStrChannelPrefix(Client, Chan, From, true, - "%s %s :%s", Command, Channel_Name(Chan), Text); + IRC_WriteStrChannelPrefix(Client, Chan, From, true, "%s %s :%s", + Command, Channel_Name(Chan), Text); + return CONNECTED; } @@ -1045,7 +1088,7 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch switch( Type ) { case REMOVE_QUIT: - /* QUIT: other servers have already been notified, + /* QUIT: other servers have already been notified, * see Client_Destroy(); so only inform other clients * in same channel. */ assert( InformServer == false ); @@ -1089,7 +1132,7 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch } /* When channel is empty and is not pre-defined, delete */ - if( ! strchr( Channel_Modes( Chan ), 'P' )) + if( ! Channel_HasMode( Chan, 'P' )) { if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan ); } @@ -1099,29 +1142,29 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch GLOBAL bool -Channel_AddBan(CHANNEL *c, const char *mask ) +Channel_AddBan(CHANNEL *c, const char *mask, const char *who ) { struct list_head *h = Channel_GetListBans(c); LogDebug("Adding \"%s\" to \"%s\" ban list", mask, Channel_Name(c)); - return Lists_Add(h, mask, false, NULL); + return Lists_Add(h, mask, time(NULL), who, false); } GLOBAL bool -Channel_AddExcept(CHANNEL *c, const char *mask ) +Channel_AddExcept(CHANNEL *c, const char *mask, const char *who ) { struct list_head *h = Channel_GetListExcepts(c); LogDebug("Adding \"%s\" to \"%s\" exception list", mask, Channel_Name(c)); - return Lists_Add(h, mask, false, NULL); + return Lists_Add(h, mask, time(NULL), who, false); } GLOBAL bool -Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce) +Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce, const char *who ) { struct list_head *h = Channel_GetListInvites(c); LogDebug("Adding \"%s\" to \"%s\" invite list", mask, Channel_Name(c)); - return Lists_Add(h, mask, onlyonce, NULL); + return Lists_Add(h, mask, time(NULL), who, onlyonce); } @@ -1138,7 +1181,9 @@ ShowChannelList(struct list_head *head, CLIENT *Client, CHANNEL *Channel, while (e) { if (!IRC_WriteStrClient(Client, msg, Client_ID(Client), Channel_Name(Channel), - Lists_GetMask(e))) + Lists_GetMask(e), + Lists_GetReason(e), + Lists_GetValidity(e))) return DISCONNECTED; e = Lists_GetNext(e); } @@ -1217,7 +1262,7 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key) assert(Client != NULL); assert(Key != NULL); - if (!strchr(Chan->modes, 'k')) + if (!Channel_HasMode(Chan, 'k')) return true; if (*Key == '\0') return false;