entrouvert
/
modmellon
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix handling of attribute values 

AttributeValue->any can contain any number of MiscTextNode nodes and
MiscTextNode can contain more than text (any XML content). It contains
just text if its property textChild holds TRUE.

The following patch check there is only one MiscTextNode node and that
it is really a text node. In all other cases it reports the fulle value
of the AttributeValue node in the log.
This commit is contained in:
Benjamin Dauvergne 2015-04-04 10:45:02 +02:00
parent 4b4c63e97e
commit d8f39d6867
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
auth_mellon_handler.c
View File

@ -1667,14 +1667,26 @@ static int add_attributes(am_cache_entry_t *session, request_rec *r,
continue;
}
/* Verify that this is a LassoMiscTextNode object. */
if(!LASSO_IS_MISC_TEXT_NODE(value->any->data)) {
/* Verify there is only one node */
if (value->any->next != NULL) {
char *dump = lasso_node_dump(LASSO_NODE(value));
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
"AttributeValue element contained an "
" element which wasn't a text node.");
"AttributeValue element contained more "
"than one node: %s", dump);
g_free(dump);
continue;
}
/* Verify that this is a LassoMiscTextNode object. */
if(!LASSO_IS_MISC_TEXT_NODE(value->any->data) ||
!LASSO_MISC_TEXT_NODE(value->any->data)->text_child) {
char *dump = lasso_node_dump(LASSO_NODE(value));
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
"AttributeValue element contained an "
" element which wasn't a text node: %s",
dump);
g_free(dump);
continue;
}
value_text = LASSO_MISC_TEXT_NODE(value->any->data);