Changeset 757515a

Timestamp:

2014-07-24T03:51:07Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

1783ab6

Parents:

778ea8a

git-author:

GRMrGecko <GRMrGecko@…> (24-07-14 03:51:07)

git-committer:

dequis <dx@…> (24-07-14 03:51:07)

Message:

Added jabber_compare_jid to fix JID comparison case sensitivity

Files:

• protocols/jabber/iq.c (modified) (1 diff)
• protocols/jabber/jabber.h (modified) (1 diff)
• protocols/jabber/jabber_util.c (modified) (1 diff)
• tests/check_jabber_util.c (modified) (2 diffs)

protocols/jabber/iq.c

@@ -352 +352 @@
                         /* Server is crap, but this is no disaster. */
                 }
-                else if( strncmp( jd->me, c->text, strlen( jd->me ) ) != 0 )
+                else if( jabber_compare_jid( jd->me, c->text ) == 0 )
                 {
                         s = strchr( c->text, '/' );

protocols/jabber/jabber.h

@@ -289 +289 @@
 const struct jabber_away_state *jabber_away_state_by_name( char *name );
 void jabber_buddy_ask( struct im_connection *ic, char *handle );
+int jabber_compare_jid( const char *jid1, const char *jid2 );
 char *jabber_normalize( const char *orig );
 

protocols/jabber/jabber_util.c

@@ -306 +306 @@
         imcb_ask( ic, buf, bla, jabber_buddy_ask_yes, jabber_buddy_ask_no );
         g_free( buf );
+}
+
+/* Compares two Jabber IDs to check for match. */
+int jabber_compare_jid( const char *jid1, const char *jid2 )
+{
+        int i;
+        
+        for( i = 0; ; i ++ )
+        {
+                if( jid1[i] == '\0' || jid1[i] == '/' || jid2[i] == '\0' || jid2[i] == '/' )
+                {
+                        if( ( jid1[i] == '\0' || jid1[i] == '/' ) && ( jid2[i] == '\0' || jid2[i] == '/' ) )
+                                break;
+                        return FALSE;
+                }
+                if( tolower( jid1[i] ) != tolower( jid2[i] ) )
+                {
+                        return FALSE;
+                }
+        }
+        
+        return TRUE;
 }
 

tests/check_jabber_util.c

@@ -95 +95 @@
 }
 
+static void check_compareJID(int l)
+{
+        fail_unless( jabber_compare_jid( "bugtest@google.com/B", "bugtest@google.com/A" ) );
+        fail_if( jabber_compare_jid( "bugtest1@google.com/B", "bugtest@google.com/A" ) );
+        fail_if( jabber_compare_jid( "bugtest@google.com/B", "bugtest1@google.com/A" ) );
+        fail_if( jabber_compare_jid( "bugtest1@google.com/B", "bugtest2@google.com/A" ) );
+        fail_unless( jabber_compare_jid( "bugtest@google.com/A", "bugtest@google.com/A" ) );
+        fail_if( jabber_compare_jid( "", "bugtest@google.com/A" ) );
+}
+
 Suite *jabber_util_suite (void)
 {
@@ -110 +120 @@
         suite_add_tcase (s, tc_core);
         tcase_add_test (tc_core, check_buddy_add);
+        tcase_add_test (tc_core, check_compareJID);
         return s;
 }