SAML 2.0&ID-FF 1.2: simplify and complete metadata loading for multi-role support

4 files changed, 130 insertions, 1 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 62ee098c..2d1f6f4a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,7 +20,7 @@ INCLUDES = \
 	$(CHECK_CFLAGS)
 
 
-tests_SOURCES = tests.c login_tests.c basic_tests.c random_tests.c metadata_tests.c login_tests_saml2.c $(WSF_TESTS)
+tests_SOURCES = tests.c login_tests.c basic_tests.c random_tests.c metadata_tests.c login_tests_saml2.c assertion_query_saml2.c $(WSF_TESTS)
 
 tests_LDADD = \
 	$(top_builddir)/lasso/liblasso.la \
diff --git a/tests/assertion_query_saml2.c b/tests/assertion_query_saml2.c
new file mode 100644
index 00000000..12e4b345
--- /dev/null
+++ b/tests/assertion_query_saml2.c
@@ -0,0 +1,95 @@
+/*
+ * Lasso library C unit tests
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ *
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <check.h>
+#include <glib.h>
+
+#include "../lasso/lasso.h"
+#include "../lasso/utils.h"
+#include "../lasso/backward_comp.h"
+#include "../lasso/xml/saml-2.0/saml2_xsd.h"
+
+#include "./tests.h"
+
+inline static char*
+generateIdentityProviderContextDump()
+{
+	LassoServer *serverContext;
+	GList *providers;
+	char *ret;
+
+	serverContext = lasso_server_new(
+			TESTSDATADIR "/idp6-saml2/metadata.xml",
+			TESTSDATADIR "/idp6-saml2/private-key.pem",
+			NULL, /* Secret key to unlock private key */
+			NULL);
+	lasso_server_add_provider(
+			serverContext,
+			LASSO_PROVIDER_ROLE_SP,
+			TESTSDATADIR "/sp5-saml2/metadata.xml",
+			NULL,
+			NULL);
+	providers = g_hash_table_get_values(serverContext->providers);
+	lasso_provider_set_encryption_mode(LASSO_PROVIDER(providers->data), LASSO_ENCRYPTION_MODE_ASSERTION | LASSO_ENCRYPTION_MODE_NAMEID);
+	ret = lasso_server_dump(serverContext);
+
+	g_object_unref(serverContext);
+
+	return ret;
+}
+
+inline static char*
+generateServiceProviderContextDump()
+{
+	LassoServer *serverContext;
+	char *ret;
+
+	serverContext = lasso_server_new(
+			TESTSDATADIR "/sp5-saml2/metadata.xml",
+			TESTSDATADIR "/sp5-saml2/private-key.pem",
+			NULL, /* Secret key to unlock private key */
+			NULL);
+	lasso_server_add_provider(
+			serverContext,
+			LASSO_PROVIDER_ROLE_IDP,
+			TESTSDATADIR "/idp6-saml2/metadata.xml",
+			NULL,
+			NULL);
+
+	ret = lasso_server_dump(serverContext);
+	g_object_unref(serverContext);
+	return ret;
+}
+
+Suite*
+assertion_query_suite()
+{
+	Suite *s = suite_create("Assertion Query");
+	TCase *tc_metadata_access = tcase_create("Extended metadata access");
+	suite_add_tcase(s, tc_metadata_access);
+
+	return s;
+}
diff --git a/tests/metadata_tests.c b/tests/metadata_tests.c
index 6daf31f0..c6653121 100644
--- a/tests/metadata_tests.c
+++ b/tests/metadata_tests.c
@@ -28,6 +28,9 @@
 
 #include <../lasso/lasso.h>
 #include <../lasso/id-ff/provider.h>
+#include "../lasso/utils.h"
+#include "./tests.h"
+#include "../lasso/xml/saml-2.0/saml2_xsd.h"
 
 START_TEST(test01_metadata_load_der_certificate_from_x509_cert)
 {
@@ -83,6 +86,29 @@ START_TEST(test06_metadata_load_public_key_from_rsa_keyvalue)
 }
 END_TEST
 
+START_TEST(test07_metadata_role_descriptors)
+{
+	LassoProvider *provider = (LassoProvider*)lasso_provider_new(LASSO_PROVIDER_ROLE_IDP, TESTSDATADIR "/idp6-saml2/metadata.xml",
+			NULL, NULL);
+	GList *l, *q;
+	int i = 0;
+
+	check_not_null(provider);
+	for (i = LASSO_PROVIDER_ROLE_ANY+1; i < LASSO_PROVIDER_ROLE_LAST; i++) {
+		l = lasso_provider_get_metadata_keys_for_role(provider, i);
+		lasso_foreach(q, l) {
+			printf("%i %s\n", i, (char*)q->data);
+		}
+	}
+	l = lasso_provider_get_metadata_list_for_role(provider, LASSO_PROVIDER_ROLE_IDP,
+			LASSO_SAML2_METADATA_ATTRIBUTE_WANT_AUTHN_REQUEST_SIGNED);
+	check_not_null(l);
+	check_null(l->next);
+	check_str_equals(l->data, "true");
+	lasso_release_gobject(provider);
+}
+END_TEST
+
 Suite*
 metadata_suite()
 {
@@ -99,12 +125,16 @@ metadata_suite()
 		tcase_create("Load DER public key from <ds:X509Certificate>");
 	TCase *tc_metadata_load_public_key_from_rsa_keyvalue =
 		tcase_create("Load RSAKeyValue public key");
+	TCase *tc_metadata_role_descriptors =
+		tcase_create("Lookup different role descriptors datas");
+
 	suite_add_tcase(s, tc_metadata_load_der_certificate_from_x509_cert);
 	suite_add_tcase(s, tc_metadata_load_pem_certificate_from_x509_cert);
 	suite_add_tcase(s, tc_metadata_load_der_public_key_from_keyvalue);
 	suite_add_tcase(s, tc_metadata_load_pem_public_key_from_keyvalue);
 	suite_add_tcase(s, tc_metadata_load_public_key_from_x509_cert);
 	suite_add_tcase(s, tc_metadata_load_public_key_from_rsa_keyvalue);
+	suite_add_tcase(s, tc_metadata_role_descriptors);
 	tcase_add_test(tc_metadata_load_der_certificate_from_x509_cert,
 		test01_metadata_load_der_certificate_from_x509_cert);
 	tcase_add_test(tc_metadata_load_pem_certificate_from_x509_cert,
@@ -117,5 +147,7 @@ metadata_suite()
 		test05_metadata_load_public_key_from_x509_cert);
 	tcase_add_test(tc_metadata_load_public_key_from_rsa_keyvalue,
 		test06_metadata_load_public_key_from_rsa_keyvalue);
+	tcase_add_test(tc_metadata_role_descriptors,
+			test07_metadata_role_descriptors);
 	return s;
 }
diff --git a/tests/tests.c b/tests/tests.c
index 806a6097..5217bbb8 100644
--- a/tests/tests.c
+++ b/tests/tests.c
@@ -34,6 +34,7 @@ extern Suite* login_suite();
 extern Suite* login_saml2_suite();
 extern Suite* random_suite();
 extern Suite* metadata_suite();
+extern Suite* assertion_query_suite();
 #ifdef LASSO_WSF_ENABLED
 extern Suite* idwsf2_suite();
 #endif
@@ -46,6 +47,7 @@ SuiteFunction suites[] = {
 	login_saml2_suite,
 	random_suite,
 	metadata_suite,
+	assertion_query_suite,
 #ifdef LASSO_WSF_ENABLED
 	idwsf2_suite,
 #endif