Add environ/lasso_logout.c

3 files changed, 28 insertions, 6 deletions

diff --git a/php/environs/Makefile.am b/php/environs/Makefile.am
index dcc37073..8e2b03f8 100644
--- a/php/environs/Makefile.am
+++ b/php/environs/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = \
     $(PHP_INCLUDES) 
 
 
-ENVSOURCES = lasso_identity.c lasso_profile.c lasso_session.c lasso_federation.c lasso_login.c lasso_server.c
+ENVSOURCES = lasso_identity.c lasso_profile.c lasso_session.c lasso_federation.c lasso_login.c lasso_server.c lasso_logout.c
 
 noinst_LIBRARIES = libenvirons.a
 libenvirons_a_SOURCES = $(ENVSOURCES)
diff --git a/php/lasso.c b/php/lasso.c
index 8c275c5f..472a7362 100644
--- a/php/lasso.c
+++ b/php/lasso.c
@@ -39,6 +39,7 @@ int le_lasso;
 int le_lassonode;
 int le_lassoserver;
 int le_lassologin;
+int le_lassologout;
 int le_lassouser;
 int le_lassofederation;
 int le_lassosession;
@@ -115,6 +116,11 @@ function_entry lasso_functions[] = {
 	/* lasso_session.c */
 	PHP_FE(lasso_session_dump,	NULL)
 
+	/* lasso_logout.c */
+	PHP_FE(lasso_logout_new,	NULL)
+	PHP_FE(lasso_logout_init_request,	NULL)
+	PHP_FE(lasso_logout_build_request_msg,	NULL)
+
 	{NULL, NULL, NULL}	
 };
 /* }}} */
@@ -186,7 +192,6 @@ void lassosession_destruction_handler(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
 }
 /* }}} */
 
-
 /* {{{ */
 void lassoprofile_destruction_handler(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
 	LassoProfile *my_rsrc = (LassoProfile *) rsrc->ptr;
@@ -208,6 +213,12 @@ void lassolibauthnrequest_destruction_handler(zend_rsrc_list_entry *rsrc TSRMLS_
 }
 /* }}} */
 
+/* {{{ */
+void lassologout_destruction_handler(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
+	LassoLogout *my_rsrc = (LassoLogout *) rsrc->ptr;
+    // do_whatever_needs_to_be_done_with_the_resource(my_rsrc);
+}
+/* }}} */
 
 /* {{{ php_lasso_init_globals
  */
@@ -229,6 +240,7 @@ PHP_MINIT_FUNCTION(lasso)
 	le_lassonode = zend_register_list_destructors_ex(lassonode_destruction_handler, NULL, le_lassonode_name, module_number);
 	le_lassoserver = zend_register_list_destructors_ex(lassoserver_destruction_handler, NULL, le_lassoserver_name, module_number);
 	le_lassologin = zend_register_list_destructors_ex(lassologin_destruction_handler, NULL, le_lassologin_name, module_number);
+	le_lassologout = zend_register_list_destructors_ex(lassologout_destruction_handler, NULL, le_lassologout_name, module_number);
 	le_lassoidentity = zend_register_list_destructors_ex(lassoidentity_destruction_handler, NULL, le_lassoidentity_name, module_number);
 	le_lassosession = zend_register_list_destructors_ex(lassosession_destruction_handler, NULL, le_lassosession_name, module_number);
 	le_lassofederation = zend_register_list_destructors_ex(lassofederation_destruction_handler, NULL, le_lassofederation_name, module_number);
@@ -247,6 +259,11 @@ PHP_MINIT_FUNCTION(lasso)
 	REGISTER_LONG_CONSTANT("lassoHttpMethodPost", 2, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("lassoHttpMethodRedirect", 3, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("lassoHttpMethodSoap", 4, CONST_CS | CONST_PERSISTENT);
+
+	/* lassoProviderType */
+	REGISTER_LONG_CONSTANT("lassoProviderTypeNone", 1, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("lassoProviderTypeSp", 2, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("lassoProviderTypeIdp", 3, CONST_CS | CONST_PERSISTENT);
 		
 	return SUCCESS;
 }
@@ -331,10 +348,8 @@ PHP_FUNCTION(lasso_version)
 {
 	char lasso_version[6];
 
-	
-
-	/* snprintf(lasso_version, 6, "%d.%d.%d", LASSO_VERSION_MAJOR, 
-			LASSO_VERSION_MINOR, LASSO_VERSION_SUBMINOR); */
+	snprintf(lasso_version, 6, "%d.%d.%d", LASSO_VERSION_MAJOR, 
+			LASSO_VERSION_MINOR, LASSO_VERSION_SUBMINOR);
 
 	RETURN_STRING(lasso_version, 1)
 }
diff --git a/php/php_lasso.h b/php/php_lasso.h
index 19e5f8c7..9da89eeb 100644
--- a/php/php_lasso.h
+++ b/php/php_lasso.h
@@ -45,6 +45,7 @@ extern zend_module_entry lasso_module_entry;
 #define le_lassonode_name  "LASSO Node Resource"
 #define le_lassoserver_name  "LASSO Server Resource"
 #define le_lassologin_name  "LASSO Login Resource"
+#define le_lassologout_name  "LASSO Logout Resource"
 #define le_lassoidentity_name  "LASSO Identity Resource"
 #define le_lassosession_name  "LASSO Session Resource"
 #define le_lassofederation_name  "LASSO Federation Resource"
@@ -119,6 +120,11 @@ PHP_FUNCTION(lasso_lib_authn_request_set_relaystate);
 PHP_FUNCTION(lasso_lib_authn_request_set_protocolprofile);
 PHP_FUNCTION(lasso_lib_authn_response_set_consent);
 
+/* lasso_logout.c */
+PHP_FUNCTION(lasso_logout_new);
+PHP_FUNCTION(lasso_logout_init_request);
+PHP_FUNCTION(lasso_logout_build_request_msg);
+
 /* GLOBALS */
 ZEND_BEGIN_MODULE_GLOBALS(lasso)
 	long  global_value;
@@ -130,6 +136,7 @@ extern int le_lasso;
 extern int le_lassonode;
 extern int le_lassoserver;
 extern int le_lassologin;
+extern int le_lassologout;
 extern int le_lassoidentity;
 extern int le_lassosession;
 extern int le_lassofederation;