Changeset 060d066

Timestamp:

2011-02-01T13:05:58Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

da60f28

Parents:

00fd005

Message:

More password paranoia: Allow omitting the identify/register password as
well (and enter it using /OPER instead).

This is a gross hack and indeed still not solid: In irssi one can still
use /RAWLOG SAVE to find the OPER line sent to BitlBee (and of course not
everyone uses SSL to talk to remote BitlBee servers). This only works
within 10-30 minutes after entering the password though.

Files:

• doc/user-guide/commands.xml (modified) (5 diffs)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (3 diffs)
• root_commands.c (modified) (4 diffs)

doc/user-guide/commands.xml

@@ -25 +25 @@
 
                                 <para>
-                                        If you omit the password, you should use the IRC /OPER command to enter it separately. The advantage of this approach is that most IRC clients will not show OPER passwords on screen/save them in logs.
+                                        You can omit the password and enter it separately using the IRC /OPER command. This lets you enter your password without your IRC client echoing it on screen or recording it in logs.
                                 </para>
                         </description>
@@ -1604 +1604 @@
         <bitlbee-command name="register">
                 <short-description>Register yourself</short-description>
-                <syntax>register &lt;password&gt;</syntax>
+                <syntax>register [&lt;password&gt;]</syntax>
 
                 <description>
@@ -1618 +1618 @@
                                 To identify yourself in later sessions, you can use the <emphasis>identify</emphasis> command. To change your password later, you can use the <emphasis>set password</emphasis> command.
                         </para>
+
+                        <para>
+                                You can omit the password and enter it separately using the IRC /OPER command. This lets you enter your password without your IRC client echoing it on screen or recording it in logs.
+                        </para>
                 </description>
 
@@ -1623 +1627 @@
 
         <bitlbee-command name="identify">
-                <syntax>identify [-noload|-force] &lt;password&gt;</syntax>
+                <syntax>identify [-noload|-force] [&lt;password&gt;]</syntax>
                 <short-description>Identify yourself with your password</short-description>
 
@@ -1641 +1645 @@
                         <para>
                                 <emphasis>-noload</emphasis> will log you in but not load any accounts and settings saved under your current nickname. These will be overwritten once you save your settings (i.e. when you disconnect).
+                        </para>
+
+                        <para>
+                                You can omit the password and enter it separately using the IRC /OPER command. This lets you enter your password without your IRC client echoing it on screen or recording it in logs.
                         </para>
                 </description>

irc.h

@@ -50 +50 @@
         USTATUS_SHUTDOWN = 8,   /* Now used to indicate we're shutting down.
                                    Currently just blocks irc_vawrite(). */
+
+        /* Not really status stuff, but other kinds of flags: For slightly
+           better password security, since the only way to send passwords
+           to the IRC server securely (i.e. not echoing to screen or written
+           to logfiles) is the /OPER command, try to use that command for
+           stuff that matters. */
+        OPER_HACK_IDENTIFY = 0x100,
+        OPER_HACK_REGISTER = 0x200,
+        OPER_HACK_ACCOUNT_ADD = 0x400,
+        OPER_HACK_ANY = 0x700,  /* To check for them all at once. */
 } irc_status_t;
 

irc_commands.c

@@ -397 +397 @@
 }
 
