Changeset 12442ed

Timestamp:

2015-10-14T16:28:52Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

532efdf

Parents:

0b1ae59

Message:

msn: Better error messages on 'location blocked'

This is what the 'howtofixmsn' wiki page addressed, which has a very
generic name because it's one of the first msn issues that appeared when
we thought it was dying. Since it's just a security measure, it still
appears when people log in from unusual locations.

File:

• protocols/msn/soap.c (modified) (3 diffs)

protocols/msn/soap.c

@@ -327 +327 @@
         struct xt_node *code = xt_find_node(node->children, "faultcode");
         struct xt_node *string = xt_find_node(node->children, "faultstring");
+        struct xt_node *reqstatus = xt_find_path(node, "psf:pp/psf:reqstatus");
         struct xt_node *url;
 
@@ -335 +336 @@
                    url->text_len > 0) {
                 sd->redirect = g_strdup(url->text);
+        } else if (reqstatus && strcmp(reqstatus->text, "0x800488fe") == 0) {
+                char *msg = "Location blocked. Log in to live.com, go to recent activity and click 'this was me'";
+                sd->error = g_strdup_printf("%s (%s)", code->text, msg);
         } else {
                 sd->error = g_strdup_printf("%s (%s)", code->text, string && string->text_len ?
@@ -346 +350 @@
         { "wsse:BinarySecurityToken", "wst:RequestedSecurityToken", msn_soap_passport_sso_token },
         { "S:Fault", "S:Envelope", msn_soap_passport_failure },
+        { "S:Fault", "wst:RequestSecurityTokenResponse", msn_soap_passport_failure },
         { NULL, NULL, NULL }
 };