Changeset 58b63de6

Timestamp:

2015-10-08T08:34:18Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

c788e15

Parents:

2f73692

git-author:

dequis <dx@…> (11-09-15 22:07:10)

git-committer:

dequis <dx@…> (08-10-15 08:34:18)

Message:

IRCv3 SASL capability + PLAIN method

Only plain, no other methods. We don't have built-in SSL to implement
EXTERNAL (certfp) and nothing else is worth implementing.

The actual authentication is pretty much like sending a server password
(when the server's authmode isn't closed), which means it happens in
cmd_identify, but this code also calls storage_check_pass() to send the
required success/failure replies.

SASL doesn't give us much benefit other than standards compliance, but
some clients might appreciate it.

And having a fifth way to do the same thing doesn't hurt! Now we have:

• identify in &bitlbee
• identify to nickserv (alias for root)
• 'nickserv' and 'ns' irc commands
• server password
• sasl plain

Files:

• irc.h (modified) (2 diffs)
• irc_cap.c (modified) (2 diffs)
• irc_commands.c (modified) (4 diffs)
• root_commands.c (modified) (2 diffs)

irc.h

@@ -50 +50 @@
                                    Currently just blocks irc_vawrite(). */
         USTATUS_CAP_PENDING = 16,
+        USTATUS_SASL_PLAIN_PENDING = 32,
 
         /* Not really status stuff, but other kinds of flags: For slightly
@@ -67 +68 @@
 
 typedef enum {
+        CAP_SASL = (1 << 0),
         CAP_MULTI_PREFIX = (1 << 1),
 } irc_cap_flag_t;

irc_cap.c

@@ -38 +38 @@
 
 static const cap_info_t supported_caps[] = {
+        {"sasl", CAP_SASL},
         {"multi-prefix", CAP_MULTI_PREFIX},
         {NULL},
@@ -170 +171 @@
         } else if (g_strcasecmp(cmd[1], "END") == 0) {
                 irc->status &= ~USTATUS_CAP_PENDING;
+
+                if (irc->status & USTATUS_SASL_PLAIN_PENDING) {
+                        irc_send_num(irc, 906, ":SASL authentication aborted");
+                        irc->status &= ~USTATUS_SASL_PLAIN_PENDING;
+                }
+
                 irc_check_login(irc);
 

irc_commands.c

@@ -28 +28 @@
 #include "help.h"
 #include "ipc.h"
+#include "base64.h"
 
 static void irc_cmd_pass(irc_t *irc, char **cmd)
@@ -55 +56 @@
                 irc_setpass(irc, cmd[1]);
                 irc_check_login(irc);
+        }
+}
+
+static gboolean irc_sasl_plain_parse(char *input, char **user, char **pass)
+{
+        int i, part, len;
+        guint8 *decoded;
+        char *parts[2];
+
+        /* bitlbee's base64_decode wrapper adds an extra null terminator at the end */
+        len = base64_decode(input, &decoded);
+
+        /* this loop splits the decoded string into the parts array, like this:
+           "username\0username\0password" -> {"username", "username", "password"} */
+
+        for (i = 0, part = 0; i < len && part < 3; part++) {
+                /* set each of parts[] to point to the beginning of a string */
+                parts[part] = (char *) decoded + i;
+
+                /* move the cursor forward to the next null terminator*/
+                i += strlen(parts[part]) + 1;
+        }
+
+        /* sanity checks */
+        if (part != 3 || i != (len + 1) || strcmp(parts[0], parts[1]) != 0) {
+                g_free(decoded);
+                return FALSE;
+        } else {
+                *user = g_strdup(parts[0]);
+                *pass = g_strdup(parts[2]);
+                g_free(decoded);
+                return TRUE;
+        }
+}
+
+static gboolean irc_sasl_check_pass(irc_t *irc, char *user, char *pass)
+{
+        storage_status_t status;
+
+        /* just check the password here to be able to reply with useful numerics
+         * the actual identification will be handled later */
+        status = storage_check_pass(user, pass);
+
+        if (status == STORAGE_OK) {
+                if (!irc->user->nick) {
+                        /* set the nick here so we have it for the following numeric */
+                        irc->user->nick = g_strdup(user);
+                }
+                irc_send_num(irc, 903, ":Password accepted");
+                return TRUE;
+
+        } else if (status == STORAGE_INVALID_PASSWORD) {
+                irc_send_num(irc, 904, ":Incorrect password");
+        } else if (status == STORAGE_NO_SUCH_USER) {
+                irc_send_num(irc, 904, ":The nick is (probably) not registered");
+        } else {
+                irc_send_num(irc, 904, ":Unknown SASL authentication error");
+        }
+
+        return FALSE;
+}
+
+static void irc_cmd_authenticate(irc_t *irc, char **cmd)
+{
+        /* require the CAP to be enabled, and don't allow authentication before server password */
+        if (!(irc->caps & CAP_SASL) ||
+            (global.conf->authmode == AUTHMODE_CLOSED && !(irc->status & USTATUS_AUTHORIZED))) {
+                return;
+        }
+
+        if (irc->status & USTATUS_SASL_PLAIN_PENDING) {
+                char *user, *pass;
+
+                irc->status &= ~USTATUS_SASL_PLAIN_PENDING;
+
+                if (!irc_sasl_plain_parse(cmd[1], &user, &pass)) {
+                        irc_send_num(irc, 904, ":SASL authentication failed");
+                        return;
+                }
+
+                /* let's not support the nick != user case
+                 * if NICK is received after SASL, it will just fail after registration */
+                if (user && irc->user->nick && strcmp(user, irc->user->nick) != 0) {
+                        irc_send_num(irc, 902, ":Your SASL username does not match your nickname");
+
+                } else if (irc_sasl_check_pass(irc, user, pass)) {
+                        /* and here we do the same thing as the PASS command*/
+                        if (irc->status & USTATUS_LOGGED_IN) {
+                                char *send_cmd[] = { "identify", pass, NULL };
+                                root_command(irc, send_cmd);
+                        } else {
+                                /* no check_login here - wait for CAP END */
+                                irc_setpass(irc, pass);
+                        }
+                }
+
+                g_free(user);
+                g_free(pass);
+
+        } else if (irc->status & USTATUS_IDENTIFIED) {
+                irc_send_num(irc, 907, ":You have already authenticated");
+
+        } else if (strcmp(cmd[1], "*") == 0) {
+                irc_send_num(irc, 906, ":SASL authentication aborted");
+                irc->status &= ~USTATUS_SASL_PLAIN_PENDING;
+
+        } else if (g_strcasecmp(cmd[1], "PLAIN") == 0) {
+                irc_write(irc, "AUTHENTICATE +");
+                irc->status |= USTATUS_SASL_PLAIN_PENDING;
+
+        } else {
+                irc_send_num(irc, 908, "PLAIN :is the available SASL mechanism");
+                irc_send_num(irc, 904, ":SASL authentication failed");
+                irc->status &= ~USTATUS_SASL_PLAIN_PENDING;
         }
 }
