Changeset 9564e55 for root_commands.c

Timestamp:

2010-11-22T13:17:45Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

bedad20

Parents:

09d4922

Message:

Allow omitting the password argument to "account add", to then separately
enter the password using the /OPER command (which will not echo to the
screen and/or logs).

It's a fairly ugly hack but the improved password security is worth it
IMHO.

File:

• root_commands.c (modified) (5 diffs)

root_commands.c

@@ -394 +394 @@
                 struct prpl *prpl;
                 
-                MIN_ARGS( 4 );
+                MIN_ARGS( 3 );
+                
+                if( cmd[4] == NULL )
+                        for( a = irc->b->accounts; a; a = a->next )
+                                if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
+                                {
+                                        irc_usermsg( irc, "Enter password for account %s(%s) "
+                                                     "first (use /OPER)", a->prpl->name, a->user );
+                                        return;
+                                }
                 
                 prpl = find_protocol( cmd[2] );
@@ -410 +419 @@
                                              "trying to add it twice?", prpl->name, cmd[3] );
                 
-                a = account_add( irc->b, prpl, cmd[3], cmd[4] );
+                a = account_add( irc->b, prpl, cmd[3], cmd[4] ? cmd[4] : PASSWORD_PENDING );
                 if( cmd[5] )
                 {
@@ -419 +428 @@
                 
                 irc_usermsg( irc, "Account successfully added" );
+                
+                if( cmd[4] == NULL )
+                        irc_usermsg( irc, "Now, use /OPER to enter your password for this account" );
                 
                 return;
@@ -462 +474 @@
                         for( a = irc->b->accounts; a; a = a->next )
                                 if( !a->ic && a->auto_connect )
-                                        account_on( irc->b, a );
+                                {
+                                        if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
+                                                irc_usermsg( irc, "Enter password for account %s(%s) "
+                                                             "first (use /OPER)", a->prpl->name, a->user );
+                                        else
+                                                account_on( irc->b, a );
+                                }
                 } 
                 else
@@ -520 +538 @@
                 if( a->ic )
                         irc_usermsg( irc, "Account already online" );
+                else if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
+                        irc_usermsg( irc, "Enter password for account %s(%s) "
+                                     "first (use /OPER)", a->prpl->name, a->user );
                 else
                         account_on( irc->b, a );