The server didn't validate wheather the "target" client of a channel

[ngircd-alex.git] / src / ngircd / irc-mode.c

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 148698ac48096ab562fb28f393e9eaea968e53d6..cf6354171df7a454dbd704163b0a146e90673729 100644 (file)
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-mode.c,v 1.23 2002/12/16 23:06:46 alex Exp $";
+static char UNUSED id[] = "$Id: irc-mode.c,v 1.31 2003/01/21 21:04:16 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -142,7 +142,8 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
                                        else
                                        {
                                                /* Append modifier character to result string */
-                                               x[0] = *mode_ptr; strcat( the_modes, x );
+                                               x[0] = *mode_ptr;
+                                               strlcat( the_modes, x, sizeof( the_modes ));
                                        }
                                        if( *mode_ptr == '+' ) set = TRUE;
                                        else set = FALSE;
@@ -154,13 +155,22 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
                x[0] = '\0';
                switch( *mode_ptr )
                {
+                       case 'a':
+                               /* Away */
+                               if( Client_Type( Client ) == CLIENT_SERVER )
+                               {
+                                       x[0] = 'a';
+                                       Client_SetAway( Client, DEFAULT_AWAY_MSG );
+                               }
+                               else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
+                               break;
                        case 'i':
                                /* Invisible */
                                x[0] = 'i';
                                break;
                        case 'o':
                                /* IRC operator (only unsetable!) */
-                               if( ! set )
+                               if(( ! set ) || ( Client_Type( Client ) == CLIENT_SERVER ))
                                {
                                        Client_SetOperByMe( Target, FALSE );
                                        x[0] = 'o';
@@ -169,7 +179,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
                                break;
                        case 'r':
                                /* Restricted (only setable) */
-                               if( set ) x[0] = 'r';
+                               if(( set ) || ( Client_Type( Client ) == CLIENT_SERVER )) x[0] = 'r';
                                else ok = IRC_WriteStrClient( Origin, ERR_RESTRICTED_MSG, Client_ID( Origin ));
                                break;
                        case 's':
@@ -190,13 +200,13 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
                if( set )
                {
                        /* Set mode */
-                       if( Client_ModeAdd( Target, x[0] )) strcat( the_modes, x );
+                       if( Client_ModeAdd( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes ));
 
                }
                else
                {
                        /* Unset mode */
-                       if( Client_ModeDel( Target, x[0] )) strcat( the_modes, x );
+                       if( Client_ModeDel( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes ));
                }               
        }
 client_exit:
@@ -237,11 +247,42 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
        LONG l;
 
        /* Mode request: let's answer it :-) */
-       if( Req->argc == 1 ) return IRC_WriteStrClient( Origin, RPL_CHANNELMODEIS_MSG, Client_ID( Origin ), Channel_Name( Channel ), Channel_Modes( Channel ));
+       if( Req->argc == 1 )
+       {
+               /* Member or not? -- That's the question! */
+               if( ! Channel_IsMemberOf( Channel, Origin )) return IRC_WriteStrClient( Origin, RPL_CHANNELMODEIS_MSG, Client_ID( Origin ), Channel_Name( Channel ), Channel_Modes( Channel ));
+
+               /* The sender is a member: generate extended reply */
+               strlcpy( the_modes, Channel_Modes( Channel ), sizeof( the_modes ));
+               mode_ptr = the_modes;
+               strcpy( the_args, "" );
+               while( *mode_ptr )
+               {
+                       switch( *mode_ptr )
+                       {
+                               case 'l':
+                                       snprintf( argadd, sizeof( argadd ), " %ld", Channel_MaxUsers( Channel ));
+                                       strlcat( the_args, argadd, sizeof( the_args ));
+                                       break;
+                               case 'k':
+                                       strlcat( the_args, " ", sizeof( the_args ));
+                                       strlcat( the_args, Channel_Key( Channel ), sizeof( the_args ));
+                                       break;
+                       }
+                       mode_ptr++;
+               }
+               if( the_args[0] ) strlcat( the_modes, the_args, sizeof( the_modes ));
+
+               return IRC_WriteStrClient( Origin, RPL_CHANNELMODEIS_MSG, Client_ID( Origin ), Channel_Name( Channel ), the_modes );
+       }
 
        /* Is the user allowed to change modes? */
        if( Client_Type( Client ) == CLIENT_USER )
        {
+               /* Is the originating user on that channel? */
+               if( ! Channel_IsMemberOf( Channel, Origin )) return IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+
+               /* Is he channel operator? */
                if( strchr( Channel_UserModes( Channel, Origin ), 'o' )) modeok = TRUE;
                else modeok = FALSE;
                if( Conf_OperCanMode )
@@ -300,7 +341,8 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
                                        else
                                        {
                                                /* Append modifier character to result string */
-                                               x[0] = *mode_ptr; strcat( the_modes, x );
+                                               x[0] = *mode_ptr;
+                                               strlcat( the_modes, x, sizeof( the_modes ));
                                        }
                                        if( *mode_ptr == '+' ) set = TRUE;
                                        else set = FALSE;
@@ -385,7 +427,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
                                        {
                                                Channel_ModeDel( Channel, 'k' );
                                                Channel_SetKey( Channel, Req->argv[arg_arg] );
-                                               strcpy( argadd, Channel_Key( Channel ));
+                                               strlcpy( argadd, Channel_Key( Channel ), sizeof( argadd ));
                                                x[0] = *mode_ptr;
                                        }
                                        else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
@@ -411,7 +453,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
                                                {
                                                        Channel_ModeDel( Channel, 'l' );
                                                        Channel_SetMaxUsers( Channel, l );
-                                                       sprintf( argadd, "%ld", l );
+                                                       snprintf( argadd, sizeof( argadd ), "%ld", l );
                                                        x[0] = *mode_ptr;
                                                }
                                        }
@@ -467,6 +509,13 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
                /* Is there a valid mode change? */
                if( ! x[0] ) continue;
 
+               /* Validate target client */
+               if( client && ( ! Channel_IsMemberOf( Channel, client )))
+               {
+                       if( ! IRC_WriteStrClient( Origin, ERR_USERNOTINCHANNEL_MSG, Client_ID( Origin ), Client_ID( client ), Channel_Name( Channel ))) break;
+                       continue;
+               }
+
                if( set )
                {
                        /* Set mode */
@@ -475,8 +524,9 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
                                /* Channel-User-Mode */
                                if( Channel_UserModeAdd( Channel, client, x[0] ))
                                {
-                                       strcat( the_args, Client_ID( client ));
-                                       strcat( the_args, " " ); strcat( the_modes, x );
+                                       strlcat( the_args, Client_ID( client ), sizeof( the_args ));
+                                       strlcat( the_args, " ", sizeof( the_args ));
+                                       strlcat( the_modes, x, sizeof( the_modes ));
                                        Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client ));
                                }
                        }
