Changeset 4aa8a04

Timestamp:

2010-09-04T15:54:52Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

27053b5

Parents:

bae0617

Message:

This works (includes some token sabotage code to ease testing), but I just
realised there's probably no need for the additional temporary NS connection.

Location:

protocols/msn

Files:

• msn.c (modified) (4 diffs)
• msn.h (modified) (1 diff)
• ns.c (modified) (4 diffs)
• soap.c (modified) (9 diffs)
• soap.h (modified) (1 diff)

protocols/msn/msn.c

@@ -64 +64 @@
         md->away_state = msn_away_state_list;
         md->domaintree = g_tree_new( msn_domaintree_cmp );
+        md->ns->fd = md->auth->fd = -1;
         
         msn_connections = g_slist_prepend( msn_connections, ic );
@@ -180 +181 @@
         struct msn_data *md = ic->proto_data;
         
+        strcpy( md->tokens[1], md->tokens[2] );
+        
         if( state == NULL )
                 md->away_state = msn_away_state_list;
@@ -281 +284 @@
 static void msn_rem_permit( struct im_connection *ic, char *who )
 {
-        msn_buddy_list_remove( ic, MSN_BUDDY_AL, who, NULL );
+        //msn_buddy_list_remove( ic, MSN_BUDDY_AL, who, NULL );
 }
 
@@ -299 +302 @@
 static void msn_rem_deny( struct im_connection *ic, char *who )
 {
-        msn_buddy_list_remove( ic, MSN_BUDDY_BL, who, NULL );
+        //msn_buddy_list_remove( ic, MSN_BUDDY_BL, who, NULL );
 }
 

protocols/msn/msn.h

@@ -108 +108 @@
         int trId;
         char *tokens[4];
-        char *lock_key;
-        
-        GSList *msgq, *grpq;
+        char *lock_key, *pp_policy;
+        
+        GSList *msgq, *grpq, *soapq;
         GSList *switchboards;
         int sb_failures;

protocols/msn/ns.c

@@ -111 +111 @@
         handler->rxq = g_new0( char, 1 );
         
-        if( msn_ns_write( ic, -1, "VER %d %s CVR0\r\n", ++md->trId, MSNP_VER ) )
+        if( msn_ns_write( ic, source, "VER %d %s CVR0\r\n", ++md->trId, MSNP_VER ) )
         {
                 handler->inpa = b_input_add( handler->fd, B_EV_IO_READ, msn_ns_callback, handler );
@@ -173 +173 @@
                 }
                 
-                return( msn_ns_write( ic, -1, "CVR %d 0x0409 mac 10.2.0 ppc macmsgs 3.5.1 macmsgs %s\r\n",
+                return( msn_ns_write( ic, handler->fd, "CVR %d 0x0409 mac 10.2.0 ppc macmsgs 3.5.1 macmsgs %s\r\n",
                                       ++md->trId, ic->acc->user ) );
         }
@@ -179 +179 @@
         {
                 /* We don't give a damn about the information we just received */
-                return msn_ns_write( ic, -1, "USR %d SSO I %s\r\n", ++md->trId, ic->acc->user );
+                return msn_ns_write( ic, handler->fd, "USR %d SSO I %s\r\n", ++md->trId, ic->acc->user );
         }
         else if( strcmp( cmd[0], "XFR" ) == 0 )
@@ -272 +272 @@
                     strcmp( cmd[3], "S" ) == 0 )
                 {
-                        msn_soap_passport_sso_request( ic, cmd[4], cmd[5] );
+                        g_free( md->pp_policy );
+                        md->pp_policy = g_strdup( cmd[4] );
+                        msn_soap_passport_sso_request( ic, cmd[5] );
+                        if( handler == md->auth )
+                        {
+                                msn_ns_close( md->auth );
+                                return 0;
+                        }
                 }
                 else if( strcmp( cmd[2], "OK" ) == 0 )

protocols/msn/soap.c

@@ -137 +137 @@
         {
                 struct xt_parser *parser;
+                struct xt_node *err;
                 
                 parser = xt_new( soap_req->xml_parser, soap_req );
                 xt_feed( parser, http_req->reply_body, http_req->body_size );
+                if( http_req->status_code == 500 &&
+                    ( err = xt_find_path( parser->root, "soap:Body/soap:Fault/detail/errorcode" ) ) &&
+                    err->text_len > 0 && strcmp( err->text, "PassportAuthFail" ) == 0 )
+                {
+                        struct msn_data *md = soap_req->ic->proto_data;
+                        
+                        xt_free( parser );
+                        if( md->auth->fd == -1 )
+                                msn_ns_connect( soap_req->ic, md->auth, MSN_NS_HOST, MSN_NS_PORT );
+                        md->soapq = g_slist_prepend( md->soapq, soap_req );
+                        
+                        return;
+                }
+                
                 xt_handle( parser, NULL, -1 );
                 xt_free( parser );
@@ -202 +217 @@
 }
 
+static int msn_soapq_empty( struct im_connection *ic )
+{
+        struct msn_data *md = ic->proto_data;
+        
+        while( md->soapq )
+        {
+                msn_soap_send_request( (struct msn_soap_req_data*) md->soapq->data );
+                md->soapq = g_slist_remove( md->soapq, md->soapq->data );
+        }
+        
+        return MSN_SOAP_OK;
+}
+
 
 /* passport_sso: Authentication MSNP15+ */
@@ -207 +235 @@
 struct msn_soap_passport_sso_data
 {
-        char *policy;
         char *nonce;
         char *secret;
@@ -217 +244 @@
         struct msn_soap_passport_sso_data *sd = soap_req->data;
         struct im_connection *ic = soap_req->ic;
+        struct msn_data *md = ic->proto_data;
         
         if( g_str_has_suffix( ic->acc->user, "@msn.com" ) )
@@ -224 +252 @@
         
         soap_req->payload = g_markup_printf_escaped( SOAP_PASSPORT_SSO_PAYLOAD,
-                ic->acc->user, ic->acc->pass, sd->policy );
+                ic->acc->user, ic->acc->pass, md->pp_policy );
         
         return MSN_SOAP_OK;
@@ -301 +329 @@
         struct msn_soap_passport_sso_data *sd = soap_req->data;
         struct im_connection *ic = soap_req->ic;
+        struct msn_data *md = ic->proto_data;
         char *key1, *key2, *key3, *blurb64;
         int key1_len;
@@ -326 +355 @@
         };
         
+        if( md->soapq )
+                return msn_soapq_empty( ic );
+        
         if( sd->secret == NULL )
         {
@@ -364 +396 @@
         struct msn_soap_passport_sso_data *sd = soap_req->data;
         
-        g_free( sd->policy );
         g_free( sd->nonce );
         g_free( sd->secret );
@@ -372 +403 @@
 }
 
-int msn_soap_passport_sso_request( struct im_connection *ic, const char *policy, const char *nonce )
+int msn_soap_passport_sso_request( struct im_connection *ic, const char *nonce )
 {
         struct msn_soap_passport_sso_data *sd = g_new0( struct msn_soap_passport_sso_data, 1 );
         
-        sd->policy = g_strdup( policy );
         sd->nonce = g_strdup( nonce );
         

protocols/msn/soap.h

@@ -139 +139 @@
 "</Envelope>"
 
-int msn_soap_passport_sso_request( struct im_connection *ic, const char *policy, const char *nonce );
+int msn_soap_passport_sso_request( struct im_connection *ic, const char *nonce );