From 5625741cc283008372e0fcf5af8a50b502293d95 Mon Sep 17 00:00:00 2001
From: root <root@adelauth>
Date: Thu, 13 Nov 2008 09:17:17 +0100
Subject: [PATCH] another bunch of uncommited changes

---
 extra/modules/liberty.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/extra/modules/liberty.py b/extra/modules/liberty.py
index 53b04c1..4b1e8e5 100644
--- a/extra/modules/liberty.py
+++ b/extra/modules/liberty.py
@@ -394,6 +394,7 @@ class AlternateLibertyDirectory(authentic.liberty.root.RootDirectory):
             '<is:UserInteraction', '<is:UserInteraction xmlns:is="urn:liberty:is:2003-08"')
         soap_answer = soap_call(wsc_proxy_service.msgUrl, body + '  ',
                 more_headers = more_headers)
+        soap_answer = soap_answer.replace('S:detail', 'S:Detail')
         try:
             wsc_proxy_service.processResponseMsg(soap_answer)
         except lasso.Error, error:
@@ -463,6 +464,7 @@ class AlternateLibertyDirectory(authentic.liberty.root.RootDirectory):
 
         length = int(request.environ.get('CONTENT_LENGTH'))
         soap_message = request.stdin.read(length)
+        print 'Received on mspProxySoapEndpoint: %s' % soap_message
 
         request_type = lasso.getRequestTypeFromSoapMsg(soap_message) 
         service = lasso.DataService(authentic.misc.get_lasso_server())
@@ -543,6 +545,7 @@ class AlternateLibertyDirectory(authentic.liberty.root.RootDirectory):
                     # the refToMessageId on the proxyed request
                     # to set refToMessageId on the request to MSP
                     self.setMessageId(service.soapEnvelopeResponse, messageId)
+                    print 'Redirection sur %s' % result
                     service.needRedirectUser(result)
                     
                 service.buildModifyResponseMsg()
@@ -678,6 +681,7 @@ class AlternateLibertyDirectory(authentic.liberty.root.RootDirectory):
         else:
             soap_answer = soap_call(wsc_proxy_service.msgUrl, wsc_proxy_service.msgBody + '  ',
                 more_headers = more_headers)
+        soap_answer = soap_answer.replace('S:detail', 'S:Detail')
 
         # Process ReadOid response from MSP
         wsc_proxy_service.processResponseMsg(soap_answer)
@@ -772,16 +776,21 @@ class AlternateLibertyDirectory(authentic.liberty.root.RootDirectory):
                     get_cfg('adeline', {}).get('http_auth_tuple'))
         body = wsc_proxy_service.msgBody
         # FIXME: MSP is void !
+        body = body.replace('xmlns:is="urn:liberty:is:2003-08"','').replace(
+            '<is:UserInteraction', '<is:UserInteraction xmlns:is="urn:liberty:is:2003-08"')
         soap_answer = soap_call(wsc_proxy_service.msgUrl, body + '  ',
                 more_headers = more_headers)
         # FIXME: MSP for dummies !
-        soap_answer = soap_answer.replace('faultcode','S:faultcode').replace(
-           'faultstring', 'S:faultstring').replace('faultactor', 'S:faultactor').replace('detail', 'S:Detail')
+        soap_answer = soap_answer.replace('S:detail', 'S:Detail')
+        print 'after replace: ', soap_answer
         try:
             wsc_proxy_service.processResponseMsg(soap_answer)
         except lasso.Error, error:
+            print 'erreur sur update', error
+            print 'dump', wsc_proxy_service.response.dump()
             if error[0] != lasso.SOAP_FAULT_REDIRECT_REQUEST or not wsc_proxy_service.msgUrl:
                 raise
+            print 'redirect'
             messageId = self.getMessageId(wsc_proxy_service.soapEnvelopeResponse)
             return (wsc_proxy_service.msgUrl, messageId)
         if wsc_proxy_service.response.status.code == 'Ok':