@@ -485,7 +535,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
                                /* Channel-Mode */
                                if( Channel_ModeAdd( Channel, x[0] ))
                                {
-                                       strcat( the_modes, x );
+                                       strlcat( the_modes, x, sizeof( the_modes ));
                                        Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel ));
                                }
                        }
@@ -498,8 +548,9 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
                                /* Channel-User-Mode */
                                if( Channel_UserModeDel( Channel, client, x[0] ))
                                {
-                                       strcat( the_args, Client_ID( client ));
-                                       strcat( the_args, " " ); strcat( the_modes, x );
+                                       strlcat( the_args, Client_ID( client ), sizeof( the_args ));
+                                       strlcat( the_args, " ", sizeof( the_args ));
+                                       strlcat( the_modes, x, sizeof( the_modes ));
                                        Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client ));
                                }
                        }
@@ -508,7 +559,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
                                /* Channel-Mode */
                                if( Channel_ModeDel( Channel, x[0] ))
                                {
-                                       strcat( the_modes, x );
+                                       strlcat( the_modes, x, sizeof( the_modes ));
                                        Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel ));
                                }
                        }
@@ -517,8 +568,8 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
                /* Are there additional arguments to add? */
                if( argadd[0] )
                {
-                       if( the_args[strlen( the_args ) - 1] != ' ' ) strcat( the_args, " " );
-                       strcat( the_args, argadd );
+                       if( the_args[strlen( the_args ) - 1] != ' ' ) strlcat( the_args, " ", sizeof( the_args ));
+                       strlcat( the_args, argadd, sizeof( the_args ));
                }
        }
 chan_exit:
@@ -564,13 +615,14 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req )
        {
                /* AWAY setzen */
                Client_SetAway( Client, Req->argv[0] );
+               Client_ModeAdd( Client, 'a' );
                IRC_WriteStrServersPrefix( Client, Client, "MODE %s :+a", Client_ID( Client ));
                return IRC_WriteStrClient( Client, RPL_NOWAWAY_MSG, Client_ID( Client ));
        }
        else
        {
                /* AWAY loeschen */
-               Client_SetAway( Client, NULL );
+               Client_ModeDel( Client, 'a' );
                IRC_WriteStrServersPrefix( Client, Client, "MODE %s :-a", Client_ID( Client ));
                return IRC_WriteStrClient( Client, RPL_UNAWAY_MSG, Client_ID( Client ));
        }