summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Ruprecht <mike.ruprecht@collabora.co.uk>2011-11-08 11:29:03 (GMT)
committerMike Ruprecht <mike.ruprecht@collabora.co.uk>2011-11-08 11:29:03 (GMT)
commit011201e47004538e732f247bfeb21634c6e1d97f (patch)
treee9f6835dcd6297019c3757886939e040c24c2849
parentc437c0a4d2f09ad113e8ab0a7688db1b01c9ba3b (diff)
downloadpapyon-011201e47004538e732f247bfeb21634c6e1d97f.tar.gz
papyon-011201e47004538e732f247bfeb21634c6e1d97f.tar.xz
Fix login failure due to trying to interact to an obsolete serverbug-42689
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'.
-rw-r--r--papyon/service/description/AB/__init__.py2
-rw-r--r--papyon/service/description/Sharing/__init__.py2
-rw-r--r--papyon/service/description/SingleSignOn/RequestMultipleSecurityTokens.py2
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")