-
+static void irc_cmd_oper_hack( irc_t *irc, char **cmd );
 
 static void irc_cmd_oper( irc_t *irc, char **cmd )
 {
-        account_t *a;
-        
-        /* /OPER can now also be used to enter IM passwords without echoing.
-           It's a hack but the extra password security is worth it. */
-        for( a = irc->b->accounts; a; a = a->next )
-                if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
-                {
-                        set_setstr( &a->set, "password", cmd[2] );
-                        irc_usermsg( irc, "Password added to IM account "
-                                     "%s(%s)", a->prpl->name, a->user );
-                        /* The IRC client may expect this. Report failure since
-                           we didn't hand out a +o. */
-                        irc_send_num( irc, 491, ":Password added to IM account "
-                                      "%s(%s)", a->prpl->name, a->user );
-                        return;
-                }
+        /* Very non-standard evil but useful/secure hack, see below. */
+        if( irc->status & OPER_HACK_ANY )
+                return irc_cmd_oper_hack( irc, cmd );
         
         if( global.conf->oper_pass &&
@@ -430 +417 @@
                 irc_send_num( irc, 491, ":Incorrect password" );
         }
+}
+
+static void irc_cmd_oper_hack( irc_t *irc, char **cmd )
+{
+        char *password = g_strjoinv( " ", cmd + 2 );
+        
+        /* /OPER can now also be used to enter IM/identify passwords without
+           echoing. It's a hack but the extra password security is worth it. */
+        if( irc->status & OPER_HACK_ACCOUNT_ADD )
+        {
+                account_t *a;
+                
+                for( a = irc->b->accounts; a; a = a->next )
+                        if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
+                        {
+                                set_setstr( &a->set, "password", password );
+                                irc_usermsg( irc, "Password added to IM account "
+                                             "%s(%s)", a->prpl->name, a->user );
+                                /* The IRC client may expect this. 491 suggests the OPER
+                                   password was wrong, so the client won't expect a +o.
+                                   It may however repeat the password prompt. We'll see. */
+                                irc_send_num( irc, 491, ":Password added to IM account "
+                                              "%s(%s)", a->prpl->name, a->user );
+                        }
+        }
+        else if( irc->status & OPER_HACK_IDENTIFY )
+        {
+                char *send_cmd[] = { "identify", password, NULL };
+                irc_send_num( irc, 491, ":Trying to identify" );
+                root_command( irc, send_cmd );
+        }
+        else if( irc->status & OPER_HACK_REGISTER )
+        {
+                char *send_cmd[] = { "register", password, NULL };
+                irc_send_num( irc, 491, ":Trying to identify" );
+                root_command( irc, send_cmd );
+        }
+        
+        irc->status &= ~OPER_HACK_ANY;
+        g_free( password );
 }
 
@@ -756 +783 @@
                 }
         
-        if( irc->status >= USTATUS_LOGGED_IN )
+        if( irc->status & USTATUS_LOGGED_IN )
                 irc_send_num( irc, 421, "%s :Unknown command", cmd[0] );
 }

root_commands.c

@@ -114 +114 @@
         }
         
-        if( strncmp( cmd[1], "-no", 3 ) == 0 )
+        if( cmd[1] == NULL )
+        {
+        }
+        else if( strncmp( cmd[1], "-no", 3 ) == 0 )
         {
                 load = FALSE;
@@ -135 +138 @@
         if( password == NULL )
         {
-                MIN_ARGS( 2 );
+                irc_usermsg( irc, "About to identify, use /OPER to enter the password" );
+                irc->status |= OPER_HACK_IDENTIFY;
+                return;
         }
         
@@ -211 +216 @@
         {
                 irc_usermsg( irc, "This server does not allow registering new accounts" );
+                return;
+        }
+        
+        if( cmd[1] == NULL )
+        {
+                irc_usermsg( irc, "About to register, use /OPER to enter the password" );
+                irc->status |= OPER_HACK_REGISTER;
                 return;
         }
@@ -1362 +1374 @@
         { "group",          1, cmd_group,          0 },
         { "help",           0, cmd_help,           0 }, 
-        { "identify",       1, cmd_identify,       0 },
+        { "identify",       0, cmd_identify,       0 },
         { "info",           1, cmd_info,           0 },
         { "nick",           1, cmd_nick,           0 },
         { "no",             0, cmd_yesno,          0 },
         { "qlist",          0, cmd_qlist,          0 },
-        { "register",       1, cmd_register,       0 },
+        { "register",       0, cmd_register,       0 },
         { "remove",         1, cmd_remove,         0 },
         { "rename",         2, cmd_rename,         0 },