Changeset 238f828

Timestamp:

2005-12-26T14:42:54Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e4d6271

Parents:

d25f6fc

Message:

Fixed that security hole, and added mode +R (don't know if that's the right one).
Now to add the actual oper features (and IPC). :-)

Files:

• commands.c (modified) (3 diffs)
• irc.c (modified) (6 diffs)
• irc.h (modified) (2 diffs)

commands.c

@@ -97 +97 @@
         case STORAGE_OK:
                 irc_usermsg( irc, "Password accepted" );
+                irc_umode_set( irc, "+R", 1 );
                 break;
         default:
@@ -122 +123 @@
                 case STORAGE_OK:
                         irc->status = USTATUS_IDENTIFIED;
+                        irc_umode_set( irc, "+R", 1 );
                         break;
 
@@ -146 +148 @@
         case STORAGE_OK:
                 irc_setpass( irc, NULL );
+                irc->status = USTATUS_LOGGED_IN;
+                irc_umode_set( irc, "-R", 1 );
                 irc_usermsg( irc, "Account `%s' removed", irc->nick );
                 return( 0 );

irc.c

@@ -506 +506 @@
                         irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );
                 else if( strcmp( cmd[2], global.conf->oper_pass ) == 0 )
-                        irc_umode_set( irc, irc->nick, "+o" );
+                        irc_umode_set( irc, "+o", 1 );
                 // else
                         /* FIXME/TODO: Find out which reply to send now. */
@@ -533 +533 @@
                         {
                                 if( cmd[2] )
-                                        irc_umode_set( irc, irc->nick, cmd[2] );
+                                        irc_umode_set( irc, cmd[2], 0 );
                         }
                         else
@@ -1084 +1084 @@
         irc_reply( irc,   2, ":Host %s is running BitlBee " BITLBEE_VERSION " " ARCH "/" CPU ".", irc->myhost );
         irc_reply( irc,   3, ":%s", IRCD_INFO );
-        irc_reply( irc,   4, "%s %s %s %s", irc->myhost, BITLBEE_VERSION, UMODES, CMODES );
+        irc_reply( irc,   4, "%s %s %s %s", irc->myhost, BITLBEE_VERSION, UMODES UMODES_PRIV, CMODES );
         irc_reply( irc,   5, "PREFIX=(ov)@+ CHANTYPES=#& CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server", CMODES, MAX_NICK_LENGTH - 1 );
         irc_motd( irc );
-        irc_umode_set( irc, irc->myhost, "+" UMODE );
+        irc_umode_set( irc, "+" UMODE, 1 );
 
         u = user_add( irc, irc->mynick );
@@ -1214 +1214 @@
 
 
-void irc_umode_set( irc_t *irc, char *who, char *s )
-{
+void irc_umode_set( irc_t *irc, char *s, int allow_priv )
+{
+        /* allow_priv: Set to 0 if s contains user input, 1 if you want
+           to set a "privileged" mode (+o, +R, etc). */
         char m[256], st = 1, *t;
         int i;
@@ -1228 +1230 @@
                 if( *t == '+' || *t == '-' )
                         st = *t == '+';
-                else
+                else if( st == 0 || ( strchr( UMODES, *t ) || ( allow_priv && strchr( UMODES_PRIV, *t ) ) ) )
                         m[(int)*t] = st;
         }
@@ -1235 +1237 @@
         
         for( i = 0; i < 256 && strlen( irc->umode ) < ( sizeof( irc->umode ) - 1 ); i ++ )
-                if( m[i] && strchr( UMODES, i ) )
+                if( m[i] )
                         irc->umode[strlen(irc->umode)] = i;
         

irc.h

@@ -40 +40 @@
 #define FLOOD_SEND_MAXBUFFER (1024*20)
 
-#define UMODES "aiso"
+#define UMODES "ias"
+#define UMODES_PRIV "Ro"
 #define CMODES "nt"
 #define CMODE "t"
@@ -127 +128 @@
 void irc_names( irc_t *irc, char *channel );
 void irc_topic( irc_t *irc, char *channel );
-void irc_umode_set( irc_t *irc, char *who, char *s );
+void irc_umode_set( irc_t *irc, char *s, int allow_priv );
 void irc_who( irc_t *irc, char *channel );
 void irc_spawn( irc_t *irc, user_t *u );