Changeset d6e2aa8

Timestamp:

2015-11-09T12:21:46Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

0d8a9bb0

Parents:

d63f37c

Message:

Nuke imcb_clean_handle(), which was merging handles accidentally

Well, just deprecated and turned into a no-op. It was only used for
jabber anonymous MUCs, but this is something the IRC layer must take
care of. It stripped all whitespace, control and non-ascii characters,
breaking utf8 nicks support and accidentally merging contacts whose
cleaned-up handles were the same string.

For example, you could have two users with nicks ' ' and ' ' (one and
two spaces respectively) and imcb_clean_handle() would just merge them
into a single handle, , which makes them look like a single irc user.
The same thing happens with nicks that are entirely made of utf8.

Thanks to schoppenhauer from #bitlbee for reporting this and preparing a
test case channel!

Location:

protocols

Files:

• jabber/conference.c (modified) (1 diff)
• nogaim.c (modified) (1 diff)
• nogaim.h (modified) (1 diff)

protocols/jabber/conference.c

@@ -302 +302 @@
                                         }
                                 }
-
-                                /* Some program-specific restrictions. */
-                                imcb_clean_handle(ic, bud->ext_jid);
                         }
                         bud->flags |= JBFLAG_IS_ANONYMOUS;

protocols/nogaim.c

@@ -735 +735 @@
 }
 
+/* Deprecated: using this function resulted in merging several handles accidentally
+ * Also the irc layer handles this decently nowadays */
 void imcb_clean_handle(struct im_connection *ic, char *handle)
 {
-        /* Accepts a handle and does whatever is necessary to make it
-           BitlBee-friendly. Currently this means removing everything
-           outside 33-127 (ASCII printable excl spaces), @ (only one
-           is allowed) and ! and : */
-        char out[strlen(handle) + 1];
-        int s, d;
-
-        s = d = 0;
-        while (handle[s]) {
-                if (handle[s] > ' ' && handle[s] != '!' && handle[s] != ':' &&
-                    (handle[s] & 0x80) == 0) {
-                        if (handle[s] == '@') {
-                                /* See if we got an @ already? */
-                                out[d] = 0;
-                                if (strchr(out, '@')) {
-                                        continue;
-                                }
-                        }
-
-                        out[d++] = handle[s];
-                }
-                s++;
-        }
-        out[d] = handle[s];
-
-        strcpy(handle, out);
-}
+}

protocols/nogaim.h

@@ -328 +328 @@
 G_MODULE_EXPORT void imcb_buddy_typing(struct im_connection *ic, const char *handle, guint32 flags);
 G_MODULE_EXPORT struct bee_user *imcb_buddy_by_handle(struct im_connection *ic, const char *handle);
-G_MODULE_EXPORT void imcb_clean_handle(struct im_connection *ic, char *handle);
+
+G_GNUC_DEPRECATED G_MODULE_EXPORT void imcb_clean_handle(struct im_connection *ic, char *handle);
 
 /* Actions, or whatever. */