entrouvert
/
lasso
16
0
Fork 0
Code Issues Pull Requests Releases Activity

[core] add a loaded_entity_ids output parameter to lasso_server_load_federation 

It allows to know which entity has been loaded from the metadata file.
It must be freed by the caller.
This commit is contained in:
Benjamin Dauvergne 2011-03-30 14:20:45 +02:00
parent a0aba29273
commit a9f9b3d9a2
6 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bindings/overrides.xml
View File

@ -172,6 +172,7 @@
<func name="lasso_provider_new_from_dump" skip="java"/>
<!-- LassoServer -->
<func name="lasso_server_get_provider" return_owner="false" />
<func name="lasso_server_load_federation" skip="perl,java" />
<!-- IdWsf -->
<arg name="abstract" rename="abstract_" language="java"/>
<func name="lasso_personal_profile_service_new_full" rename="lasso_personal_profile_server_new_personal_profile_service_full"/>

6
lasso/id-ff/server.c
View File

@ -758,6 +758,8 @@ lasso_server_get_encryption_private_key(LassoServer *server)
* on the metadata files (optional)
* @blacklisted_entity_ids:(allow-none)(element-type string): a list of EntityID which should not be
* loaded, can be NULL.
* @loaded_entity_ids:(transfer full)(element-type string)(allow-none): an output parameter for the
* list of the loaded EntityID, can be NULL.
*
* Load all the SAML 2.0 entities from @federation_file which contain a declaration for @role. If
* @trusted_roots is non-NULL, use it to check a signature on the metadata file.
@ -775,7 +777,7 @@ lasso_server_get_encryption_private_key(LassoServer *server)
*/
lasso_error_t
lasso_server_load_federation(LassoServer *server, LassoProviderRole role, const gchar *federation_metadata, const gchar
*trusted_roots, GList *blacklisted_entity_ids)
*trusted_roots, GList *blacklisted_entity_ids, GList **loaded_entity_ids)
{
xmlDoc *doc = NULL;
xmlNode *root = NULL;
@ -808,7 +810,7 @@ lasso_server_load_federation(LassoServer *server, LassoProviderRole role, const
}
/* TODO: branch to the SAML2 version of this function */
if (lasso_strisequal((char*)root->ns->href, LASSO_SAML2_METADATA_HREF)) {
lasso_check_good_rc(lasso_saml20_server_load_federation(server, role, root, blacklisted_entity_ids));
lasso_check_good_rc(lasso_saml20_server_load_federation(server, role, root, blacklisted_entity_ids, loaded_entity_ids));
} else {
/* TODO: iterate SPDescriptor and IDPDescriptor, choose which one to parse by looking at the role enum.
* */

2
lasso/id-ff/server.h
View File

@ -104,7 +104,7 @@ LASSO_EXPORT lasso_error_t lasso_server_set_encryption_private_key_with_password
const gchar *filename_or_buffer, const gchar *password);
LASSO_EXPORT lasso_error_t lasso_server_load_federation(LassoServer *server, LassoProviderRole role,
const gchar *federation_file, const gchar *trusted_roots, GList *blacklisted_entity_ids);
const gchar *federation_file, const gchar *trusted_roots, GList *blacklisted_entity_ids, GList **loaded_entity_ids);
#ifdef __cplusplus
}

12
lasso/saml-2.0/server.c
View File

@ -103,10 +103,12 @@ _lasso_test_idp_descriptor(xmlNode *node) {
}
lasso_error_t
lasso_saml20_server_load_federation(LassoServer *server, LassoProviderRole role, xmlNode *root_node, GList *blacklisted_entity_ids)
lasso_saml20_server_load_federation(LassoServer *server, LassoProviderRole role, xmlNode *root_node, GList *blacklisted_entity_ids, GList **loaded_entity_ids)
{
xmlNode *child;
lasso_error_t rc = 0;
GList loaded = { .data = NULL, .next = NULL };
GList *loaded_end = &loaded;
child = xmlSecGetNextElementNode(root_node->children);
/* first parse the providers... */
@ -134,10 +136,18 @@ lasso_saml20_server_load_federation(LassoServer *server, LassoProviderRole role,
lasso_release_gobject(provider);
goto next;
}
if (loaded_entity_ids) {
loaded_end->next = g_new0(GList, 1);
loaded_end->next->data = g_strdup(name);
loaded_end = loaded_end->next;
}
g_hash_table_insert(server->providers, name, provider);
}
next:
child = xmlSecGetNextElementNode(child->next);
}
if (loaded_entity_ids) {
*loaded_entity_ids = loaded.next;
}
return rc;
}

2
lasso/saml-2.0/serverprivate.h
View File

@ -34,7 +34,7 @@ extern "C" {
int lasso_saml20_server_load_affiliation(LassoServer *server, xmlNode *node);
lasso_error_t lasso_saml20_server_load_federation(LassoServer *server, LassoProviderRole role,
xmlNode *root_node, GList *blacklisted_entity_ids);
xmlNode *root_node, GList *blacklisted_entity_ids, GList **loaded_entity_ids);
#ifdef __cplusplus
}

8
tests/basic_tests.c
View File

@ -1945,6 +1945,7 @@ END_TEST
START_TEST(test13_test_lasso_server_load_federation)
{
LassoServer *server = NULL;
GList *loaded_entity_ids = NULL;
char *metadata_content;
GList blacklisted_1 = { .data = "https://identities.univ-jfc.fr/idp/prod", .next = NULL };
@ -1956,8 +1957,11 @@ START_TEST(test13_test_lasso_server_load_federation)
check_true(g_file_get_contents(TESTSDATADIR "/renater-metadata.xml", &metadata_content,
NULL, NULL));
check_good_rc(lasso_server_load_federation(server, LASSO_PROVIDER_ROLE_IDP,
metadata_content, TESTSDATADIR "/metadata-federation-renater.crt", &blacklisted_1));
check_true(g_hash_table_size(server->providers) == 101);
metadata_content, TESTSDATADIR "/metadata-federation-renater.crt",
&blacklisted_1, &loaded_entity_ids));
check_equals(g_hash_table_size(server->providers), 101);
check_equals(g_list_length(loaded_entity_ids), 101);
lasso_release_string(metadata_content);
lasso_release_gobject(server);
}