@@ -83 +198 @@
                         irc->status &= ~USTATUS_IDENTIFIED;
                         irc_umode_set(irc, "-R", 1);
+
+                        if (irc->caps & CAP_SASL) {
+                                irc_send_num(irc, 901, "%s!%s@%s :You are now logged out",
+                                        irc->user->nick, irc->user->user, irc->user->host);
+                        }
+
                         irc_rootmsg(irc, "Changing nicks resets your identify status. "
                                     "Re-identify or register a new account if you want "
@@ -722 +843 @@
         { "restart",     0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "kill",        2, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
+        { "authenticate", 1, irc_cmd_authenticate, 0 },
         { NULL }
 };

root_commands.c

@@ -163 +163 @@
                 irc_umode_set(irc, "+R", 1);
 
+                if (irc->caps & CAP_SASL) {
+                        irc_user_t *iu = irc->user;
+                        irc_send_num(irc, 900, "%s!%s@%s %s :You are now logged in as %s",
+                                iu->nick, iu->user, iu->host, iu->nick, iu->nick);
+                }
+
                 bitlbee_whatsnew(irc);
 
@@ -238 +244 @@
                 irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set(irc, "+R", 1);
+
+                if (irc->caps & CAP_SASL) {
+                        irc_user_t *iu = irc->user;
+                        irc_send_num(irc, 900, "%s!%s@%s %s :You are now logged in as %s",
+                                iu->nick, iu->user, iu->host, iu->nick, iu->nick);
+                }
 
                 /* Set this var now, or anyone who logs in to his/her