*** empty log message ***

6 files changed, 45 insertions, 57 deletions

diff --git a/python/examples/defederation.py b/python/examples/defederation.py
index 1522945f..f490ae9a 100644
--- a/python/examples/defederation.py
+++ b/python/examples/defederation.py
@@ -40,9 +40,9 @@ print "---------------------------------------------------------"
 print " At identity provider "
 idpdefederation = lasso.FederationTermination.new(idpserver, idpuser, lasso.providerTypeIdp)
 idpdefederation.process_notification_msg(spdefederation.msg_body, lasso.httpMethodSoap)
-#idpdefederation.build_response_msg()
-#print 'url : ', idpdefederation.msg_url
-#print 'body : ', idpdefederation.msg_body
+idpdefederation.build_response_msg()
+print 'url : ', idpdefederation.msg_url
+print 'body : ', idpdefederation.msg_body
 
 
 print 'End of federation termination'
diff --git a/python/examples/registration.py b/python/examples/registration.py
index c3e9917b..0d082a02 100644
--- a/python/examples/registration.py
+++ b/python/examples/registration.py
@@ -6,46 +6,38 @@ import lasso
 
 lasso.init()
 
-req = lasso.RegisterNameIdentifierRequest.new("http://providerid.com",
-                                              "CD8SC7DSDC56D5CSDCD5CSDCS", "http://qualifier.com", "federated",
-                                              "CD8CSDCS633CDCDCSDCDSCSDC", "http://qualifier.com", "federated",
-                                              "CDS9CDS8C7CDC3I2KCDSCDCSD", "http://qualifier.com", "federated")
-print '----------------------- Requets dump -----------------------', req.dump()
+# servers :
+spserver = lasso.Server.new("../../examples/sp.xml",
+			    "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
+			    lasso.signatureMethodRsaSha1)
 
-req.rename_attributes_for_encoded_query()
-print '----------------------- Requets dump after renaming attributes -----------------------'
-print req.dump()
+spserver.add_provider("../../examples/idp.xml", None, None)
 
+idpserver = lasso.Server.new("../../examples/idp.xml",
+			    "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
+			    lasso.signatureMethodRsaSha1)
 
-query = req.url_encode(1, 'rsakey.pem')
-print '----------------------- Request encoded url query -----------------------'
-print query
+spserver.add_provider("../../examples/sp.xml", None, None)
 
-soap = req.soap_envelop()
-print '----------------------- Request SOAP envelopped -----------------------'
-print soap
+# users :
+spuser_dump = "<LassoUser><LassoIdentities><LassoIdentity RemoteProviderID=\"https://identity-provider:2003/liberty-alliance/metadata\"><LassoRemoteNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">LLLLLLLLLLLLLLLLLLLLLLLLL</NameIdentifier></LassoRemoteNameIdentifier></LassoIdentity></LassoIdentities></LassoUser>"
 
+spuser = lasso.User.new_from_dump(spuser_dump)
 
-res = lasso.RegisterNameIdentifierResponse.new_from_request_soap(soap, "http://providerid.com", "success")
-print '----------------------- Response from Request SOAP  -----------------------'
-print res.dump()
+idpuser_dump = "<LassoUser><LassoIdentities><LassoIdentity RemoteProviderID=\"https://service-provider:2003/liberty-alliance/metadata\"><LassoLocalNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">LLLLLLLLLLLLLLLLLLLLLLLLL</NameIdentifier></LassoLocalNameIdentifier></LassoIdentity></LassoIdentities></LassoUser>"
 
-res2 = lasso.RegisterNameIdentifierResponse.new_from_request_query(query, "http://providerid.com", "success")
-print '----------------------- Response from Request QUERY  -----------------------'
-print res.dump()
+idpuser = lasso.User.new_from_dump(idpuser_dump)
 
-query = res.url_encode(1, 'rsakey.pem')
 
-res3 = lasso.RegisterNameIdentifierResponse.new_from_query(query)
-print '----------------------- Response from QUERY  -----------------------'
-print res.dump()
-
-
-soap = res.soap_envelop()
-res3 = lasso.RegisterNameIdentifierResponse.new_from_soap(soap)
-print '----------------------- Response from SOAP  -----------------------'
-print res.dump()
+# sp register name identifier :
+print 'new registration'
+spregistration = lasso.RegisterNameIdentifier.new(spserver, spuser, lasso.providerTypeSp)
+spregistration.init_request("https://identity-provider:2003/liberty-alliance/metadata")
+#spregistration.build_request_msg()
+print 'url : ', spregistration.msg_url
+print 'body : ', spregistration.msg_body
 
 
+print 'End of registration'
 
 lasso.shutdown()
