Changeset 68286eb

Timestamp:

2011-12-20T16:45:53Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e14b47b8

Parents:

f9789d4

Message:

Detect JID changes at login time and warn the user about them.

Location:

protocols/jabber

Files:

• conference.c (modified) (2 diffs)
• iq.c (modified) (3 diffs)
• jabber.c (modified) (4 diffs)
• jabber.h (modified) (2 diffs)
• jabber_util.c (modified) (1 diff)

protocols/jabber/conference.c

@@ -211 +211 @@
         struct xt_node *c;
         char *type = xt_find_attr( node, "type" );
+        struct jabber_data *jd = ic->proto_data;
         struct jabber_chat *jc;
         char *s;
@@ -252 +253 @@
                         if( bud == jc->me )
                         {
-                                bud->ext_jid = jabber_normalize( ic->acc->user );
+                                bud->ext_jid = g_strdup( jd->me );
                         }
                         else

protocols/jabber/iq.c

@@ -31 +31 @@
 {
         struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
         struct xt_node *c, *reply = NULL;
         char *type, *s;
@@ -170 +171 @@
                    was added to (or removed from) the buddy list. AFAIK they're
                    sent even if we added this buddy in our own session. */
-                        int bare_len = strlen( ic->acc->user );
+                        int bare_len = strlen( jd->me );
                         
                         if( ( s = xt_find_attr( node, "from" ) ) == NULL ||
-                            ( strncmp( s, ic->acc->user, bare_len ) == 0 &&
+                            ( strncmp( s, jd->me, bare_len ) == 0 &&
                               ( s[bare_len] == 0 || s[bare_len] == '/' ) ) )
                         {
@@ -343 +344 @@
         {
                 c = xt_find_node( c->children, "jid" );
-                if( c && c->text_len && ( s = strchr( c->text, '/' ) ) &&
-                    strcmp( s + 1, set_getstr( &ic->acc->set, "resource" ) ) != 0 )
+                if( !c || !c->text )
+                {
+                        /* Server is crap, but this is no disaster. */
+                }
+                else if( strncmp( jd->me, c->text, strlen( jd->me ) ) != 0 )
+                {
+                        s = strchr( c->text, '/' );
+                        if( s )
+                                *s = '\0';
+                        jabber_set_me( ic, c->text );
+                        imcb_log( ic, "Server claims your JID is `%s' instead of `%s'. "
+                                  "This mismatch may cause problems with groupchats "
+                                  "and possibly other things.",
+                                  c->text, ic->acc->user );
+                        if( s )
+                                *s = '/';
+                }
+                else if( c && c->text_len && ( s = strchr( c->text, '/' ) ) &&
+                         strcmp( s + 1, set_getstr( &ic->acc->set, "resource" ) ) != 0 )
                         imcb_log( ic, "Server changed session resource string to `%s'", s + 1 );
         }

protocols/jabber/jabber.c

@@ -111 +111 @@
         ic->proto_data = jd;
         
-        jd->username = g_strdup( acc->user );
-        jd->server = strchr( jd->username, '@' );
+        jabber_set_me( ic, acc->user );
         
         jd->fd = jd->r_inpa = jd->w_inpa = -1;
@@ -122 +121 @@
                 return;
         }
-        
-        /* So don't think of free()ing jd->server.. :-) */
-        *jd->server = 0;
-        jd->server ++;
         
         if( ( s = strchr( jd->server, '/' ) ) )
@@ -314 +309 @@
         g_free( jd->away_message );
         g_free( jd->username );
+        g_free( jd->me );
         g_free( jd );
         
@@ -495 +491 @@
 static void jabber_chat_invite_( struct groupchat *c, char *who, char *msg )
 {
+        struct jabber_data *jd = c->ic->proto_data;
         struct jabber_chat *jc = c->data;
         gchar *msg_alt = NULL;
 
         if( msg == NULL )
-                msg_alt = g_strdup_printf( "%s invited you to %s", c->ic->acc->user, jc->name );
+                msg_alt = g_strdup_printf( "%s invited you to %s", jd->me, jc->name );
         
         if( c && who )

protocols/jabber/jabber.h

@@ -94 +94 @@
         char *username;         /* USERNAME@server */
         char *server;           /* username@SERVER -=> server/domain, not hostname */
+        char *me;               /* bare jid */
         
         const struct oauth2_service *oauth2_service;
@@ -308 +309 @@
 struct jabber_error *jabber_error_parse( struct xt_node *node, char *xmlns );
 void jabber_error_free( struct jabber_error *err );
+gboolean jabber_set_me( struct im_connection *ic, const char *me );
 
 extern const struct jabber_away_state jabber_away_state_list[];

protocols/jabber/jabber_util.c

@@ -761 +761 @@
         g_free( err );
 }
+
+gboolean jabber_set_me( struct im_connection *ic, const char *me )
+{
+        struct jabber_data *jd = ic->proto_data;
+        
+        if( strchr( me, '@' ) == NULL )
+                return FALSE;
+        
+        g_free( jd->username );
+        g_free( jd->me );
+        
+        jd->me = jabber_normalize( me );
+        jd->server = strchr( jd->me, '@' );
+        jd->username = g_strndup( jd->me, jd->server - jd->me );
+        jd->server ++;
+        
+        return TRUE;
+}