From 011201e47004538e732f247bfeb21634c6e1d97f Mon Sep 17 00:00:00 2001 From: Mike Ruprecht Date: Tue, 8 Nov 2011 05:29:03 -0600 Subject: [PATCH] Fix login failure due to trying to interact to an obsolete server The ABFindAll and FindMembership requests were getting HTTP 301 Permanently Moved responses with empty ABFindAllResponse nodes. This was causing an assertion when trying to access a nonexistent part of the ABFindAllResponse packet and therefore impossible to log in. This patch replaces occurrences of the obsolete 'contacts.msn.com' with the preferred address (according to the responses) of 'local-bay.contacts.msn.com'. --- papyon/service/description/AB/__init__.py | 2 +- papyon/service/description/Sharing/__init__.py | 2 +- .../SingleSignOn/RequestMultipleSecurityTokens.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/papyon/service/description/AB/__init__.py b/papyon/service/description/AB/__init__.py index 48af7e2..2f116de 100644 --- a/papyon/service/description/AB/__init__.py +++ b/papyon/service/description/AB/__init__.py @@ -20,7 +20,7 @@ name = "AB" description = "Hotmail address book service" -url = "http://contacts.msn.com/abservice/abservice.asmx" +url = "http://local-bay.contacts.msn.com/abservice/abservice.asmx" from constants import * diff --git a/papyon/service/description/Sharing/__init__.py b/papyon/service/description/Sharing/__init__.py index 20423c9..253c972 100644 --- a/papyon/service/description/Sharing/__init__.py +++ b/papyon/service/description/Sharing/__init__.py @@ -20,7 +20,7 @@ name = "Sharing" description = "Membership address book service" -url = "http://contacts.msn.com/abservice/SharingService.asmx" +url = "http://local-bay.contacts.msn.com/abservice/SharingService.asmx" import FindMembership import AddMember diff --git a/papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py b/papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py index 42d7497..af7b6f3 100644 --- a/papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py +++ b/papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py @@ -21,7 +21,7 @@ import xml.sax.saxutils as xml class LiveService(object): - CONTACTS = ("contacts.msn.com", "MBI") + CONTACTS = ("local-bay.contacts.msn.com", "MBI") MESSENGER = ("messenger.msn.com", "?id=507") MESSENGER_CLEAR = ("messengerclear.live.com", "MBI_KEY_OLD") MESSENGER_SECURE = ("messengersecure.live.com", "MBI_SSL") -- 1.7.5.4