diff --git a/python/examples/user.py b/python/examples/user.py
index 7ebf8b88..ee9f8cfe 100644
--- a/python/examples/user.py
+++ b/python/examples/user.py
@@ -33,4 +33,9 @@ print "All assertions deleted\n"
 print "Dump of user environ :"
 print user.dump()
 
+user2 = lasso.User.new_from_dump(user.dump());
+
+assertion = lasso.Assertion("http://nowhere.com", "CD8CS7C6CS6CD6C6SC6SSDC6CS6D")
+user.add_assertion("https://service-provider1:2003/liberty-alliance/metadata", assertion)
+
 user.destroy()
diff --git a/python/lasso.py b/python/lasso.py
index 0e9485d1..6b2ac265 100644
--- a/python/lasso.py
+++ b/python/lasso.py
@@ -542,15 +542,10 @@ class LogoutRequest(LibLogoutRequest):
         return LogoutRequest(obj)
     new = classmethod(new)
 
-    def new_from_soap(cls, envelope):
-        obj = lassomod.logout_request_new_from_soap(envelope)
+    def new_from_export(cls, envelope):
+        obj = lassomod.logout_request_new_from_export(envelope)
         return LogoutRequest(obj)
-    new_from_soap = classmethod(new_from_soap)
-
-    def new_from_query(cls, query):
-        obj = lassomod.logout_request_new_from_query(query)
-        return LogoutRequest(obj)
-    new_from_query = classmethod(new_from_query)
+    new_from_export = classmethod(new_from_export)
 
 
 class LogoutResponse(LibLogoutResponse):
@@ -990,11 +985,11 @@ class Logout:
             return self.__dict__[name]
         if name[:2] == "__" and name[-2:] == "__" and name != "__members__":
             raise AttributeError, name
+
         ret = lassomod.logout_getattr(self, name)
-        if ret is None:
-            raise AttributeError, name
-        if name == "user":
-            ret = User(_obj=ret)
+	if ret:
+	    if name=="user":
+		ret = User(_obj=ret)
         return ret
 
     def new(cls, server, user, provider_type):
@@ -1011,7 +1006,7 @@ class Logout:
     def destroy(self):
 	pass
 
-    def init_request(self, remote_providerID):
+    def init_request(self, remote_providerID = None):
 	return lassomod.logout_init_request(self, remote_providerID);
 
     def process_request_msg(self, request_msg, request_method):
diff --git a/python/lassomod.c b/python/lassomod.c
index db0b8fcb..81c9c92c 100644
--- a/python/lassomod.c
+++ b/python/lassomod.c
@@ -152,15 +152,11 @@ static PyMethodDef lasso_methods[] = {
 
   /* py_logout_request.h */
   {"logout_request_new",                logout_request_new,                METH_VARARGS},
-  {"logout_request_new_from_soap",      logout_request_new_from_soap,      METH_VARARGS},
-  {"logout_request_new_from_query",     logout_request_new_from_query,     METH_VARARGS},
+  {"logout_request_new_from_export",    logout_request_new_from_export,    METH_VARARGS},
 
   /* py_logout_response.h */
-  {"logout_response_new_from_request_soap",  logout_response_new_from_request_soap,  METH_VARARGS},
-  {"logout_response_new_from_soap",          logout_response_new_from_soap,          METH_VARARGS},
-  {"logout_response_new_from_dump",          logout_response_new_from_dump,          METH_VARARGS},
-  {"logout_response_new_from_request_query", logout_response_new_from_request_query, METH_VARARGS},
-  {"logout_response_new_from_query",         logout_response_new_from_query,         METH_VARARGS},
+  {"logout_response_new_from_request_export",  logout_response_new_from_request_export,  METH_VARARGS},
+  {"logout_response_new_from_export",          logout_response_new_from_export,          METH_VARARGS},
 
   /* py_name_identifier_mapping_request.h */
   {"name_identifier_mapping_request_new",            name_identifier_mapping_request_new,            METH_VARARGS},
diff --git a/python/setup.py b/python/setup.py
index 9a2a215e..fc2b0269 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -184,10 +184,10 @@ extract_cflags(xmlsec1_cflags)
 extract_libs(xmlsec1_libs)
 
 # FIXME : cflags & libs for lasso
-#include_dirs.append('..')
-#library_dirs.append('../lasso/.libs')
-include_dirs.append('/usr/local/include')
-library_dirs.append('/usr/local/lib')
+include_dirs.append('..')
+library_dirs.append('../lasso/.libs')
+#include_dirs.append('/usr/local/include')
+#library_dirs.append('/usr/local/lib')
 libraries.append('lasso')
 
 em = Extension("lassomod",