]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/channel.c
Remove Can_Send_To_Channel_Identified()
[ngircd-alex.git] / src / ngircd / channel.c
index 6d23b249e1773fc51924f5e1672567fb38f4c5c7..0f21a459c3a6644c0f14b2c581f8a45aca154bdc 100644 (file)
@@ -1,22 +1,23 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2009 Alexander Barton (alex@barton.de)
+ * 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
  * 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 "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"
@@ -61,9 +60,7 @@ 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 Free_Channel PARAMS(( CHANNEL *Chan ));
-static void Update_Predefined PARAMS((CHANNEL *Chan,
-                                     const struct Conf_Channel *Conf_Chan));
-static void Set_Key_File PARAMS((CHANNEL *Chan, FILE *KeyFile));
+static void Set_KeyFile PARAMS((CHANNEL *Chan, const char *KeyFile));
 
 
 GLOBAL void
@@ -90,6 +87,14 @@ Channel_GetListBans(CHANNEL *c)
 }
 
 
+GLOBAL struct list_head *
+Channel_GetListExcepts(CHANNEL *c)
+{
+       assert(c != NULL);
+       return &c->list_excepts;
+}
+
+
 GLOBAL struct list_head *
 Channel_GetListInvites(CHANNEL *c)
 {
@@ -113,9 +118,12 @@ Channel_InitPredefined( void )
        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;
                }
 
@@ -124,7 +132,7 @@ Channel_InitPredefined( void )
                        Log(LOG_INFO,
                            "Can't create pre-defined channel \"%s\": name already in use.",
                            conf_chan->name);
-                       Update_Predefined(new_chan, conf_chan);
+                       Set_KeyFile(new_chan, conf_chan->keyfile);
                        continue;
                }
 
@@ -148,7 +156,7 @@ Channel_InitPredefined( void )
 
                Channel_SetKey(new_chan, conf_chan->key);
                Channel_SetMaxUsers(new_chan, conf_chan->maxusers);
-               Update_Predefined(new_chan, conf_chan);
+               Set_KeyFile(new_chan, conf_chan->keyfile);
        }
        if (channel_count)
                array_free(&Conf_Channels);
@@ -159,10 +167,10 @@ static void
 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);
-       if (Chan->keyfile)
-               fclose(Chan->keyfile);
 
        free(chan);
 }
@@ -201,7 +209,7 @@ Channel_Exit( void )
  * Add_Client().
  */
 GLOBAL bool
-Channel_Join( CLIENT *Client, char *Name )
+Channel_Join( CLIENT *Client, const char *Name )
 {
        CHANNEL *chan;
 
@@ -267,6 +275,9 @@ Channel_Part(CLIENT * Client, CLIENT * Origin, const char *Name, const char *Rea
                return false;
        }
 
+       if (Conf_MorePrivacy)
+               Reason = "";
+
        /* Part client from channel */
        if (!Remove_Client(REMOVE_PART, chan, Client, Origin, Reason, true))
                return false;
@@ -328,13 +339,16 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name,
 
 
 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;
@@ -347,20 +361,31 @@ Channel_Quit( CLIENT *Client, char *Reason )
 } /* 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 (!strchr(Channel_Modes(c), 's')
+                           || Channel_IsMemberOf(c, Client))
+                               count++;
+               } else
+                       count++;
                c = c->next;
        }
        return count;
-} /* Channel_Count */
+}
 
 
 GLOBAL unsigned long
@@ -702,6 +727,14 @@ Channel_TopicWho(CHANNEL *Chan)
        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
 
 
@@ -734,7 +767,7 @@ Channel_SetTopic(CHANNEL *Chan, CLIENT *Client, const char *Topic)
 
 
 GLOBAL void
