Changeset d97f51b for protocols/msn

Timestamp:

2010-08-14T23:23:23Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ff27648

Parents:

d912fe4

Message:

Fix issues with logging in with huge SSO tickets (hilariously, the 1024-
byte buffer was just one byte too short, resulting in a \r-terminated
login line and the server waiting for the \n). Also using xt_find_path().

Location:

protocols/msn

Files:

• msn_util.c (modified) (1 diff)
• ns.c (modified) (1 diff)
• soap.c (modified) (5 diffs)

protocols/msn/msn_util.c

@@ -65 +65 @@
         strcpy( handle, handle_ );
         if( ( domain = strchr( handle, '@' ) ) )
-                *(domain
-                ++) = '\0';
+                *(domain++) = '\0';
         else
                 return NULL;

protocols/msn/ns.c

@@ -705 +705 @@
         
         {
-                char buf[1024];
+                char buf[1536];
                 
                 g_snprintf( buf, sizeof( buf ), "USR %d SSO S %s %s\r\n", ++md->trId, md->tokens[0], token );

protocols/msn/soap.c

@@ -203 +203 @@
         id += strlen( id ) - 1;
         if( *id == '1' &&
-            ( p = node->parent ) && ( p = p->parent ) &&
-            ( p = xt_find_node( p->children, "wst:RequestedProofToken" ) ) &&
-            ( p = xt_find_node( p->children, "wst:BinarySecret" ) ) &&
+            ( p = xt_find_path( node, "../../wst:RequestedProofToken/wst:BinarySecret" ) ) &&
             p->text )
                 sd->secret = g_strdup( p->text );
@@ -477 +475 @@
         struct im_connection *ic = soap_req->ic;
         
-        if( ( p = node->parent ) && ( p = p->parent ) &&
-            ( p = xt_find_node( p->children, "MemberRole" ) ) )
+        if( ( p = xt_find_path( node, "../../MemberRole" ) ) )
                 role = p->text;
         
@@ -636 +633 @@
         struct msn_soap_req_data *soap_req = data;
         
-        if( ( p = node->parent ) &&
-            ( p = xt_find_node( p->children, "groupId" ) ) )
+        if( ( p = xt_find_path( node, "../groupId" ) ) )
                 id = p->text;
         
@@ -657 +653 @@
         struct im_connection *ic = soap_req->ic;
         
-        if( ( p = node->parent ) &&
-            ( p = xt_find_node( p->children, "contactId" ) ) )
+        if( ( p = xt_find_path( node, "../contactId" ) ) )
                 id = p->text;
         if( ( p = xt_find_node( node->children, "contactType" ) ) )
@@ -676 +671 @@
         }
         
+        if( handle == NULL )
+                return XT_HANDLED;
+        
         if( !( bu = bee_user_by_handle( ic->bee, ic, handle ) ) &&
             !( bu = bee_user_new( ic->bee, ic, handle, 0 ) ) )