Changeset 660cb00 for protocols/msn

Timestamp:

2010-08-15T13:23:03Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9679fd8

Parents:

5a7af1b

Message:

Parse authentication errors.

Location:

protocols/msn

Files:

• msn.h (modified) (1 diff)
• ns.c (modified) (3 diffs)
• soap.c (modified) (5 diffs)

protocols/msn/msn.h

@@ -204 +204 @@
 /* ns.c */
 gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond );
-void msn_auth_got_passport_token( struct im_connection *ic, char *token );
+void msn_auth_got_passport_token( struct im_connection *ic, const char *token, const char *error );
 void msn_auth_got_contact_list( struct im_connection *ic );
 

protocols/msn/ns.c

@@ -697 +697 @@
 }
 
-void msn_auth_got_passport_token( struct im_connection *ic, char *token )
+void msn_auth_got_passport_token( struct im_connection *ic, const char *token, const char *error )
 {
         struct msn_data *md;
@@ -707 +707 @@
         md = ic->proto_data;
         
+        if( token )
         {
                 char buf[1536];
@@ -712 +713 @@
                 g_snprintf( buf, sizeof( buf ), "USR %d SSO S %s %s\r\n", ++md->trId, md->tokens[0], token );
                 msn_write( ic, buf, strlen( buf ) );
+        }
+        else
+        {
+                imcb_error( ic, "Error during Passport authentication: %s", error );
+                imc_logout( ic, TRUE );
         }
 }

protocols/msn/soap.c

@@ -173 +173 @@
         char *nonce;
         char *secret;
+        char *error;
 };
 
@@ -217 +218 @@
 }
 
+static xt_status msn_soap_passport_failure( struct xt_node *node, gpointer data )
+{
+        struct msn_soap_req_data *soap_req = data;
+        struct msn_soap_passport_sso_data *sd = soap_req->data;
+        struct xt_node *code = xt_find_node( node->children, "faultcode" );
+        struct xt_node *string = xt_find_node( node->children, "faultstring" );
+        
+        if( code == NULL || code->text_len == 0 )
+                sd->error = g_strdup( "Unknown error" );
+        else
+                sd->error = g_strdup_printf( "%s (%s)", code->text, string && string->text_len ?
+                                             string->text : "no description available" );
+        
+        return XT_HANDLED;
+}
+
 static const struct xt_handler_entry msn_soap_passport_sso_parser[] = {
         { "wsse:BinarySecurityToken", "wst:RequestedSecurityToken", msn_soap_passport_sso_token },
+        { "S:Fault", "S:Envelope", msn_soap_passport_failure },
         { NULL, NULL, NULL }
 };
@@ -270 +288 @@
                 GUINT32_TO_LE( 72 ),
         };
+        
+        if( sd->secret == NULL )
+        {
+                msn_auth_got_passport_token( ic, NULL, sd->error );
+                return MSN_SOAP_OK;
+        }
 
         key1_len = base64_decode( sd->secret, (unsigned char**) &key1 );
@@ -287 +311 @@
         
         blurb64 = base64_encode( (unsigned char*) &blurb, sizeof( blurb ) );
-        msn_auth_got_passport_token( ic, blurb64 );
+        msn_auth_got_passport_token( ic, blurb64, NULL );
         
         g_free( padnonce );
@@ -306 +330 @@
         g_free( sd->nonce );
         g_free( sd->secret );
+        g_free( sd->error );
         
         return MSN_SOAP_OK;