/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 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 management
*/
-
#define __channel_c__
-
#include "portab.h"
+/**
+ * @file
+ * Channel management
+ */
+
#include "imp.h"
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <stdio.h>
#include <strings.h>
#include "defines.h"
#include "conn-func.h"
-#include "client.h"
#include "exp.h"
#include "channel.h"
#include "imp.h"
#include "irc-write.h"
-#include "resolve.h"
#include "conf.h"
#include "hash.h"
#include "lists.h"
#include "log.h"
#include "messages.h"
+#include "match.h"
#include "exp.h"
static CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
static CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
static void Delete_Channel PARAMS(( CHANNEL *Chan ));
-static void Channel_Free PARAMS(( CHANNEL *Chan ));
+static void Free_Channel PARAMS(( CHANNEL *Chan ));
+static void Set_KeyFile PARAMS((CHANNEL *Chan, const char *KeyFile));
GLOBAL void
Channel_Init( void )
{
- CHANNEL *sc;
-
My_Channels = NULL;
My_Cl2Chan = NULL;
-
- sc = Channel_Create("&SERVER");
- if (sc) {
- Channel_SetModes(sc, "mnPt");
- Channel_SetTopic(sc, Client_ThisServer(), "Server Messages");
- }
} /* Channel_Init */
}
+GLOBAL struct list_head *
+Channel_GetListExcepts(CHANNEL *c)
+{
+ assert(c != NULL);
+ return &c->list_excepts;
+}
+
+
GLOBAL struct list_head *
Channel_GetListInvites(CHANNEL *c)
{
}
+/**
+ * Generate predefined persistent channels and &SERVER
+ */
GLOBAL void
Channel_InitPredefined( void )
{
- /* Generate predefined persistent channels */
-
CHANNEL *new_chan;
const struct Conf_Channel *conf_chan;
const char *c;
assert(channel_count == 0 || conf_chan != NULL);
for (i = 0; i < channel_count; i++, conf_chan++) {
- if (!conf_chan->name[0] || !Channel_IsValidName(conf_chan->name)) {
- Log(LOG_ERR, "Can't create pre-defined channel: invalid name: \"%s\"",
- conf_chan->name);
+ if (!conf_chan->name[0])
+ continue;
+ if (!Channel_IsValidName(conf_chan->name)) {
+ Log(LOG_ERR,
+ "Can't create pre-defined channel: invalid name: \"%s\"",
+ conf_chan->name);
continue;
}
new_chan = Channel_Search(conf_chan->name);
if (new_chan) {
- Log(LOG_INFO, "Can't create pre-defined channel \"%s\": name already in use.",
- conf_chan->name);
+ Log(LOG_INFO,
+ "Can't create pre-defined channel \"%s\": name already in use.",
+ conf_chan->name);
+ Set_KeyFile(new_chan, conf_chan->keyfile);
continue;
}
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');
Channel_SetKey(new_chan, conf_chan->key);
Channel_SetMaxUsers(new_chan, conf_chan->maxusers);
- Log(LOG_INFO, "Created pre-defined channel \"%s\"",
- conf_chan->name);
+ Set_KeyFile(new_chan, conf_chan->keyfile);
}
if (channel_count)
array_free(&Conf_Channels);
+
+ /* Make sure the local &SERVER channel exists */
+ if (!Channel_Search("&SERVER")) {
+ new_chan = Channel_Create("&SERVER");
+ if (new_chan) {
+ Channel_SetModes(new_chan, "mnPt");
+ Channel_SetTopic(new_chan, Client_ThisServer(),
+ "Server Messages");
+ } else
+ Log(LOG_ERR, "Failed to create \"&SERVER\" channel!");
+ } else
+ LogDebug("Required channel \"&SERVER\" already exists, ok.");
} /* Channel_InitPredefined */
static void
-Channel_Free(CHANNEL *chan)
+Free_Channel(CHANNEL *chan)
{
array_free(&chan->topic);
+ array_free(&chan->keyfile);
Lists_Free(&chan->list_bans);
+ Lists_Free(&chan->list_excepts);
Lists_Free(&chan->list_invites);
free(chan);
c = My_Channels;
while (c) {
c_next = c->next;
- Channel_Free(c);
+ Free_Channel(c);
c = c_next;
}
/* Free Channel allocation table */
cl2chan = My_Cl2Chan;
- while( c )
- {
+ while (cl2chan) {
cl2chan_next = cl2chan->next;
- free( cl2chan );
+ free(cl2chan);
cl2chan = cl2chan_next;
}
} /* Channel_Exit */
* Add_Client().
*/
GLOBAL bool
-Channel_Join( CLIENT *Client, char *Name )
+Channel_Join( CLIENT *Client, const char *Name )
{
CHANNEL *chan;
/* 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;
}
/* 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;
}
+ if (Conf_MorePrivacy)
+ Reason = "";
+
/* Part client from channel */
if (!Remove_Client(REMOVE_PART, chan, Client, Origin, Reason, true))
return false;
const char *Reason )
{
CHANNEL *chan;
+ bool can_kick = false;
assert(Peer != NULL);
assert(Target != NULL);
/* 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;
}
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);
- return;
- }
-
- /* Check if user has operator status */
- if (!strchr(Channel_UserModes(chan, Origin), 'o')) {
- IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG,
+ 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_WriteStrClient(Origin, ERR_USERNOTINCHANNEL_MSG,
+ 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 ((Channel_HasMode(chan, 'Q')
+ || Client_HasMode(Target, 'q')
+ || Client_Type(Target) == CLIENT_SERVICE)
+ && !Client_HasMode(Origin, 'o')) {
+ IRC_WriteErrClient(Origin, ERR_KICKDENY_MSG,
+ Client_ID(Origin), Name,
+ Client_ID(Target));
+ return;
+ }
+
+ /* Check if client has the rights to kick target */
+
+ /* 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;
+
+ if(!can_kick) {
+ IRC_WriteErrClient(Origin, ERR_CHANOPPRIVTOOLOW_MSG,
+ Client_ID(Origin), Name);
+ return;
+ }
+ }
+
/* Kick Client from channel */
Remove_Client( REMOVE_KICK, chan, Target, Origin, Reason, true);
} /* Channel_Kick */
GLOBAL void
-Channel_Quit( CLIENT *Client, char *Reason )
+Channel_Quit( CLIENT *Client, const char *Reason )
{
CHANNEL *c, *next_c;
assert( Client != NULL );
assert( Reason != NULL );
+ if (Conf_MorePrivacy)
+ Reason = "";
+
IRC_WriteStrRelatedPrefix( Client, Client, false, "QUIT :%s", Reason );
c = My_Channels;
} /* Channel_Quit */
+/**
+ * Get number of channels this server knows and that are "visible" to
+ * the given client. If no client is given, all channels will be counted.
+ *
+ * @param Client The client to check or NULL.
+ * @return Number of channels visible to the client.
+ */
GLOBAL unsigned long
-Channel_Count( void )
+Channel_CountVisible (CLIENT *Client)
{
CHANNEL *c;
unsigned long count = 0;
c = My_Channels;
- while( c )
- {
- count++;
+ while(c) {
+ if (Client) {
+ if (!Channel_HasMode(c, 's')
+ || Channel_IsMemberOf(c, Client))
+ count++;
+ } else
+ count++;
c = c->next;
}
return count;
-} /* Channel_Count */
+}
GLOBAL unsigned long
} /* 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 )
{
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 ));
} /* 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 )
{
return Chan->topic_who;
} /* Channel_TopicWho */
+
+GLOBAL unsigned int
+Channel_CreationTime(CHANNEL *Chan)
+{
+ assert(Chan != NULL);
+ return (unsigned int) Chan->creation_time;
+} /* Channel_CreationTime */
+
#endif
GLOBAL void
-Channel_SetModes( CHANNEL *Chan, char *Modes )
+Channel_SetModes( CHANNEL *Chan, const char *Modes )
{
assert( Chan != NULL );
assert( Modes != NULL );
} /* Channel_SetMaxUsers */
+/**
+ * Check if a client is allowed to send to a specific channel.
+ *
+ * @param Chan The channel to check.
+ * @param From The client that wants to send.
+ * @return true if the client is allowed to send, false otherwise.
+ */
static bool
Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From)
{
- bool is_member, has_voice, is_op;
+ bool is_member, has_voice, is_halfop, is_op, is_chanadmin, is_owner;
- is_member = has_voice = is_op = false;
+ is_member = has_voice = is_halfop = is_op = is_chanadmin = is_owner = false;
/* The server itself always can send messages :-) */
if (Client_ThisServer() == 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), 'o'))
+ if (Channel_UserHasMode(Chan, From, 'h'))
+ is_halfop = true;
+ if (Channel_UserHasMode(Chan, From, 'o'))
is_op = true;
+ if (Channel_UserHasMode(Chan, From, 'a'))
+ is_chanadmin = true;
+ if (Channel_UserHasMode(Chan, From, 'q'))
+ is_owner = true;
}
/*
* 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 (Channel_HasMode(Chan, 'M') && !Client_HasMode(From, 'R')
+ && !Client_HasMode(From, 'o'))
return false;
- if (is_op || has_voice)
+ 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))
+ return true;
+
return !Lists_Check(&Chan->list_bans, From);
}
if (!Can_Send_To_Channel(Chan, From)) {
if (! SendErrors)
return CONNECTED; /* no error, see RFC 2812 */
- return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG,
+ if (Channel_HasMode(Chan, 'M'))
+ return IRC_WriteErrClient(From, ERR_NEEDREGGEDNICK_MSG,
+ Client_ID(From), Channel_Name(Chan));
+ else
+ 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;
}
strlcpy( c->name, Name, sizeof( c->name ));
c->hash = Hash( c->name );
c->next = My_Channels;
+#ifndef STRICT_RFC
+ c->creation_time = time(NULL);
+#endif
My_Channels = c;
LogDebug("Created new channel structure for \"%s\".", Name);
return c;
cl2chan->next = My_Cl2Chan;
My_Cl2Chan = cl2chan;
- Log( LOG_DEBUG, "User \"%s\" joined channel \"%s\".", Client_Mask( Client ), Chan->name );
+ LogDebug("User \"%s\" joined channel \"%s\".", Client_Mask(Client), Chan->name);
return cl2chan;
} /* Add_Client */
Client_Mask( Client ), c->name, Client_ID(Origin), Reason);
break;
default: /* PART */
+ if (Conf_MorePrivacy)
+ Reason = "";
+
if (InformServer)
IRC_WriteStrServersPrefix(Origin, Client, "PART %s :%s", c->name, Reason);
}
/* 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 );
}
Channel_AddBan(CHANNEL *c, const char *mask )
{
struct list_head *h = Channel_GetListBans(c);
- return Lists_Add(h, mask, false);
+ LogDebug("Adding \"%s\" to \"%s\" ban list", mask, Channel_Name(c));
+ return Lists_Add(h, mask, false, NULL);
+}
+
+
+GLOBAL bool
+Channel_AddExcept(CHANNEL *c, const char *mask )
+{
+ 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);
}
Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce)
{
struct list_head *h = Channel_GetListInvites(c);
- return Lists_Add(h, mask, onlyonce);
+ LogDebug("Adding \"%s\" to \"%s\" invite list", mask, Channel_Name(c));
+ return Lists_Add(h, mask, onlyonce, NULL);
}
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));
}
assert( Channel != NULL );
h = Channel_GetListBans(Channel);
- return ShowInvitesBans(h, Client, Channel, false);
+ return ShowChannelList(h, Client, Channel, RPL_BANLIST_MSG,
+ RPL_ENDOFBANLIST_MSG);
+}
+
+
+GLOBAL bool
+Channel_ShowExcepts( CLIENT *Client, CHANNEL *Channel )
+{
+ struct list_head *h;
+
+ assert( Channel != NULL );
+
+ h = Channel_GetListExcepts(Channel);
+ return ShowChannelList(h, Client, Channel, RPL_EXCEPTLIST_MSG,
+ RPL_ENDOFEXCEPTLIST_MSG);
}
assert( Channel != NULL );
h = Channel_GetListInvites(Channel);
- return ShowInvitesBans(h, Client, Channel, true);
+ return ShowChannelList(h, Client, Channel, RPL_INVITELIST_MSG,
+ RPL_ENDOFINVITELIST_MSG);
}
* Log a message to the local &SERVER channel, if it exists.
*/
GLOBAL void
-Channel_LogServer(char *msg)
+Channel_LogServer(const char *msg)
{
CHANNEL *sc;
CLIENT *c;
} /* Channel_LogServer */
+GLOBAL bool
+Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key)
+{
+ char *file_name, line[COMMAND_LEN], *nick, *pass;
+ FILE *fd;
+
+ assert(Chan != NULL);
+ assert(Client != NULL);
+ assert(Key != NULL);
+
+ if (!Channel_HasMode(Chan, 'k'))
+ return true;
+ if (*Key == '\0')
+ return false;
+ if (strcmp(Chan->key, Key) == 0)
+ return true;
+
+ file_name = array_start(&Chan->keyfile);
+ if (!file_name)
+ return false;
+ fd = fopen(file_name, "r");
+ if (!fd) {
+ Log(LOG_ERR, "Can't open channel key file \"%s\" for %s: %s",
+ file_name, Chan->name, strerror(errno));
+ return false;
+ }
+
+ while (fgets(line, (int)sizeof(line), fd) != NULL) {
+ ngt_TrimStr(line);
+ if (! (nick = strchr(line, ':')))
+ continue;
+ *nick++ = '\0';
+ if (!Match(line, Client_User(Client)))
+ continue;
+ if (! (pass = strchr(nick, ':')))
+ continue;
+ *pass++ = '\0';
+ if (!Match(nick, Client_ID(Client)))
+ continue;
+ if (strcmp(Key, pass) != 0)
+ continue;
+
+ fclose(fd);
+ return true;
+ }
+ fclose(fd);
+ return false;
+} /* Channel_CheckKey */
+
+
static CL2CHAN *
Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
{
My_Channels = chan->next;
LogDebug("Freed channel structure for \"%s\".", Chan->name);
- Channel_Free(Chan);
+ Free_Channel(Chan);
} /* Delete_Channel */
+static void
+Set_KeyFile(CHANNEL *Chan, const char *KeyFile)
+{
+ size_t len;
+
+ assert(Chan != NULL);
+ assert(KeyFile != NULL);
+
+ len = strlen(KeyFile);
+ if (len < array_bytes(&Chan->keyfile)) {
+ Log(LOG_INFO, "Channel key file of %s removed.", Chan->name);
+ array_free(&Chan->keyfile);
+ }
+
+ if (len < 1)
+ return;
+
+ if (!array_copyb(&Chan->keyfile, KeyFile, len+1))
+ Log(LOG_WARNING,
+ "Could not set new channel key file \"%s\" for %s: %s",
+ KeyFile, Chan->name, strerror(errno));
+ else
+ Log(LOG_INFO|LOG_snotice,
+ "New local channel key file \"%s\" for %s activated.",
+ KeyFile, Chan->name);
+} /* Set_KeyFile */
+
+
/* -eof- */
projects / ngircd-alex.git / blobdiff