replace load_request_msg() with process_request_msg(), process_request() with validate_request(), remove assertion of the authenticated principal in validate_request()

3 files changed, 19 insertions, 14 deletions

diff --git a/python/environs/py_logout.c b/python/environs/py_logout.c
index 4038dce5..ae9ab597 100644
--- a/python/environs/py_logout.c
+++ b/python/environs/py_logout.c
@@ -174,36 +174,36 @@ PyObject *logout_init_request(PyObject *self, PyObject *args) {
   return(int_wrap(codeError));
 }
 
-PyObject *logout_load_request_msg(PyObject *self, PyObject *args){
+PyObject *logout_process_request_msg(PyObject *self, PyObject *args){
   PyObject *logout_obj;
   gchar    *request_msg;
   gint      request_method;
   gint      codeError;
 
-  if (CheckArgs(args, "OSI:logout_load_request_msg")) {
-    if(!PyArg_ParseTuple(args, (char *) "Osi:logout_load_request_msg",
+  if (CheckArgs(args, "OSI:logout_process_request_msg")) {
+    if(!PyArg_ParseTuple(args, (char *) "Osi:logout_process_request_msg",
 			 &logout_obj, &request_msg, &request_method))
       return NULL;
   }
   else return NULL;
 
-  codeError = lasso_logout_load_request_msg(LassoLogout_get(logout_obj), request_msg, request_method);
+  codeError = lasso_logout_process_request_msg(LassoLogout_get(logout_obj), request_msg, request_method);
 
   return(int_wrap(codeError));
 }
 
-PyObject *logout_process_request(PyObject *self, PyObject *args) {
+PyObject *logout_validate_request(PyObject *self, PyObject *args) {
   PyObject *logout_obj;
   gint      codeError;
 
-  if (CheckArgs(args, "O:logout_process_request")) {
-    if(!PyArg_ParseTuple(args, (char *) "O:logout_process_request",
+  if (CheckArgs(args, "O:logout_validate_request")) {
+    if(!PyArg_ParseTuple(args, (char *) "O:logout_validate_request",
 			 &logout_obj))
       return NULL;
   }
   else return NULL;
 
-  codeError = lasso_logout_process_request(LassoLogout_get(logout_obj));
+  codeError = lasso_logout_vallidate_request(LassoLogout_get(logout_obj));
 
   return(int_wrap(codeError));
 }
diff --git a/python/environs/py_logout.h b/python/environs/py_logout.h
index 7242332f..5f8501f1 100644
--- a/python/environs/py_logout.h
+++ b/python/environs/py_logout.h
@@ -46,9 +46,9 @@ PyObject *logout_build_response_msg(PyObject *self, PyObject *args);
 PyObject *logout_destroy(PyObject *self, PyObject *args);
 PyObject *logout_get_next_providerID(PyObject *self, PyObject *args);
 PyObject *logout_init_request(PyObject *self, PyObject *args);
-PyObject *logout_load_request_msg(PyObject *self, PyObject *args);
+PyObject *logout_process_request_msg(PyObject *self, PyObject *args);
 PyObject *logout_new(PyObject *self, PyObject *args);
-PyObject *logout_process_request(PyObject *self, PyObject *args);
+PyObject *logout_validate_request(PyObject *self, PyObject *args);
 PyObject *logout_process_response_msg(PyObject *self, PyObject *args);
 
 #endif /* __PYLASSO_PY_LOGOUT_H__ */
diff --git a/python/lassomod.c b/python/lassomod.c
index b80bd580..5186b7e4 100644
--- a/python/lassomod.c
+++ b/python/lassomod.c
@@ -30,6 +30,7 @@
 #include "xml/py_xml.h"
 #include "xml/py_lib_authentication_statement.h"
 #include "xml/py_lib_authn_request.h"
+#include "xml/py_lib_authn_response.h"
 #include "xml/py_lib_federation_termination_notification.h"
 #include "xml/py_lib_logout_request.h"
 #include "xml/py_lib_logout_response.h"
@@ -98,6 +99,10 @@ static PyMethodDef lasso_methods[] = {
   {"lib_authn_request_set_protocolProfile", lib_authn_request_set_protocolProfile, METH_VARARGS},
   {"lib_authn_request_set_relayState",      lib_authn_request_set_relayState,      METH_VARARGS},
 
+  /* py_lib_authn_response.h */
+  {"lib_authn_response_new",                 lib_authn_response_new,                 METH_VARARGS},
+  {"lib_authn_response_add_assertion",       lib_authn_response_add_assertion,       METH_VARARGS},
+
   /* py_lib_federation_termination_notification.h */
   {"lib_federation_termination_notification_new",         lib_federation_termination_notification_new,         METH_VARARGS},
   {"lib_federation_termination_notification_set_consent", lib_federation_termination_notification_set_consent, METH_VARARGS},
@@ -253,19 +258,19 @@ static PyMethodDef lasso_methods[] = {
   {"login_process_response_msg",        login_process_response_msg,        METH_VARARGS},
 
   /* py_logout.h */
-  {"logout_getattr", logout_getattr, METH_VARARGS},
+  {"logout_getattr",              logout_getattr,              METH_VARARGS},
   {"logout_new",                  logout_new,                  METH_VARARGS},
   {"logout_build_request_msg",    logout_build_request_msg,    METH_VARARGS},
   {"logout_build_response_msg",   logout_build_response_msg,   METH_VARARGS},
   {"logout_destroy",              logout_destroy,              METH_VARARGS},
   {"logout_get_next_providerID",  logout_get_next_providerID,  METH_VARARGS},
   {"logout_init_request",         logout_init_request,         METH_VARARGS},
-  {"logout_load_request_msg",     logout_load_request_msg,     METH_VARARGS},
-  {"logout_process_request",      logout_process_request,  METH_VARARGS},
+  {"logout_process_request_msg",  logout_process_request_msg,  METH_VARARGS},
   {"logout_process_response_msg", logout_process_response_msg, METH_VARARGS},
+  {"logout_validate_request",     logout_validate_request,     METH_VARARGS},
 
   /* py_register_name_identifier.h */
-  {"register_name_identifier_getattr", register_name_identifier_getattr, METH_VARARGS},
+  {"register_name_identifier_getattr",              register_name_identifier_getattr,              METH_VARARGS},
   {"register_name_identifier_new",                  register_name_identifier_new,                  METH_VARARGS},
   {"register_name_identifier_build_request_msg",    register_name_identifier_build_request_msg,    METH_VARARGS},
   {"register_name_identifier_build_response_msg",   register_name_identifier_build_response_msg,   METH_VARARGS},