-Channel_SetModes( CHANNEL *Chan, char *Modes )
+Channel_SetModes( CHANNEL *Chan, const char *Modes )
 {
        assert( Chan != NULL );
        assert( Modes != NULL );
@@ -764,6 +797,13 @@ Channel_SetMaxUsers(CHANNEL *Chan, unsigned long Count)
 } /* 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)
 {
@@ -792,12 +832,19 @@ Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From)
        if (strchr(Channel_Modes(Chan), 'n') && !is_member)
                return false;
 
+       if (strchr(Channel_Modes(Chan), 'M') && !Client_HasMode(From, 'R')
+           && !Client_HasMode(From, 'o'))
+               return false;
+
        if (is_op || has_voice)
                return true;
 
        if (strchr(Channel_Modes(Chan), 'm'))
                return false;
 
+       if (Lists_Check(&Chan->list_excepts, From))
+               return true;
+
        return !Lists_Check(&Chan->list_bans, From);
 }
 
@@ -839,6 +886,9 @@ Channel_Create( const char *Name )
        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;
@@ -954,6 +1004,9 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
                                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);
 
@@ -983,7 +1036,17 @@ GLOBAL bool
 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);
 }
 
 
@@ -991,29 +1054,31 @@ GLOBAL bool
 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));
 }
 
 
@@ -1025,7 +1090,21 @@ Channel_ShowBans( CLIENT *Client, CHANNEL *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);
 }
 
 
@@ -1037,7 +1116,8 @@ Channel_ShowInvites( CLIENT *Client, CHANNEL *Channel )
        assert( Channel != NULL );
 
        h = Channel_GetListInvites(Channel);
-       return ShowInvitesBans(h, Client, Channel, true);
+       return ShowChannelList(h, Client, Channel, RPL_INVITELIST_MSG,
+                              RPL_ENDOFINVITELIST_MSG);
 }
 
 
@@ -1045,7 +1125,7 @@ Channel_ShowInvites( CLIENT *Client, CHANNEL *Channel )
  * 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;
@@ -1064,7 +1144,8 @@ Channel_LogServer(char *msg)
 GLOBAL bool
 Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key)
 {
-       char line[COMMAND_LEN], *nick, *pass;
+       char *file_name, line[COMMAND_LEN], *nick, *pass;
+       FILE *fd;
 
        assert(Chan != NULL);
        assert(Client != NULL);
@@ -1072,13 +1153,22 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key)
 
        if (!strchr(Chan->modes, 'k'))
                return true;
+       if (*Key == '\0')
+               return false;
        if (strcmp(Chan->key, Key) == 0)
                return true;
-       if (!Chan->keyfile)
+
+       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;
+       }
 
-       Chan->keyfile = freopen(NULL, "r", Chan->keyfile);
-       while (fgets(line, sizeof(line), Chan->keyfile) != NULL) {
+       while (fgets(line, (int)sizeof(line), fd) != NULL) {
                ngt_TrimStr(line);
                if (! (nick = strchr(line, ':')))
                        continue;
@@ -1093,12 +1183,72 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key)
                if (strcmp(Key, pass) != 0)
                        continue;
 
+               fclose(fd);
                return true;
        }
+       fclose(fd);
        return false;
 } /* Channel_CheckKey */
 
 
+/**
+ * Check wether a client is allowed to administer a channel or not.
+ *
+ * @param Chan         The channel to test.
+ * @param Client       The client from which the command has been received.
+ * @param Origin       The originator of the command (or NULL).
+ * @param OnChannel    Set to true if the originator is member of the channel.
+ * @param AdminOk      Set to true if the client is allowed to do
+ *                     administrative tasks on this channel.
+ * @param UseServerMode        Set to true if ngIRCd should emulate "server mode",
+ *                     that is send commands as if originating from a server
+ *                     and not the originator of the command.
+ */
+GLOBAL void
+Channel_CheckAdminRights(CHANNEL *Chan, CLIENT *Client, CLIENT *Origin,
+                        bool *OnChannel, bool *AdminOk, bool *UseServerMode)
+{
+       assert (Chan != NULL);
+       assert (Client != NULL);
+       assert (OnChannel != NULL);
+       assert (AdminOk != NULL);
+       assert (UseServerMode != NULL);
+
+       /* Use the client as origin, if no origin has been given (no prefix?) */
+       if (!Origin)
+               Origin = Client;
+
+       *OnChannel = false;
+       *AdminOk = false;
+       *UseServerMode = false;
+
+       if (Client_Type(Client) != CLIENT_USER
+           && Client_Type(Client) != CLIENT_SERVER
+           && Client_Type(Client) != CLIENT_SERVICE)
+               return;
+
+       /* Allow channel administration if the client is a server or service */
+       if (Client_Type(Client) != CLIENT_USER) {
+               *AdminOk = true;
+               return;
+       }
+
+       *OnChannel = Channel_IsMemberOf(Chan, Origin);
+
+       if (*OnChannel && strchr(Channel_UserModes(Chan, Origin), 'o')) {
+               /* User is a channel operator */
+               *AdminOk = true;
+       } else if (Conf_OperCanMode) {
+               /* IRC operators are allowed to administer channels as well */
+               if (Client_OperByMe(Origin)) {
+                       *AdminOk = true;
+                       if (Conf_OperServerMode)
+                               *UseServerMode = true;
+               }
+       }
+} /* Channel_CheckAdminRights */
+
+
 static CL2CHAN *
 Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
 {
@@ -1157,35 +1307,31 @@ Delete_Channel(CHANNEL *Chan)
 
 
 static void
-Update_Predefined(CHANNEL *Chan, const struct Conf_Channel *Conf_Chan)
+Set_KeyFile(CHANNEL *Chan, const char *KeyFile)
 {
-       FILE *fd;
-
-       if (! Conf_Chan->keyfile || ! *Conf_Chan->keyfile)
-               return;
+       size_t len;
 
-       fd = fopen(Conf_Chan->keyfile, "r");
-       if (! fd)
-               Log(LOG_ERR,
-                   "Can't open channel key file for \"%s\", \"%s\": %s",
-                   Conf_Chan->name, Conf_Chan->keyfile,
-                   strerror(errno));
-       else
-               Set_Key_File(Chan, fd);
-} /* Update_Predefined */
+       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);
+       }
 
-static void
-Set_Key_File(CHANNEL *Chan, FILE *KeyFile)
-{
-       assert(Chan != NULL);
+       if (len < 1)
+               return;
 
-       if (Chan->keyfile)
-               fclose(Chan->keyfile);
-       Chan->keyfile = KeyFile;
-       Log(LOG_INFO|LOG_snotice,
-           "New local channel key file for \"%s\" activated.", Chan->name);
-} /* Set_Key_File */
+       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- */