- replaced a lot of strcat() calls with strlcat() which is more secure.

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

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 381811e456c5ee6a3830e22fee44c1a7c23eca8f..c5eeadfb5e87938e29fbb2a6c268529f918c5af1 100644 (file)
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -14,10 +14,12 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-mode.c,v 1.22 2002/12/16 10:52:53 alex Exp $";
+static char UNUSED id[] = "$Id: irc-mode.c,v 1.25 2002/12/26 16:48:14 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "conn.h"
@@ -140,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;
@@ -152,13 +155,18 @@ 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';
+                               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';
@@ -167,7 +175,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':
@@ -178,6 +186,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
                                Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin ));
                                if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr );
                                x[0] = '\0';
+                               goto client_exit;
                }
                if( ! ok ) break;
 
@@ -187,16 +196,17 @@ 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:
+       
        /* Are there changed modes? */
        if( the_modes[1] )
        {
@@ -226,10 +236,11 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
 {
        /* Handle channel and channel-user modes */
 
-       CHAR the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], *mode_ptr;
+       CHAR the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], argadd[CLIENT_PASS_LEN], *mode_ptr;
        BOOLEAN ok, set, modeok, skiponce;
        INT mode_arg, arg_arg;
        CLIENT *client;
+       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 ));
@@ -295,7 +306,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;
@@ -308,6 +320,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
 
                /* Validate modes */
                x[0] = '\0';
+               argadd[0] = '\0';
                client = NULL;
                switch( *mode_ptr )
                {
@@ -365,6 +378,56 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
                                }
                                else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
                                break;
+                       case 'k':
+                               /* Channel key */
+                               if( ! set )
+                               {
+                                       if( modeok ) x[0] = *mode_ptr;
+                                       else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+                                       break;
+                               }
+                               if( arg_arg > mode_arg )
+                               {
+                                       if( modeok )
+                                       {
+                                               Channel_ModeDel( Channel, 'k' );
+                                               Channel_SetKey( Channel, Req->argv[arg_arg] );
+                                               strcpy( argadd, Channel_Key( Channel ));
+                                               x[0] = *mode_ptr;
+                                       }
+                                       else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+                                       Req->argv[arg_arg][0] = '\0';
+                                       arg_arg++;
+                               }
+                               else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
+                               break;
+                       case 'l':
+                               /* Member limit */
+                               if( ! set )
+                               {
+                                       if( modeok ) x[0] = *mode_ptr;
+                                       else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+                                       break;
+                               }
+                               if( arg_arg > mode_arg )
+                               {
+                                       if( modeok )
+                                       {
+                                               l = atol( Req->argv[arg_arg] );
+                                               if( l > 0 && l < 0xFFFF )
+                                               {
+                                                       Channel_ModeDel( Channel, 'l' );
+                                                       Channel_SetMaxUsers( Channel, l );
+                                                       sprintf( argadd, "%ld", l );
+                                                       x[0] = *mode_ptr;
+                                               }
+                                       }
+                                       else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+                                       Req->argv[arg_arg][0] = '\0';
+                                       arg_arg++;
+                               }
+                               else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
+                               break;
 
                        /* Channel lists */
                        case 'I':
@@ -404,6 +467,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
                                Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\" on %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin ), Channel_Name( Channel ));
                                if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr );
                                x[0] = '\0';
+                               goto chan_exit;
                }
                if( ! ok ) break;
 
@@ -418,8 +482,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 ));
                                }
                        }
@@ -428,7 +493,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 ));
                                }
                        }
@@ -441,8 +506,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 ));
                                }
                        }
@@ -451,12 +517,20 @@ 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 ));
                                }
                        }
-               }               
+               }
+
+               /* Are there additional arguments to add? */
+               if( argadd[0] )
+               {
+                       if( the_args[strlen( the_args ) - 1] != ' ' ) strlcat( the_args, " ", sizeof( the_args ));
+                       strlcat( the_args, argadd, sizeof( the_args ));
+               }
        }
+chan_exit:
 
        /* Are there changed modes? */
        if( the_modes[1] )