Changeset 35987a1

Timestamp:

2014-02-28T23:17:28Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b4b8f1e

Parents:

2e815e5

Message:

Allow use of "ac x set -del password" to use /oper to change the password
"securely". Patch from Flexo, bug #1117.

Files:

• irc.h (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• protocols/account.c (modified) (1 diff)
• root_commands.c (modified) (1 diff)

irc.h

@@ -60 +60 @@
         OPER_HACK_IDENTIFY_FORCE  = 0x02100,
         OPER_HACK_REGISTER = 0x200,
-        OPER_HACK_ACCOUNT_ADD = 0x400,
+        OPER_HACK_ACCOUNT_PASSWORD = 0x400,
         OPER_HACK_ANY = 0x3700, /* To check for them all at once. */
         

irc_commands.c

@@ -433 +433 @@
         /* /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 )
+        if( irc->status & OPER_HACK_ACCOUNT_PASSWORD )
         {
                 account_t *a;

protocols/account.c

@@ -154 +154 @@
         else if( strcmp( set->key, "password" ) == 0 )
         {
-                /* set -del should be allowed now, but I don't want to have any
-                   NULL pointers to have to deal with. */
-                if( !value )
-                        value = "";
+                /* set -del allows /oper to be used to change the password or,
+                   iff oauth is enabled, reset the oauth credential magic.
+                */
+                if( !value ) {
+                        if ( set_getbool( &(acc->set), "oauth" ) ) {
+                                value = "";
+                        } else {
+                                value = PASSWORD_PENDING;
+                                ((irc_t *)acc->bee->ui_data)->status |= OPER_HACK_ACCOUNT_PASSWORD;
+                                irc_rootmsg((irc_t *)acc->bee->ui_data, "You may now use /OPER to set the password");
+                        }
+                }
                 
                 g_free( acc->pass );

root_commands.c

@@ -422 +422 @@
                                 }
                         
-                        irc->status |= OPER_HACK_ACCOUNT_ADD;
+                        irc->status |= OPER_HACK_ACCOUNT_PASSWORD;
                 }