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

[SAMLv2] fix ordering of endpoints 

Ordering by binding is wrong, first order by isDefault (as stated in
saml-metadata-2.0.pdf) then by index.
This commit is contained in:
Benjamin Dauvergne 2010-10-05 19:34:40 +02:00
parent 3d1d90ee31
commit 06c2ec9d61
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lasso/saml-2.0/provider.c
View File

@ -145,7 +145,7 @@ load_endpoint_type2(xmlNode *xmlnode, LassoProvider *provider, LassoProviderRole
xmlChar *isDefault = getSaml2MdProp(xmlnode, LASSO_SAML2_METADATA_ATTRIBUTE_ISDEFAULT);
gboolean indexed_endpoint = FALSE;
int idx = *counter++;
gboolean is_default = FALSE;
int is_default = 0;
EndpointType *endpoint_type;
if (! binding || ! location) {
@ -158,7 +158,18 @@ load_endpoint_type2(xmlNode *xmlnode, LassoProvider *provider, LassoProviderRole
warning("Invalid AssertionConsumerService, no index set");
goto cleanup;
}
is_default = xsdIsTrue(isDefault);
/* isDefault is 0 if invalid or not present
* -1 if true (comes first)
* +1 if false (comes last)
*/
if (isDefault) {
if (xsdIsTrue(isDefault)) {
is_default = -1;
}
if (xsdIsFalse(isDefault)) {
is_default = 1;
}
}
}
endpoint_type = g_new0(EndpointType, 1);
endpoint_type->kind = g_strdup((char*)xmlnode->name);
@ -182,6 +193,13 @@ static gint
compare_endpoint_type(const EndpointType *a, const EndpointType *b) {
int c;
/* order the sequence of endpoints:
* - first by role,
* - then by profile,
* - then by isDefault attribute (truth first, then absent, then false)
* - then by index
* - then by binding
*/
if (a->role < b->role)
return -1;
if (a->role > b->role)
@ -189,12 +207,9 @@ compare_endpoint_type(const EndpointType *a, const EndpointType *b) {
c = g_strcmp0(a->kind,b->kind);
if (c != 0)
return c;
c = g_strcmp0(a->binding,b->binding);
if (c != 0)
return c;
if (a->is_default && ! b->is_default)
if (a->is_default < b->is_default)
return -1;
if (! a->is_default && b->is_default)
if (a->is_default > b->is_default)
return +1;
if (a->index < b->index)
return -1;