Changeset 27053b5

Timestamp:

2010-09-04T17:13:55Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4e1be76

Parents:

4aa8a04

Message:

Finish re-authentication works. Should now work for OIMs as well.

Location:

protocols/msn

Files:

• msn.c (modified) (6 diffs)
• msn.h (modified) (2 diffs)
• ns.c (modified) (1 diff)
• soap.c (modified) (11 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;
+        md->ns->fd = -1;
         
         msn_connections = g_slist_prepend( msn_connections, ic );
@@ -87 +87 @@
                 
                 msn_ns_close( md->ns );
-                msn_ns_close( md->auth );
                 
                 while( md->switchboards )
@@ -97 +96 @@
                         g_free( md->tokens[i] );
                 g_free( md->lock_key );
+                g_free( md->pp_policy );
                 
                 while( md->groups )
@@ -181 +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;
@@ -284 +282 @@
 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 );
 }
 
@@ -302 +300 @@
 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

@@ -81 +81 @@
         MSN_GOT_PROFILE_DN = 2,
         MSN_DONE_ADL = 4,
+        MSN_REAUTHING = 8,
 } msn_flags_t;
 
@@ -103 +104 @@
         struct im_connection *ic;
         
-        struct msn_handler_data ns[1], auth[1];
+        struct msn_handler_data ns[1];
         msn_flags_t flags;
         

protocols/msn/ns.c

@@ -275 +275 @@
                         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

@@ -48 +48 @@
         MSN_SOAP_OK,
         MSN_SOAP_RETRY,
+        MSN_SOAP_REAUTH,
         MSN_SOAP_ABORT,
 } msn_soap_result_t;
@@ -134 +135 @@
         }
         
+        msn_soap_debug_print( http_req->reply_headers, http_req->reply_body );
+        
         if( http_req->body_size > 0 )
         {
@@ -143 +146 @@
                 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 )
+                    err->text_len > 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;
+                        if( strcmp( err->text, "PassportAuthFail" ) == 0 )
+                        {
+                                xt_free( parser );
+                                st = MSN_SOAP_REAUTH;
+                                goto fail;
+                        }
+                        /* TODO: Handle/report other errors. */
                 }
                 
@@ -159 +161 @@
         }
         
-        msn_soap_debug_print( http_req->reply_headers, http_req->reply_body );
-        
         st = soap_req->handle_response( soap_req );
-        
+
+fail:   
         g_free( soap_req->url );
         g_free( soap_req->action );
@@ -169 +170 @@
         
         if( st == MSN_SOAP_RETRY && --soap_req->ttl )
+        {
                 msn_soap_send_request( soap_req );
+        }
+        else if( st == MSN_SOAP_REAUTH )
+        {
+                struct msn_data *md = soap_req->ic->proto_data;
+                
+                if( !( md->flags & MSN_REAUTHING ) )
+                {
+                        /* Nonce shouldn't actually be touched for re-auths. */
+                        msn_soap_passport_sso_request( soap_req->ic, "blaataap" );
+                        md->flags |= MSN_REAUTHING; 
+                }
+                md->soapq = g_slist_append( md->soapq, soap_req );
+        }
         else
         {
@@ -242 +257 @@
 static int msn_soap_passport_sso_build_request( struct msn_soap_req_data *soap_req )
 {
-        struct msn_soap_passport_sso_data *sd = soap_req->data;
         struct im_connection *ic = soap_req->ic;
         struct msn_data *md = ic->proto_data;
@@ -423 +437 @@
         char *msg;
         int number;
-        int need_retry;
+        msn_soap_result_t need_retry;
 };
 
@@ -444 +458 @@
         
         g_free( display_name_b64 );
-        
-        return MSN_SOAP_OK;
-}
-
-static xt_status msn_soap_oim_send_challenge( struct xt_node *node, gpointer data )
+        oim->need_retry = MSN_SOAP_OK;
+        
+        return MSN_SOAP_OK;
+}
+
+static xt_status msn_soap_oim_reauth( struct xt_node *node, gpointer data )
 {
         struct msn_soap_req_data *soap_req = data;
@@ -454 +469 @@
         struct im_connection *ic = soap_req->ic;
         struct msn_data *md = ic->proto_data;
-        
-        g_free( md->lock_key );
-        md->lock_key = msn_p11_challenge( node->text );
-        
-        oim->need_retry = 1;
+        struct xt_node *c;
+        
+        if( ( c = xt_find_node( node->children, "LockKeyChallenge" ) ) && c->text_len > 0 )
+        {
+                g_free( md->lock_key );
+                md->lock_key = msn_p11_challenge( c->text );
+                oim->need_retry = MSN_SOAP_RETRY;
+        }
+        if( xt_find_node( node->children, "RequiredAuthPolicy" ) )
+        {
+                oim->need_retry = MSN_SOAP_REAUTH;
+        }
         
         return XT_HANDLED;
@@ -464 +486 @@
 
 static const struct xt_handler_entry msn_soap_oim_send_parser[] = {
-        { "LockKeyChallenge", "detail", msn_soap_oim_send_challenge },
-        { NULL,               NULL,     NULL                        }
+        { "detail", "soap:Fault", msn_soap_oim_reauth },
+        { NULL,     NULL,         NULL                }
 };
 
@@ -474 +496 @@
         if( soap_req->http_req->status_code == 500 && oim->need_retry && soap_req->ttl > 0 )
         {
-                oim->need_retry = 0;
-                return MSN_SOAP_RETRY;
+                return oim->need_retry;
         }
         else if( soap_req->http_req->status_code == 200 )

protocols/msn/soap.h

@@ -126 +126 @@
                "<wsse:PolicyReference xmlns=\"http://schemas.xmlsoap.org/ws/2003/06/secext\" URI=\"MBI_SSL\"></wsse:PolicyReference>" \
            "</wst:RequestSecurityToken>" \
-           "<wst:RequestSecurityToken Id=\"RST3\">" \
+           "<wst:RequestSecurityToken Id=\"RST4\">" \
                "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>" \
                "<wsp:AppliesTo>" \