update of federation termination

1 files changed, 26 insertions, 25 deletions

diff --git a/python/examples/defederation.py b/python/examples/defederation.py
index 22263738..b97a6c3e 100644
--- a/python/examples/defederation.py
+++ b/python/examples/defederation.py
@@ -4,45 +4,46 @@ import sys
 sys.path.insert(0, '../')
 import lasso
 
+
+spuser_dump = "<LassoUser><LassoIdentities><LassoIdentity RemoteProviderID=\"https://identity-provider:2003/liberty-alliance/metadata\"><LassoRemoteNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">1111111111111111111111111</NameIdentifier></LassoRemoteNameIdentifier></LassoIdentity></LassoIdentities></LassoUser>"
+
+idpuser_dump = "<LassoUser><LassoIdentities><LassoIdentity RemoteProviderID=\"https://service-provider:2003/liberty-alliance/metadata\"><LassoLocalNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">1111111111111111111111111</NameIdentifier></LassoLocalNameIdentifier></LassoIdentity></LassoIdentities></LassoUser>"
+
 lasso.init()
 
-# servers :
+# SP :
 spserver = lasso.Server.new("../../examples/sp.xml",
-    "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
-    lasso.signatureMethodRsaSha1)
+                            "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
+                            lasso.signatureMethodRsaSha1)
 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)
-spserver.add_provider("../../examples/sp.xml", None, None)
-
-
-# users :
-spuser_dump = "<LassoUser><LassoIdentities><LassoIdentity RemoteProviderID=\"https://identity-provider:2003/liberty-alliance/metadata\"><LassoRemoteNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">1111111111111111111111111</NameIdentifier></LassoRemoteNameIdentifier><LassoLocalNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">222222222222222222222</NameIdentifier></LassoLocalNameIdentifier></LassoIdentity></LassoIdentities></LassoUser>"
 spuser = lasso.User.new_from_dump(spuser_dump)
 
-idpuser_dump = "<LassoUser><LassoIdentities><LassoIdentity RemoteProviderID=\"https://service-provider:2003/liberty-alliance/metadata\"><LassoLocalNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">1111111111111111111111111</NameIdentifier></LassoLocalNameIdentifier><LassoRemoteNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">222222222222222222222</NameIdentifier></LassoRemoteNameIdentifier></LassoIdentity></LassoIdentities></LassoUser>"
-idpuser = lasso.User.new_from_dump(idpuser_dump)
-
-
-# sp federation termination :
-spdefederation = lasso.FederationTermination.new(spserver, spuser, lasso.providerTypeSp)
+spdefederation = lasso.FederationTermination.new(spserver, lasso.providerTypeSp)
+spdefederation.set_user_from_dump(spuser_dump)
 spdefederation.init_notification()
 spdefederation.build_notification_msg()
 print 'url : ', spdefederation.msg_url
 print 'body : ', spdefederation.msg_body
 
-print lasso.get_request_type_from_soap_msg(spdefederation.msg_body)
+notification_msg = spdefederation.msg_body
+
+
+# IDP :
+idpserver = lasso.Server.new("../../examples/idp.xml",
+                            "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
+                            lasso.signatureMethodRsaSha1)
+idpserver.add_provider("../../examples/sp.xml", None, None)
+
+idpuser = lasso.User.new_from_dump(idpuser_dump)
 
+idpdefederation = lasso.FederationTermination.new(idpserver, lasso.providerTypeIdp)
+idpdefederation.load_notification_msg(notification_msg, lasso.httpMethodSoap)
+print 'NameIdentifier :', idpdefederation.nameIdentifier
 
-# idp federation termination :
-print "---------------------------------------------------------"
-print " At identity provider "
-idpdefederation = lasso.FederationTermination.new(idpserver, idpuser, lasso.providerTypeIdp)
-idpdefederation.process_notification_msg(spdefederation.msg_body, lasso.httpMethodSoap)
+idpdefederation.set_user_from_dump(idpuser_dump);
+idpdefederation.process_notification()
 
-print 'Only return an HTTP OK 200 to the notifier'
-print 'End of federation termination'
+print 'End of federation termination notification'
 
 lasso.shutdown()