Added new PHP Unit test for Lasso Login and Lasso Server.

6 files changed, 95 insertions, 24 deletions

diff --git a/php/environs/lasso_login.c b/php/environs/lasso_login.c
index 3cd27382..3b0281f1 100644
--- a/php/environs/lasso_login.c
+++ b/php/environs/lasso_login.c
@@ -52,8 +52,6 @@ PHP_FUNCTION(lasso_login_new) {
 
 	ZEND_FETCH_RESOURCE(server, LassoServer *, &param, -1, le_lassoserver_name, le_lassoserver);
 	
-	zend_printf("DEBUG: server at 0x%p\n", server);
-
   	login = lasso_login_new(server);
 
 	ZEND_REGISTER_RESOURCE(return_value, login, le_lassologin);
@@ -82,8 +80,6 @@ PHP_FUNCTION(lasso_login_init_authn_request) {
 	ZEND_FETCH_RESOURCE(login, LassoLogin *, &param, -1, 
 			le_lassologin_name, le_lassologin);
 	
-	zend_printf("DEBUG: login at 0x%p\n", login);
-
 	ret = lasso_login_init_authn_request(login);
 
 	(ret) ? (RETURN_FALSE) : (RETURN_TRUE);
@@ -111,8 +107,6 @@ PHP_FUNCTION(lasso_login_destroy) {
 
 	ZEND_FETCH_RESOURCE(login, LassoLogin *, &param, -1, le_lassologin_name, le_lassologin);
 	
-	zend_printf("DEBUG: login at 0x%p\n", login);
-
 	lasso_login_destroy(login);
 
 	zend_list_delete(Z_RESVAL_PP(&param));
@@ -143,8 +137,6 @@ PHP_FUNCTION(lasso_login_new_from_dump) {
 
 	ZEND_FETCH_RESOURCE(server, LassoServer *, &parm_server, -1, le_lassoserver_name, le_lassoserver);
 	
-	zend_printf("DEBUG: server at 0x%p\n", server);
-
 
 	login = lasso_login_new_from_dump(server, dump);
 
@@ -174,8 +166,6 @@ PHP_FUNCTION(lasso_login_build_request_msg) {
 
 	ZEND_FETCH_RESOURCE(login, LassoLogin *, &parm, -1, le_lassologin_name, le_lassologin);
 	
-	zend_printf("DEBUG: login at 0x%p\n", login);
-
 	lasso_login_build_request_msg(login);
 }
 /* }}} */
@@ -204,8 +194,6 @@ PHP_FUNCTION(lasso_login_build_authn_request_msg) {
 
 	ZEND_FETCH_RESOURCE(login, LassoLogin *, &parm, -1, le_lassologin_name, le_lassologin);
 	
-	zend_printf("DEBUG: login at 0x%p\n", login);
-
 	lasso_login_build_authn_request_msg(login, remote_providerID);
 }
 /* }}} */
diff --git a/php/environs/lasso_server.c b/php/environs/lasso_server.c
index 4d370c71..4abb9d60 100644
--- a/php/environs/lasso_server.c
+++ b/php/environs/lasso_server.c
@@ -66,8 +66,6 @@ PHP_FUNCTION(lasso_server_new) {
 
 	server = lasso_server_new(sp, rsapub, rsakey, rsacert, signaturemethod);
 
-	zend_printf("DEBUG: server at 0x%p\n", server);
-
 	ZEND_REGISTER_RESOURCE(return_value, server, le_lassoserver);
 }
 /* }}} */
@@ -98,8 +96,6 @@ PHP_FUNCTION(lasso_server_add_provider) {
 
 	ZEND_FETCH_RESOURCE(server, LassoServer *, &param, -1, le_lassoserver_name, le_lassoserver);
 	
-	zend_printf("DEBUG: server at 0x%p\n", server);
-
 	lasso_server_add_provider(server, idp, a, b);
 
 
@@ -126,8 +122,6 @@ PHP_FUNCTION(lasso_server_dump) {
 
 	ZEND_FETCH_RESOURCE(server, LassoServer *, &param, -1, le_lassoserver_name, le_lassoserver);
 	
-	zend_printf("DEBUG: server at 0x%p\n", server);
-
 	server_dump = lasso_server_dump(server);
 
 	RETURN_STRING(server_dump, 1);
@@ -153,8 +147,6 @@ PHP_FUNCTION(lasso_server_destroy) {
 
 	ZEND_FETCH_RESOURCE(server, LassoServer *, &param, -1, le_lassoserver_name, le_lassoserver);
 	
-	zend_printf("DEBUG: server at 0x%p\n", server);
-
 	lasso_server_destroy(server);
 
 	zend_list_delete(Z_RESVAL_PP(&param));
diff --git a/php/php_lasso.h b/php/php_lasso.h
index 83a1e8ad..9d27f76f 100644
--- a/php/php_lasso.h
+++ b/php/php_lasso.h
@@ -76,7 +76,7 @@ PHP_FUNCTION(lasso_login_build_request_msg);
 PHP_FUNCTION(lasso_login_destroy);
 PHP_FUNCTION(lasso_login_build_authn_request_msg);
 
-/* lasso_user.c */
+/* lasso_identity.c */
 PHP_FUNCTION(lasso_identity_new);	
 PHP_FUNCTION(lasso_identity_dump);	
 PHP_FUNCTION(lasso_identity_destroy);	
diff --git a/php/tests/001.phpt b/php/tests/001.phpt
index ce898d6d..8b7bbb20 100644
--- a/php/tests/001.phpt
+++ b/php/tests/001.phpt
@@ -2,9 +2,6 @@
 Check for lasso presence
 --SKIPIF--
 <?php if (!extension_loaded("lasso")) print "skip"; ?>
---POST--
---GET--
---INI--
 --FILE--
 <?php 
 echo "lasso extension is available";
diff --git a/php/tests/lasso_login.phpt b/php/tests/lasso_login.phpt
new file mode 100644
index 00000000..785b2c21
--- /dev/null
+++ b/php/tests/lasso_login.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Check Lasso Login 
+--SKIPIF--
+<?php if (!extension_loaded("lasso")) print "skip"; ?>
+--FILE--
+<?php
+	lasso_init();
+	$server = lasso_server_new("../examples/sp.xml",
+    "../examples/rsapub.pem",
+    "../examples/rsakey.pem",
+    "../examples/sacert.pem", lassoSignatureMethodRsaSha1);
+	$login = lasso_login_new($server);
+	var_dump($login);
+	lasso_login_destroy($login);
+	var_dump($login);
+
+    lasso_shutdown();
+?>
+--EXPECT--
+DEBUG: lasso_init
+DEBUG: lasso_server_new
+DEBUG: lasso_login_new
+resource(5) of type (LASSO Login Resource)
+DEBUG: lasso_login_destroy
+resource(5) of type (Unknown)
+DEBUG: lasso_shutdown
diff --git a/php/tests/lasso_server.phpt b/php/tests/lasso_server.phpt
new file mode 100644
index 00000000..a601886d
--- /dev/null
+++ b/php/tests/lasso_server.phpt
@@ -0,0 +1,68 @@
+--TEST--
+Check Lasso Server 
+--SKIPIF--
+<?php if (!extension_loaded("lasso")) print "skip"; ?>
+--FILE--
+<?php
+	lasso_init();
+    $server = lasso_server_new("../examples/sp.xml",
+    "../examples/rsapub.pem",
+    "../examples/rsakey.pem",
+    "../examples/sacert.pem", lassoSignatureMethodRsaSha1);
+    var_dump($server);
+
+    lasso_server_add_provider($server, "../examples/idp.xml", "", "");
+
+    $dump = lasso_server_dump($server);
+
+    print $dump . "\n";
+
+	$new_server = lasso_server_new_from_dump($dump);
+
+	var_dump($new_server);
+
+	lasso_server_destroy($server);
+
+	var_dump($server);
+
+    lasso_shutdown();
+
+?>
+--EXPECT--
+DEBUG: lasso_init
+DEBUG: lasso_server_new
+resource(4) of type (LASSO Server Resource)
+DEBUG: lasso_server_add_provider
+DEBUG: lasso_server_dump
+<LassoServer SignatureMethod="1" ProviderID="https://service-provider:2003/liberty-alliance/metadata" PrivateKey="../examples/rsakey.pem" Certificate="../examples/sacert.pem" PublicKey="../examples/rsapub.pem"><EntityDescriptor xmlns="urn:liberty:metadata:2003-08" ProviderID="https://service-provider:2003/liberty-alliance/metadata">
+ <SPDescriptor>
+
+  <FederationTerminationServiceURL>https://service-provider:2003/liberty-alliance/singleLogout</FederationTerminationServiceURL>
+  <FederationTerminationProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</FederationTerminationProtocolProfile>
+
+  <SingleLogoutServiceURL>https://service-provider:2003/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
+  <RegisterNameIdentifierServiceURL>https://service-provider:2003/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <SoapEndpoint>https://service-provider:2003/liberty-alliance/soapEndpoint</SoapEndpoint>
+  <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://service-provider:2003/liberty-alliance/assertionConsumer</AssertionConsumerServiceURL>
+  <AuthnRequestsSigned>true</AuthnRequestsSigned>
+</SPDescriptor>
+</EntityDescriptor><LassoProviders><LassoProvider PublicKey="" CaCertificate=""><EntityDescriptor xmlns="urn:liberty:metadata:2003-08" ProviderID="https://identity-provider:2003/liberty-alliance/metadata">
+ <IDPDescriptor>
+  <FederationTerminationServiceURL>https://identity-provider:2003/liberty-alliance/federationTermination</FederationTerminationServiceURL>
+  <FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</FederationTerminationNotificationProtocolProfile>
+  <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/sso-get</SingleSignOnProtocolProfile>
+  <SingleSignOnServiceURL>http://identity-provider:2002/sso</SingleSignOnServiceURL>
+  <SingleLogoutServiceURL>https://identity-provider:2003/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-idp-soap</RegisterNameIdentifierProtocolProfile>
+  <RegisterNameIdentifierServiceURL>https://identity-provider:2003/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <SoapEndpoint>https://identity-provider:2003/liberty-alliance/soapEndpoint</SoapEndpoint>
+</IDPDescriptor>
+</EntityDescriptor></LassoProvider></LassoProviders></LassoServer>
+DEBUG: lasso_server_new_from_dump
+resource(5) of type (LASSO Server Resource)
+DEBUG: lasso_server_destroy
+resource(4) of type (Unknown)
+DEBUG: lasso_shutdown