From ed9c981989f007a124dc22dcde28284395053764 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 16 Dec 2011 09:59:40 +0100 Subject: [PATCH] [xml] complete missing namespace declarations for child nodes To allow lasso_node_impl_init_from_xmlnode to do proper namespace checking, child node which are not of the same namespace as their parent in their XSD schema must have an explicit namespace declared in the XmlSnippet. --- lasso/xml/disco_encrypted_resource_id.c | 6 ++++-- lasso/xml/id-wsf-2.0/disco_endpoint_context.c | 3 ++- lasso/xml/id-wsf-2.0/disco_keys.c | 3 ++- lasso/xml/id-wsf-2.0/disco_query_response.c | 4 ++-- lasso/xml/id-wsf-2.0/disco_security_context.c | 3 ++- .../disco_svc_md_association_add_response.c | 2 +- .../disco_svc_md_association_delete_response.c | 2 +- .../disco_svc_md_association_query_response.c | 2 +- .../xml/id-wsf-2.0/disco_svc_md_delete_response.c | 2 +- .../xml/id-wsf-2.0/disco_svc_md_query_response.c | 2 +- .../id-wsf-2.0/disco_svc_md_register_response.c | 2 +- .../id-wsf-2.0/disco_svc_md_replace_response.c | 2 +- lasso/xml/id-wsf-2.0/dst_request.c | 2 +- lasso/xml/id-wsf-2.0/dstref_query_response.c | 3 ++- .../id-wsf-2.0/ims_identity_mapping_response.c | 2 +- lasso/xml/id-wsf-2.0/ims_mapping_input.c | 6 ++++-- lasso/xml/id-wsf-2.0/ims_mapping_output.c | 2 +- lasso/xml/id-wsf-2.0/is_interaction_request.c | 2 +- lasso/xml/id-wsf-2.0/is_interaction_response.c | 2 +- lasso/xml/id-wsf-2.0/is_interaction_statement.c | 2 +- lasso/xml/id-wsf-2.0/ps_add_entity_request.c | 3 ++- .../xml/id-wsf-2.0/ps_add_known_entity_request.c | 6 ++++-- lasso/xml/id-wsf-2.0/ps_response_abstract.c | 2 +- lasso/xml/id-wsf-2.0/ps_test_membership_request.c | 3 ++- lasso/xml/id-wsf-2.0/sb2_credentials_context.c | 2 +- .../xml/id-wsf-2.0/sec_transited_provider_path.c | 3 ++- lasso/xml/id-wsf-2.0/subs_notification.c | 2 +- lasso/xml/id-wsf-2.0/subs_subscription.c | 2 +- lasso/xml/id-wsf-2.0/subsref_query_response.c | 2 +- lasso/xml/is_interaction_request.c | 10 ++++++---- lasso/xml/is_interaction_statement.c | 5 +++-- .../xml/lib_federation_termination_notification.c | 12 ++++++++---- lasso/xml/lib_logout_request.c | 3 ++- lasso/xml/lib_name_identifier_mapping_request.c | 3 ++- lasso/xml/lib_name_identifier_mapping_response.c | 6 ++++-- lasso/xml/lib_register_name_identifier_request.c | 15 +++++++++------ lasso/xml/lib_status_response.c | 3 ++- lasso/xml/lib_subject.c | 5 +++-- lasso/xml/sa_sasl_request.c | 3 ++- lasso/xml/sa_sasl_response.c | 3 ++- lasso/xml/saml-2.0/saml2_assertion.c | 2 +- lasso/xml/saml-2.0/saml2_attribute_value.c | 10 +++++++++- lasso/xml/saml-2.0/saml2_encrypted_element.c | 6 ++++-- .../saml-2.0/saml2_subject_confirmation_data.c | 2 +- lasso/xml/saml-2.0/samlp2_assertion_id_request.c | 3 ++- lasso/xml/saml-2.0/samlp2_attribute_query.c | 3 ++- lasso/xml/saml-2.0/samlp2_authn_request.c | 6 ++++-- lasso/xml/saml-2.0/samlp2_authz_decision_query.c | 8 ++++---- lasso/xml/saml-2.0/samlp2_logout_request.c | 15 ++++++++------- .../xml/saml-2.0/samlp2_manage_name_id_request.c | 10 +++++----- .../xml/saml-2.0/samlp2_name_id_mapping_request.c | 14 +++++++------- .../saml-2.0/samlp2_name_id_mapping_response.c | 10 +++++----- lasso/xml/saml-2.0/samlp2_request_abstract.c | 7 +++---- lasso/xml/saml-2.0/samlp2_response.c | 9 +++++---- lasso/xml/saml-2.0/samlp2_status_response.c | 5 +++-- .../xml/saml-2.0/samlp2_subject_query_abstract.c | 4 ++-- lasso/xml/saml_assertion.c | 2 +- lasso/xml/saml_subject_confirmation.c | 3 ++- lasso/xml/samlp_request_abstract.c | 2 +- lasso/xml/samlp_response.c | 3 ++- lasso/xml/samlp_response_abstract.c | 3 ++- lasso/xml/soap-1.1/soap_body.c | 5 ++++- lasso/xml/soap_binding_ext_credentials_context.c | 3 ++- 63 files changed, 168 insertions(+), 114 deletions(-) diff --git a/lasso/xml/disco_encrypted_resource_id.c b/lasso/xml/disco_encrypted_resource_id.c index 025a951c..e38e476d 100644 --- a/lasso/xml/disco_encrypted_resource_id.c +++ b/lasso/xml/disco_encrypted_resource_id.c @@ -50,9 +50,11 @@ static struct XmlSnippet schema_snippets[] = { { "EncryptedData", SNIPPET_XMLNODE, - G_STRUCT_OFFSET(LassoDiscoEncryptedResourceID, EncryptedData), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoDiscoEncryptedResourceID, EncryptedData), NULL, + LASSO_XMLENC_PREFIX, LASSO_XMLENC_HREF}, { "EncryptedKey", SNIPPET_LIST_XMLNODES, - G_STRUCT_OFFSET(LassoDiscoEncryptedResourceID, EncryptedKey), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoDiscoEncryptedResourceID, EncryptedKey), NULL, + LASSO_XMLENC_PREFIX, LASSO_XMLENC_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c index ed6aa27c..09f40337 100644 --- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c +++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c @@ -56,7 +56,8 @@ static struct XmlSnippet schema_snippets[] = { { "Address", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Address), NULL, NULL, NULL}, { "Framework", SNIPPET_LIST_NODES, - G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Framework), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Framework), NULL, + LASSO_IDWSF2_SBF_PREFIX, LASSO_IDWSF2_SBF_HREF}, { "SecurityMechID", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, SecurityMechID), NULL, NULL, NULL}, { "Action", SNIPPET_LIST_CONTENT, diff --git a/lasso/xml/id-wsf-2.0/disco_keys.c b/lasso/xml/id-wsf-2.0/disco_keys.c index 2f809a06..ba69fc60 100644 --- a/lasso/xml/id-wsf-2.0/disco_keys.c +++ b/lasso/xml/id-wsf-2.0/disco_keys.c @@ -51,7 +51,8 @@ static struct XmlSnippet schema_snippets[] = { { "KeyDescriptor", SNIPPET_LIST_NODES, - G_STRUCT_OFFSET(LassoIdWsf2DiscoKeys, KeyDescriptor), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIdWsf2DiscoKeys, KeyDescriptor), NULL, LASSO_METADATA_PREFIX, + LASSO_METADATA_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/id-wsf-2.0/disco_query_response.c b/lasso/xml/id-wsf-2.0/disco_query_response.c index 7c6d50ae..0faad04f 100644 --- a/lasso/xml/id-wsf-2.0/disco_query_response.c +++ b/lasso/xml/id-wsf-2.0/disco_query_response.c @@ -55,10 +55,10 @@ static struct XmlSnippet schema_snippets[] = { { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2DiscoQueryResponse, Status), - "LassoIdWsf2UtilStatus", NULL, NULL }, + "LassoIdWsf2UtilStatus", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_DISCOVERY_HREF}, { "EndpointReference", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIdWsf2DiscoQueryResponse, EndpointReference), - "LassoWsAddrEndpointReference", NULL, NULL }, + "LassoWsAddrEndpointReference", LASSO_WSA_PREFIX, LASSO_WSA_HREF}, { "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY, G_STRUCT_OFFSET(LassoIdWsf2DiscoQueryResponse, attributes), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/id-wsf-2.0/disco_security_context.c b/lasso/xml/id-wsf-2.0/disco_security_context.c index 1a7f3829..66690cb4 100644 --- a/lasso/xml/id-wsf-2.0/disco_security_context.c +++ b/lasso/xml/id-wsf-2.0/disco_security_context.c @@ -59,7 +59,8 @@ static struct XmlSnippet schema_snippets[] = { { "SecurityMechID", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoIdWsf2DiscoSecurityContext, SecurityMechID), NULL, NULL, NULL}, { "Token", SNIPPET_LIST_NODES, - G_STRUCT_OFFSET(LassoIdWsf2DiscoSecurityContext, Token), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIdWsf2DiscoSecurityContext, Token), NULL, + LASSO_IDWSF2_SEC_PREFIX, LASSO_IDWSF2_SEC_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c index 41407a56..bdf9a298 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c @@ -51,7 +51,7 @@ static struct XmlSnippet schema_snippets[] = { { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationAddResponse, Status), - "LassoIdWsf2UtilStatus", NULL, NULL }, + "LassoIdWsf2UtilStatus", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, { "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationAddResponse, attributes), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c index c82ba12b..0e976c8d 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c @@ -51,7 +51,7 @@ static struct XmlSnippet schema_snippets[] = { { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationDeleteResponse, Status), - "LassoIdWsf2UtilStatus", NULL, NULL }, + "LassoIdWsf2UtilStatus", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, { "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationDeleteResponse, attributes), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c index c38f9cf2..8230ce7a 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c @@ -52,7 +52,7 @@ static struct XmlSnippet schema_snippets[] = { { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQueryResponse, Status), - "LassoIdWsf2UtilStatus", NULL, NULL }, + "LassoIdWsf2UtilStatus", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, { "SvcMDID", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQueryResponse, SvcMDID), NULL, NULL, NULL}, { "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY, diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c index 9e9e52ec..e1bd2469 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c @@ -51,7 +51,7 @@ static struct XmlSnippet schema_snippets[] = { { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDDeleteResponse, Status), - "LassoIdWsf2UtilStatus", NULL, NULL }, + "LassoIdWsf2UtilStatus", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, { "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDDeleteResponse, attributes), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c index e09d9dd9..9757f7e5 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c @@ -52,7 +52,7 @@ static struct XmlSnippet schema_snippets[] = { { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQueryResponse, Status), - "LassoIdWsf2UtilStatus", NULL, NULL }, + "LassoIdWsf2UtilStatus", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, { "SvcMD", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQueryResponse, SvcMD), "LassoIdWsf2DiscoSvcMetadata", NULL, NULL }, diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c index 3f4b8a7e..5bde5287 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c @@ -55,7 +55,7 @@ static struct XmlSnippet schema_snippets[] = { { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegisterResponse, Status), - "LassoIdWsf2UtilStatus", NULL, NULL }, + "LassoIdWsf2UtilStatus", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_PREFIX}, { "SvcMDID", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegisterResponse, SvcMDID), NULL, NULL, NULL}, { "Keys", SNIPPET_LIST_NODES, diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c index 24aa97dc..d1a8acf0 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c @@ -51,7 +51,7 @@ static struct XmlSnippet schema_snippets[] = { { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDReplaceResponse, Status), - "LassoIdWsf2UtilStatus", NULL, NULL }, + "LassoIdWsf2UtilStatus", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, { "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY, G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDReplaceResponse, attributes), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/id-wsf-2.0/dst_request.c b/lasso/xml/id-wsf-2.0/dst_request.c index 6980dd0b..2419c471 100644 --- a/lasso/xml/id-wsf-2.0/dst_request.c +++ b/lasso/xml/id-wsf-2.0/dst_request.c @@ -52,7 +52,7 @@ static struct XmlSnippet schema_snippets[] = { { "Extension", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIdWsf2DstRequest, Extension), - "LassoIdWsf2Utilextension", NULL, NULL }, + "LassoIdWsf2Utilextension", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, { "itemID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL, G_STRUCT_OFFSET(LassoIdWsf2DstRequest, itemID), NULL, NULL, NULL}, { "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY, diff --git a/lasso/xml/id-wsf-2.0/dstref_query_response.c b/lasso/xml/id-wsf-2.0/dstref_query_response.c index 26eb0e75..81bfc378 100644 --- a/lasso/xml/id-wsf-2.0/dstref_query_response.c +++ b/lasso/xml/id-wsf-2.0/dstref_query_response.c @@ -54,7 +54,8 @@ static struct XmlSnippet schema_snippets[] = { { "TestResult", SNIPPET_LIST_NODES, - G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryResponse, TestResult), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryResponse, TestResult), NULL, + LASSO_IDWSF2_DST_PREFIX, LASSO_IDWSF2_DST_HREF}, { "Data", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryResponse, Data), "LassoIdWsf2DstRefData", NULL, NULL }, diff --git a/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c index 5393ff2c..1033498f 100644 --- a/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c +++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c @@ -52,7 +52,7 @@ static struct XmlSnippet schema_snippets[] = { { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingResponse, Status), - "LassoIdWsf2UtilStatus", NULL, NULL }, + "LassoIdWsf2UtilStatus", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, { "MappingOutput", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingResponse, MappingOutput), NULL, NULL, NULL}, { "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY, diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_input.c b/lasso/xml/id-wsf-2.0/ims_mapping_input.c index d32b9ea6..3cd46d93 100644 --- a/lasso/xml/id-wsf-2.0/ims_mapping_input.c +++ b/lasso/xml/id-wsf-2.0/ims_mapping_input.c @@ -51,9 +51,11 @@ static struct XmlSnippet schema_snippets[] = { { "TokenPolicy", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, TokenPolicy), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, TokenPolicy), NULL, + LASSO_IDWSF2_SEC_PREFIX, LASSO_IDWSF2_SEC_HREF}, { "Token", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, Token), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, Token), NULL, LASSO_IDWSF2_SEC_PREFIX, + LASSO_IDWSF2_SEC_HREF}, { "reqID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL, G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, reqID), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_output.c b/lasso/xml/id-wsf-2.0/ims_mapping_output.c index 22c533e9..a2b2b71f 100644 --- a/lasso/xml/id-wsf-2.0/ims_mapping_output.c +++ b/lasso/xml/id-wsf-2.0/ims_mapping_output.c @@ -50,7 +50,7 @@ static struct XmlSnippet schema_snippets[] = { { "Token", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoIdWsf2ImsMappingOutput, Token), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIdWsf2ImsMappingOutput, Token), NULL, LASSO_IDWSF2_SEC_PREFIX, LASSO_IDWSF2_SEC_HREF}, { "reqRef", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL, G_STRUCT_OFFSET(LassoIdWsf2ImsMappingOutput, reqRef), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/id-wsf-2.0/is_interaction_request.c b/lasso/xml/id-wsf-2.0/is_interaction_request.c index 26236aef..e79abb48 100644 --- a/lasso/xml/id-wsf-2.0/is_interaction_request.c +++ b/lasso/xml/id-wsf-2.0/is_interaction_request.c @@ -56,7 +56,7 @@ static struct XmlSnippet schema_snippets[] = { { "Inquiry", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, Inquiry), NULL, NULL, NULL}, { "KeyInfo", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, KeyInfo), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, KeyInfo), NULL, LASSO_DS_PREFIX, LASSO_DS_HREF}, { "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL, G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, id), NULL, NULL, NULL}, { "language", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL, diff --git a/lasso/xml/id-wsf-2.0/is_interaction_response.c b/lasso/xml/id-wsf-2.0/is_interaction_response.c index 2158fdd6..20f561b9 100644 --- a/lasso/xml/id-wsf-2.0/is_interaction_response.c +++ b/lasso/xml/id-wsf-2.0/is_interaction_response.c @@ -55,7 +55,7 @@ static struct XmlSnippet schema_snippets[] = { { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2IsInteractionResponse, Status), - "LassoIdWsf2UtilStatus", NULL, NULL }, + "LassoIdWsf2UtilStatus", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, { "InteractionStatement", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIdWsf2IsInteractionResponse, InteractionStatement), NULL, NULL, NULL}, { "Parameter", SNIPPET_LIST_NODES, diff --git a/lasso/xml/id-wsf-2.0/is_interaction_statement.c b/lasso/xml/id-wsf-2.0/is_interaction_statement.c index 3142b882..2fdd2da3 100644 --- a/lasso/xml/id-wsf-2.0/is_interaction_statement.c +++ b/lasso/xml/id-wsf-2.0/is_interaction_statement.c @@ -55,7 +55,7 @@ static struct XmlSnippet schema_snippets[] = { { "Inquiry", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, Inquiry), NULL, NULL, NULL}, - { "Signature", SNIPPET_SIGNATURE, 0, NULL, NULL, NULL }, + { "Signature", SNIPPET_SIGNATURE, 0, NULL, LASSO_DS_PREFIX, LASSO_DS_HREF }, /* hidden fields; used in lasso dumps */ { "SignType", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP, diff --git a/lasso/xml/id-wsf-2.0/ps_add_entity_request.c b/lasso/xml/id-wsf-2.0/ps_add_entity_request.c index a6d4f5ee..3fe7aae4 100644 --- a/lasso/xml/id-wsf-2.0/ps_add_entity_request.c +++ b/lasso/xml/id-wsf-2.0/ps_add_entity_request.c @@ -65,7 +65,8 @@ static struct XmlSnippet schema_snippets[] = { { "Subscription", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, Subscription), NULL, NULL, NULL}, { "TokenPolicy", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, TokenPolicy), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, TokenPolicy), NULL, + LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c index 3b651508..12cff94a 100644 --- a/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c +++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c @@ -59,13 +59,15 @@ static struct XmlSnippet schema_snippets[] = { { "Object", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, Object), NULL, NULL, NULL}, { "Token", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, Token), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, Token), NULL, + LASSO_IDWSF2_SEC_PREFIX, LASSO_IDWSF2_SEC_HREF}, { "CreatePSObject", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, CreatePSObject), NULL, NULL, NULL}, { "Subscription", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, Subscription), NULL, NULL, NULL}, { "TokenPolicy", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, TokenPolicy), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, TokenPolicy), NULL, + LASSO_IDWSF2_SEC_PREFIX, LASSO_IDWSF2_SEC_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/id-wsf-2.0/ps_response_abstract.c b/lasso/xml/id-wsf-2.0/ps_response_abstract.c index 6baa41f9..da617268 100644 --- a/lasso/xml/id-wsf-2.0/ps_response_abstract.c +++ b/lasso/xml/id-wsf-2.0/ps_response_abstract.c @@ -51,7 +51,7 @@ static struct XmlSnippet schema_snippets[] = { { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2PsResponseAbstract, Status), - "LassoIdWsf2UtilStatus", NULL, NULL }, + "LassoIdWsf2UtilStatus", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, { "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY, G_STRUCT_OFFSET(LassoIdWsf2PsResponseAbstract, attributes), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/id-wsf-2.0/ps_test_membership_request.c b/lasso/xml/id-wsf-2.0/ps_test_membership_request.c index d458b50d..10d6ef67 100644 --- a/lasso/xml/id-wsf-2.0/ps_test_membership_request.c +++ b/lasso/xml/id-wsf-2.0/ps_test_membership_request.c @@ -57,7 +57,8 @@ static struct XmlSnippet schema_snippets[] = { { "TargetObjectID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipRequest, TargetObjectID), NULL, NULL, NULL}, { "Token", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipRequest, Token), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipRequest, Token), NULL, + LASSO_IDWSF2_SEC_PREFIX, LASSO_IDWSF2_SEC_TOKEN}, { "Subscription", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipRequest, Subscription), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/id-wsf-2.0/sb2_credentials_context.c b/lasso/xml/id-wsf-2.0/sb2_credentials_context.c index 907cf1f2..6100295c 100644 --- a/lasso/xml/id-wsf-2.0/sb2_credentials_context.c +++ b/lasso/xml/id-wsf-2.0/sb2_credentials_context.c @@ -52,7 +52,7 @@ static struct XmlSnippet schema_snippets[] = { { "RequestedAuthnContext", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2Sb2CredentialsContext, RequestedAuthnContext), - "LassoSamlp2RequestedAuthnContext", NULL, NULL }, + "LassoSamlp2RequestedAuthnContext", LASSO_SAML_PROTOCOL_PREFIX, LASSO_SAML_PROTOCOL_HREF}, { "SecurityMechID", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoIdWsf2Sb2CredentialsContext, SecurityMechID), NULL, NULL, NULL}, { "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY, diff --git a/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c index 0c689d46..a51763d8 100644 --- a/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c +++ b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c @@ -50,7 +50,8 @@ static struct XmlSnippet schema_snippets[] = { { "TransitedProvider", SNIPPET_LIST_NODES, - G_STRUCT_OFFSET(LassoIdWsf2SecTransitedProviderPath, TransitedProvider), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIdWsf2SecTransitedProviderPath, TransitedProvider), NULL, + LASSO_IDWSF2_SEC_PREFIX, LASSO_IDWSF2_SEC_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/id-wsf-2.0/subs_notification.c b/lasso/xml/id-wsf-2.0/subs_notification.c index 60b14d25..459856ca 100644 --- a/lasso/xml/id-wsf-2.0/subs_notification.c +++ b/lasso/xml/id-wsf-2.0/subs_notification.c @@ -54,7 +54,7 @@ static struct XmlSnippet schema_snippets[] = { { "TestResult", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, TestResult), - "LassoIdWsf2UtilTestResult", NULL, NULL }, + "LassoIdWsf2UtilTestResult", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, { "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL, G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, id), NULL, NULL, NULL}, { "subscriptionID", SNIPPET_ATTRIBUTE, diff --git a/lasso/xml/id-wsf-2.0/subs_subscription.c b/lasso/xml/id-wsf-2.0/subs_subscription.c index 89f0a79a..bdb87de8 100644 --- a/lasso/xml/id-wsf-2.0/subs_subscription.c +++ b/lasso/xml/id-wsf-2.0/subs_subscription.c @@ -68,7 +68,7 @@ static struct XmlSnippet schema_snippets[] = { G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, RefItem), NULL, NULL, NULL}, { "Extension", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, Extension), - "LassoIdWsf2Utilextension", NULL, NULL }, + "LassoIdWsf2Utilextension", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, { "subscriptionID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, subscriptionID), NULL, NULL, NULL}, { "notifyToRef", SNIPPET_ATTRIBUTE, diff --git a/lasso/xml/id-wsf-2.0/subsref_query_response.c b/lasso/xml/id-wsf-2.0/subsref_query_response.c index 9c25c176..741a946e 100644 --- a/lasso/xml/id-wsf-2.0/subsref_query_response.c +++ b/lasso/xml/id-wsf-2.0/subsref_query_response.c @@ -55,7 +55,7 @@ static struct XmlSnippet schema_snippets[] = { { "TestResult", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryResponse, TestResult), - "LassoIdWsf2UtilTestResult", NULL, NULL }, + "LassoIdWsf2UtilTestResult", LASSO_IDWSF2_UTIL_PREFIX, LASSO_IDWSF2_UTIL_HREF}, { "Data", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryResponse, Data), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/is_interaction_request.c b/lasso/xml/is_interaction_request.c index 55cd40f7..92037d9a 100644 --- a/lasso/xml/is_interaction_request.c +++ b/lasso/xml/is_interaction_request.c @@ -55,15 +55,17 @@ static struct XmlSnippet schema_snippets[] = { { "ResourceID", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoIsInteractionRequest, ResourceID), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIsInteractionRequest, ResourceID), NULL, + LASSO_DISCO_PREFIX, LASSO_DISCO_HREF}, { "EncryptedResourceID", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoIsInteractionRequest, EncryptedResourceID), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoIsInteractionRequest, EncryptedResourceID), NULL, + LASSO_DISCO_PREFIX, LASSO_DISCO_HREF}, { "Inquiry", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIsInteractionRequest, Inquiry), NULL, NULL, NULL}, /* TODO : KeyInfo */ - { "id", SNIPPET_ATTRIBUTE, + { "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL, G_STRUCT_OFFSET(LassoIsInteractionRequest, id), NULL, NULL, NULL}, - { "language", SNIPPET_ATTRIBUTE, + { "language", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL, G_STRUCT_OFFSET(LassoIsInteractionRequest, language), NULL, NULL, NULL}, { "maxInteractTime", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL, G_STRUCT_OFFSET(LassoIsInteractionRequest, maxInteractTime), NULL, NULL, NULL}, diff --git a/lasso/xml/is_interaction_statement.c b/lasso/xml/is_interaction_statement.c index 1defe3db..a89f7736 100644 --- a/lasso/xml/is_interaction_statement.c +++ b/lasso/xml/is_interaction_statement.c @@ -49,8 +49,9 @@ /*****************************************************************************/ static struct XmlSnippet schema_snippets[] = { - { "Inquiry", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIsInteractionStatement, Inquiry), NULL, NULL, NULL}, - /* TODO : Signature */ + { "Inquiry", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIsInteractionStatement, Inquiry), NULL, + NULL, NULL}, + { "Signature", SNIPPET_SIGNATURE, 0, NULL, LASSO_DS_PREFIX, LASSO_DS_HREF }, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/lib_federation_termination_notification.c b/lasso/xml/lib_federation_termination_notification.c index 4758921a..8a8fcb4e 100644 --- a/lasso/xml/lib_federation_termination_notification.c +++ b/lasso/xml/lib_federation_termination_notification.c @@ -58,13 +58,17 @@ static struct XmlSnippet schema_snippets[] = { { "Extension", SNIPPET_EXTENSION, - G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, Extension), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, Extension), NULL, NULL, + NULL}, { "ProviderID", SNIPPET_CONTENT, - G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, ProviderID), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, ProviderID), NULL, NULL, + NULL}, { "NameIdentifier", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, NameIdentifier), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, NameIdentifier), NULL, + LASSO_SAML_ASSERTION_PREFIX, LASSO_SAML_ASSERTION_HREF}, { "consent", SNIPPET_ATTRIBUTE, - G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, consent), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, consent), NULL, NULL, + NULL}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/lib_logout_request.c b/lasso/xml/lib_logout_request.c index 69d8405b..13124c2e 100644 --- a/lasso/xml/lib_logout_request.c +++ b/lasso/xml/lib_logout_request.c @@ -63,7 +63,8 @@ static struct XmlSnippet schema_snippets[] = { { "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoLibLogoutRequest, Extension), NULL, NULL, NULL}, { "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibLogoutRequest, ProviderID), NULL, NULL, NULL}, - { "NameIdentifier", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibLogoutRequest, NameIdentifier), NULL, NULL, NULL}, + { "NameIdentifier", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibLogoutRequest, NameIdentifier), + NULL, LASSO_SAML_ASSERTION_PREFIX, LASSO_SAML_ASSERTION_HREF}, { "SessionIndex", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibLogoutRequest, SessionIndex), NULL, NULL, NULL}, { "RelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibLogoutRequest, RelayState), NULL, NULL, NULL}, { "consent", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoLibLogoutRequest, consent), NULL, NULL, NULL}, diff --git a/lasso/xml/lib_name_identifier_mapping_request.c b/lasso/xml/lib_name_identifier_mapping_request.c index 142fe5dd..374a5380 100644 --- a/lasso/xml/lib_name_identifier_mapping_request.c +++ b/lasso/xml/lib_name_identifier_mapping_request.c @@ -61,7 +61,8 @@ static struct XmlSnippet schema_snippets[] = { { "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, ProviderID), NULL, NULL, NULL}, { "NameIdentifier", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, NameIdentifier), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, NameIdentifier), NULL, + LASSO_SAML_ASSERTION_PREFIX, LASSO_SAML_ASSERTION_HREF}, { "TargetNamespace", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, TargetNamespace), NULL, NULL, NULL}, { "consent", SNIPPET_ATTRIBUTE, diff --git a/lasso/xml/lib_name_identifier_mapping_response.c b/lasso/xml/lib_name_identifier_mapping_response.c index 22fc5853..1a758529 100644 --- a/lasso/xml/lib_name_identifier_mapping_response.c +++ b/lasso/xml/lib_name_identifier_mapping_response.c @@ -58,9 +58,11 @@ static struct XmlSnippet schema_snippets[] = { { "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibNameIdentifierMappingResponse, ProviderID), NULL, NULL, NULL}, { "Status", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoLibNameIdentifierMappingResponse, Status), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoLibNameIdentifierMappingResponse, Status), NULL, + LASSO_SAML_PROTOCOL_PREFIX, LASSO_SAML_PROTOCOL_HREF}, { "NameIdentifier", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoLibNameIdentifierMappingResponse, NameIdentifier), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoLibNameIdentifierMappingResponse, NameIdentifier), NULL, + LASSO_SAML_ASSERTION_PREFIX, LASSO_SAML_ASSERTION_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/lib_register_name_identifier_request.c b/lasso/xml/lib_register_name_identifier_request.c index 0a883c3e..c3eece2a 100644 --- a/lasso/xml/lib_register_name_identifier_request.c +++ b/lasso/xml/lib_register_name_identifier_request.c @@ -66,12 +66,15 @@ static struct XmlSnippet schema_snippets[] = { G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, Extension), NULL, NULL, NULL}, { "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, ProviderID), NULL, NULL, NULL}, - { "IDPProvidedNameIdentifier", SNIPPET_NAME_IDENTIFIER, - G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, IDPProvidedNameIdentifier), NULL, NULL, NULL}, - { "SPProvidedNameIdentifier", SNIPPET_NAME_IDENTIFIER, - G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, SPProvidedNameIdentifier), NULL, NULL, NULL}, - { "OldProvidedNameIdentifier", SNIPPET_NAME_IDENTIFIER, - G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, OldProvidedNameIdentifier), NULL, NULL, NULL}, + { "IDPProvidedNameIdentifier", SNIPPET_NODE, + G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, IDPProvidedNameIdentifier), + "LassoSamlNameIdentifier", LASSO_LIB_PREFIX, LASSO_LIB_HREF}, + { "SPProvidedNameIdentifier", SNIPPET_NODE, + G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, SPProvidedNameIdentifier), + "LassoSamlNameIdentifier", LASSO_LIB_PREFIX, LASSO_LIB_HREF}, + { "OldProvidedNameIdentifier", SNIPPET_NODE, + G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, OldProvidedNameIdentifier), + "LassoSamlNameIdentifier", LASSO_LIB_PREFIX, LASSO_LIB_HREF}, { "RelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, RelayState), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/lib_status_response.c b/lasso/xml/lib_status_response.c index efce3ed2..20a73658 100644 --- a/lasso/xml/lib_status_response.c +++ b/lasso/xml/lib_status_response.c @@ -60,7 +60,8 @@ static struct XmlSnippet schema_snippets[] = { { "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoLibStatusResponse, Extension), NULL, NULL, NULL}, { "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibStatusResponse, ProviderID), NULL, NULL, NULL}, - { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibStatusResponse, Status), NULL, NULL, NULL}, + { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibStatusResponse, Status), NULL, + LASSO_SAML_PROTOCOL_PREFIX, LASSO_SAML_PROTOCOL_HREF}, { "RelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibStatusResponse, RelayState), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/lib_subject.c b/lasso/xml/lib_subject.c index 442f8882..49335b4c 100644 --- a/lasso/xml/lib_subject.c +++ b/lasso/xml/lib_subject.c @@ -50,8 +50,9 @@ /*****************************************************************************/ static struct XmlSnippet schema_snippets[] = { - { "IDPProvidedNameIdentifier", SNIPPET_NAME_IDENTIFIER, - G_STRUCT_OFFSET(LassoLibSubject, IDPProvidedNameIdentifier), NULL, NULL, NULL}, + { "IDPProvidedNameIdentifier", SNIPPET_NODE, + G_STRUCT_OFFSET(LassoLibSubject, IDPProvidedNameIdentifier), + "LassoSamlNameIdentifier", LASSO_LIB_PREFIX, LASSO_LIB_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/sa_sasl_request.c b/lasso/xml/sa_sasl_request.c index 467e1f8b..dc9ceee3 100644 --- a/lasso/xml/sa_sasl_request.c +++ b/lasso/xml/sa_sasl_request.c @@ -63,7 +63,8 @@ static struct XmlSnippet schema_snippets[] = { { "Data", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoSaSASLRequest, Data), NULL, NULL, NULL}, { "RequestAuthnContext", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSaSASLRequest, RequestAuthnContext), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSaSASLRequest, RequestAuthnContext), NULL, LASSO_LIB_PREFIX, + LASSO_LIB_HREF}, { "mechanism", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSaSASLRequest, mechanism), NULL, NULL, NULL}, { "authzID", SNIPPET_ATTRIBUTE, diff --git a/lasso/xml/sa_sasl_response.c b/lasso/xml/sa_sasl_response.c index 4dfcf3a0..f57ae5b3 100644 --- a/lasso/xml/sa_sasl_response.c +++ b/lasso/xml/sa_sasl_response.c @@ -74,7 +74,8 @@ static struct XmlSnippet schema_snippets[] = { { "Data", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoSaSASLResponse, Data), NULL, NULL, NULL}, { "ResourceOffering", SNIPPET_LIST_NODES, - G_STRUCT_OFFSET(LassoSaSASLResponse, ResourceOffering), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSaSASLResponse, ResourceOffering), NULL, LASSO_DISCO_PREFIX, + LASSO_DISCO_HREF}, { "Credentials", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSaSASLResponse, Credentials), NULL, NULL, NULL}, { "serverMechanism", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSaSASLResponse, serverMechanism), NULL, NULL, NULL}, diff --git a/lasso/xml/saml-2.0/saml2_assertion.c b/lasso/xml/saml-2.0/saml2_assertion.c index aa0dfbb3..adf3caba 100644 --- a/lasso/xml/saml-2.0/saml2_assertion.c +++ b/lasso/xml/saml-2.0/saml2_assertion.c @@ -70,7 +70,7 @@ static struct XmlSnippet schema_snippets[] = { G_STRUCT_OFFSET(LassoSaml2Assertion, Issuer), "LassoSaml2NameID", NULL, NULL}, { "Signature", SNIPPET_SIGNATURE, - G_STRUCT_OFFSET(LassoSaml2Assertion, ID), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSaml2Assertion, ID), NULL, LASSO_DS_PREFIX, LASSO_DS_HREF}, { "Subject", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSaml2Assertion, Subject), NULL, NULL, NULL}, { "Conditions", SNIPPET_NODE, diff --git a/lasso/xml/saml-2.0/saml2_attribute_value.c b/lasso/xml/saml-2.0/saml2_attribute_value.c index 894ea3a1..7c4bbf7d 100644 --- a/lasso/xml/saml-2.0/saml2_attribute_value.c +++ b/lasso/xml/saml-2.0/saml2_attribute_value.c @@ -47,9 +47,16 @@ /* private methods */ /*****************************************************************************/ +struct _LassoSaml2AttributeValuePrivate { + GHashTable *any_attributes; +}; + static struct XmlSnippet schema_snippets[] = { - { "", SNIPPET_LIST_NODES | SNIPPET_ANY, + { "any", SNIPPET_LIST_NODES | SNIPPET_ANY | SNIPPET_ALLOW_TEXT, G_STRUCT_OFFSET(LassoSaml2AttributeValue, any), NULL, NULL, NULL}, + { "any_attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY | SNIPPET_PRIVATE, + G_STRUCT_OFFSET(struct _LassoSaml2AttributeValuePrivate, any_attributes), NULL, + NULL, NULL }, {NULL, 0, 0, NULL, NULL, NULL} }; @@ -85,6 +92,7 @@ class_init(LassoSaml2AttributeValueClass *klass) lasso_node_class_set_nodename(nclass, "AttributeValue"); lasso_node_class_set_ns(nclass, LASSO_SAML2_ASSERTION_HREF, LASSO_SAML2_ASSERTION_PREFIX); lasso_node_class_add_snippets(nclass, schema_snippets); + g_type_class_add_private(klass, sizeof(struct _LassoSaml2AttributeValuePrivate)); } GType diff --git a/lasso/xml/saml-2.0/saml2_encrypted_element.c b/lasso/xml/saml-2.0/saml2_encrypted_element.c index 45da903a..13d5bdc7 100644 --- a/lasso/xml/saml-2.0/saml2_encrypted_element.c +++ b/lasso/xml/saml-2.0/saml2_encrypted_element.c @@ -57,9 +57,11 @@ static struct XmlSnippet schema_snippets[] = { { "EncryptedData", SNIPPET_XMLNODE, - G_STRUCT_OFFSET(LassoSaml2EncryptedElement, EncryptedData), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSaml2EncryptedElement, EncryptedData), NULL, "xmlenc", + (char*) xmlSecEncNs}, { "EncryptedKey", SNIPPET_LIST_XMLNODES, - G_STRUCT_OFFSET(LassoSaml2EncryptedElement, EncryptedKey), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSaml2EncryptedElement, EncryptedKey), NULL, "xmlenc", + (char*) xmlSecEncNs}, { "NameID", SNIPPET_NODE | SNIPPET_LASSO_DUMP, G_STRUCT_OFFSET(LassoSaml2EncryptedElement, original_data), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/saml-2.0/saml2_subject_confirmation_data.c b/lasso/xml/saml-2.0/saml2_subject_confirmation_data.c index 3bc05cec..69114b62 100644 --- a/lasso/xml/saml-2.0/saml2_subject_confirmation_data.c +++ b/lasso/xml/saml-2.0/saml2_subject_confirmation_data.c @@ -52,7 +52,7 @@ */ struct _LassoSaml2SubjectConfirmationDataPrivate { - GList *any; /* of LassoMiscTextNode */ + GList *any; GHashTable *attributes; }; diff --git a/lasso/xml/saml-2.0/samlp2_assertion_id_request.c b/lasso/xml/saml-2.0/samlp2_assertion_id_request.c index 6bc12498..21fbc980 100644 --- a/lasso/xml/saml-2.0/samlp2_assertion_id_request.c +++ b/lasso/xml/saml-2.0/samlp2_assertion_id_request.c @@ -51,7 +51,8 @@ static struct XmlSnippet schema_snippets[] = { { "AssertionIDRef", SNIPPET_CONTENT, - G_STRUCT_OFFSET(LassoSamlp2AssertionIDRequest, AssertionIDRef), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSamlp2AssertionIDRequest, AssertionIDRef), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/saml-2.0/samlp2_attribute_query.c b/lasso/xml/saml-2.0/samlp2_attribute_query.c index 1d941d5c..f6314b59 100644 --- a/lasso/xml/saml-2.0/samlp2_attribute_query.c +++ b/lasso/xml/saml-2.0/samlp2_attribute_query.c @@ -52,7 +52,8 @@ static struct XmlSnippet schema_snippets[] = { { "Attribute", SNIPPET_LIST_NODES , - G_STRUCT_OFFSET(LassoSamlp2AttributeQuery, Attribute), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSamlp2AttributeQuery, Attribute), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/saml-2.0/samlp2_authn_request.c b/lasso/xml/saml-2.0/samlp2_authn_request.c index f4f0d4cd..22574a62 100644 --- a/lasso/xml/saml-2.0/samlp2_authn_request.c +++ b/lasso/xml/saml-2.0/samlp2_authn_request.c @@ -63,11 +63,13 @@ static struct XmlSnippet schema_snippets[] = { { "Subject", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, Subject), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, Subject), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, { "NameIDPolicy", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, NameIDPolicy), NULL, NULL, NULL}, { "Conditions", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, Conditions), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, Conditions), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, { "RequestedAuthnContext", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, RequestedAuthnContext), NULL, NULL, NULL}, { "Scoping", SNIPPET_NODE, diff --git a/lasso/xml/saml-2.0/samlp2_authz_decision_query.c b/lasso/xml/saml-2.0/samlp2_authz_decision_query.c index 060fee03..51dc39d3 100644 --- a/lasso/xml/saml-2.0/samlp2_authz_decision_query.c +++ b/lasso/xml/saml-2.0/samlp2_authz_decision_query.c @@ -53,10 +53,10 @@ static struct XmlSnippet schema_snippets[] = { - { "Action", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2AuthzDecisionQuery, Action), NULL, NULL, NULL}, - { "Evidence", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2AuthzDecisionQuery, Evidence), NULL, NULL, NULL}, + { "Action", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2AuthzDecisionQuery, Action), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, + { "Evidence", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2AuthzDecisionQuery, Evidence), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, { "Resource", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlp2AuthzDecisionQuery, Resource), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/saml-2.0/samlp2_logout_request.c b/lasso/xml/saml-2.0/samlp2_logout_request.c index a4576685..0152a0d5 100644 --- a/lasso/xml/saml-2.0/samlp2_logout_request.c +++ b/lasso/xml/saml-2.0/samlp2_logout_request.c @@ -67,15 +67,16 @@ struct _LassoSamlp2LogoutRequestPrivate { static struct XmlSnippet schema_snippets[] = { - { "BaseID", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, BaseID), NULL, NULL, NULL}, - { "NameID", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, NameID), NULL, NULL, NULL}, - { "EncryptedID", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, EncryptedID), - "LassoSaml2EncryptedElement", NULL, NULL }, + { "BaseID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, BaseID), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, + { "NameID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, NameID), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, + { "EncryptedID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, EncryptedID), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, { "SessionIndex", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, SessionIndex), NULL, NULL, NULL}, + { "SessionIndex", SNIPPET_LIST_NODES, + 0, NULL, NULL, NULL}, { "Reason", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, Reason), NULL, NULL, NULL}, { "NotOnOrAfter", SNIPPET_ATTRIBUTE, diff --git a/lasso/xml/saml-2.0/samlp2_manage_name_id_request.c b/lasso/xml/saml-2.0/samlp2_manage_name_id_request.c index dcdfc05b..207f1444 100644 --- a/lasso/xml/saml-2.0/samlp2_manage_name_id_request.c +++ b/lasso/xml/saml-2.0/samlp2_manage_name_id_request.c @@ -59,11 +59,11 @@ static struct XmlSnippet schema_snippets[] = { - { "NameID", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2ManageNameIDRequest, NameID), NULL, NULL, NULL}, - { "EncryptedID", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2ManageNameIDRequest, EncryptedID), - "LassoSaml2EncryptedElement", NULL, NULL}, + { "NameID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2ManageNameIDRequest, NameID), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, + { "EncryptedID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2ManageNameIDRequest, EncryptedID), + "LassoSaml2EncryptedElement", LASSO_SAML2_ASSERTION_PREFIX, + LASSO_SAML2_ASSERTION_HREF}, { "NewID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoSamlp2ManageNameIDRequest, NewID), NULL, NULL, NULL}, { "NewEncryptedID", SNIPPET_NODE, diff --git a/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.c b/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.c index a3900c4e..559ef8c1 100644 --- a/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.c +++ b/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.c @@ -56,13 +56,13 @@ static struct XmlSnippet schema_snippets[] = { - { "BaseID", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, BaseID), NULL, NULL, NULL}, - { "NameID", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, NameID), NULL, NULL, NULL}, - { "EncryptedID", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, EncryptedID), - "LassoSaml2EncryptedElement", NULL, NULL }, + { "BaseID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, BaseID), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, + { "NameID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, NameID), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, + { "EncryptedID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, + EncryptedID), NULL, LASSO_SAML2_ASSERTION_PREFIX, + LASSO_SAML2_ASSERTION_HREF}, { "NameIDPolicy", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, NameIDPolicy), NULL, NULL, NULL}, {NULL, 0, 0, NULL, NULL, NULL} diff --git a/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.c b/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.c index ee2ecb3e..1dffb0a9 100644 --- a/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.c +++ b/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.c @@ -52,11 +52,11 @@ static struct XmlSnippet schema_snippets[] = { - { "NameID", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2NameIDMappingResponse, NameID), NULL, NULL, NULL}, - { "EncryptedID", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2NameIDMappingResponse, EncryptedID), - "LassoSaml2EncryptedElement", NULL, NULL }, + { "NameID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2NameIDMappingResponse, NameID), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, + { "EncryptedID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2NameIDMappingResponse, + EncryptedID), NULL, LASSO_SAML2_ASSERTION_PREFIX, + LASSO_SAML2_ASSERTION_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/saml-2.0/samlp2_request_abstract.c b/lasso/xml/saml-2.0/samlp2_request_abstract.c index ba43b63e..3d3e6c9c 100644 --- a/lasso/xml/saml-2.0/samlp2_request_abstract.c +++ b/lasso/xml/saml-2.0/samlp2_request_abstract.c @@ -59,11 +59,10 @@ static struct XmlSnippet schema_snippets[] = { - { "Issuer", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, Issuer), - "LassoSaml2NameID", NULL, NULL }, + { "Issuer", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, Issuer), + "LassoSaml2NameID", LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, { "Signature", SNIPPET_SIGNATURE, - G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, ID), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, ID), NULL, LASSO_DS_PREFIX, LASSO_DS_HREF}, { "Extensions", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, Extensions), NULL, NULL, NULL}, { "ID", SNIPPET_ATTRIBUTE, diff --git a/lasso/xml/saml-2.0/samlp2_response.c b/lasso/xml/saml-2.0/samlp2_response.c index 056ea948..bc8ab5b1 100644 --- a/lasso/xml/saml-2.0/samlp2_response.c +++ b/lasso/xml/saml-2.0/samlp2_response.c @@ -56,10 +56,11 @@ extern LassoNode* lasso_assertion_encrypt(LassoSaml2Assertion *assertion, char * /*****************************************************************************/ static struct XmlSnippet schema_snippets[] = { - { "Assertion", SNIPPET_LIST_NODES, - G_STRUCT_OFFSET(LassoSamlp2Response, Assertion), NULL, NULL, NULL}, - { "EncryptedAssertion", SNIPPET_LIST_NODES, - G_STRUCT_OFFSET(LassoSamlp2Response, EncryptedAssertion), NULL, NULL, NULL}, + { "Assertion", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSamlp2Response, Assertion), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, + { "EncryptedAssertion", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSamlp2Response, + EncryptedAssertion), NULL, LASSO_SAML2_ASSERTION_PREFIX, + LASSO_SAML2_ASSERTION_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/saml-2.0/samlp2_status_response.c b/lasso/xml/saml-2.0/samlp2_status_response.c index e8c9b74e..216bb701 100644 --- a/lasso/xml/saml-2.0/samlp2_status_response.c +++ b/lasso/xml/saml-2.0/samlp2_status_response.c @@ -26,6 +26,7 @@ #include "../private.h" #include "../../utils.h" #include "./samlp2_status_response.h" +#include "./saml2_strings.h" #include #include @@ -62,9 +63,9 @@ static struct XmlSnippet schema_snippets[] = { { "Issuer", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2StatusResponse, Issuer), - "LassoSaml2NameID", NULL, NULL}, + "LassoSaml2NameID", LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF}, { "Signature", SNIPPET_SIGNATURE, - G_STRUCT_OFFSET(LassoSamlp2StatusResponse, ID), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSamlp2StatusResponse, ID), NULL, LASSO_DS_PREFIX, LASSO_DS_HREF}, { "Extensions", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2StatusResponse, Extensions), NULL, NULL, NULL}, { "Status", SNIPPET_NODE, diff --git a/lasso/xml/saml-2.0/samlp2_subject_query_abstract.c b/lasso/xml/saml-2.0/samlp2_subject_query_abstract.c index f9c299b5..3db8016e 100644 --- a/lasso/xml/saml-2.0/samlp2_subject_query_abstract.c +++ b/lasso/xml/saml-2.0/samlp2_subject_query_abstract.c @@ -51,8 +51,8 @@ static struct XmlSnippet schema_snippets[] = { - { "Subject", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlp2SubjectQueryAbstract, Subject), NULL, NULL, NULL}, + { "Subject", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlp2SubjectQueryAbstract, Subject), NULL, + LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF }, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/saml_assertion.c b/lasso/xml/saml_assertion.c index 82f7db53..bc8d5d9e 100644 --- a/lasso/xml/saml_assertion.c +++ b/lasso/xml/saml_assertion.c @@ -80,7 +80,7 @@ static struct XmlSnippet schema_snippets[] = { { "AttributeStatement", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlAssertion, AttributeStatement), NULL, NULL, NULL}, { "Signature", SNIPPET_SIGNATURE, - G_STRUCT_OFFSET(LassoSamlAssertion, AssertionID), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSamlAssertion, AssertionID), NULL, LASSO_DS_PREFIX, LASSO_DS_HREF}, { "MajorVersion", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER, G_STRUCT_OFFSET(LassoSamlAssertion, MajorVersion), NULL, NULL, NULL}, { "MinorVersion", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER, diff --git a/lasso/xml/saml_subject_confirmation.c b/lasso/xml/saml_subject_confirmation.c index 1030536a..d8ed56e8 100644 --- a/lasso/xml/saml_subject_confirmation.c +++ b/lasso/xml/saml_subject_confirmation.c @@ -57,7 +57,8 @@ static struct XmlSnippet schema_snippets[] = { { "SubjectConfirmationData", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoSamlSubjectConfirmation, SubjectConfirmationData), NULL, NULL, NULL}, { "KeyInfo", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSamlSubjectConfirmation, KeyInfo), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSamlSubjectConfirmation, KeyInfo), NULL, LASSO_DS_PREFIX, + LASSO_DS_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/samlp_request_abstract.c b/lasso/xml/samlp_request_abstract.c index 05e7499d..1e183f2e 100644 --- a/lasso/xml/samlp_request_abstract.c +++ b/lasso/xml/samlp_request_abstract.c @@ -65,7 +65,7 @@ static struct XmlSnippet schema_snippets[] = { { "RespondWith", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoSamlpRequestAbstract, RespondWith), NULL, NULL, NULL}, { "Signature", SNIPPET_SIGNATURE, - G_STRUCT_OFFSET(LassoSamlpRequestAbstract, RequestID), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSamlpRequestAbstract, RequestID), NULL, LASSO_DS_PREFIX, LASSO_DS_HREF}, { "RequestID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlpRequestAbstract, RequestID), NULL, NULL, NULL}, { "MajorVersion", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER, G_STRUCT_OFFSET(LassoSamlpRequestAbstract, MajorVersion), NULL, NULL, NULL}, diff --git a/lasso/xml/samlp_response.c b/lasso/xml/samlp_response.c index a7fccdee..06413fca 100644 --- a/lasso/xml/samlp_response.c +++ b/lasso/xml/samlp_response.c @@ -54,7 +54,8 @@ static struct XmlSnippet schema_snippets[] = { { "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlpResponse, Status), NULL, NULL, NULL}, - { "Assertion", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSamlpResponse, Assertion), NULL, NULL, NULL}, + { "Assertion", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSamlpResponse, Assertion), NULL, + LASSO_SAML_ASSERTION_PREFIX, LASSO_SAML_ASSERTION_HREF}, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/samlp_response_abstract.c b/lasso/xml/samlp_response_abstract.c index c671b93e..513396af 100644 --- a/lasso/xml/samlp_response_abstract.c +++ b/lasso/xml/samlp_response_abstract.c @@ -65,7 +65,8 @@ static struct XmlSnippet schema_snippets[] = { { "Signature", SNIPPET_SIGNATURE, - G_STRUCT_OFFSET(LassoSamlpResponseAbstract, ResponseID), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSamlpResponseAbstract, ResponseID), NULL, LASSO_DS_PREFIX, + LASSO_DS_HREF}, { "ResponseID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlpResponseAbstract, ResponseID), NULL, NULL, NULL}, { "MajorVersion", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER, diff --git a/lasso/xml/soap-1.1/soap_body.c b/lasso/xml/soap-1.1/soap_body.c index 22f089f7..d88b805f 100644 --- a/lasso/xml/soap-1.1/soap_body.c +++ b/lasso/xml/soap-1.1/soap_body.c @@ -54,7 +54,10 @@ /*****************************************************************************/ static struct XmlSnippet schema_snippets[] = { - { "", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSoapBody, any), NULL, NULL, NULL}, + { "any", SNIPPET_LIST_NODES | SNIPPET_ANY, G_STRUCT_OFFSET(LassoSoapBody, any), NULL, NULL, + NULL}, + { "Id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBody, Id), NULL, LASSO_WSUTIL1_PREFIX, + LASSO_WSUTIL1_HREF }, {NULL, 0, 0, NULL, NULL, NULL} }; diff --git a/lasso/xml/soap_binding_ext_credentials_context.c b/lasso/xml/soap_binding_ext_credentials_context.c index f5aaf00a..7c704239 100644 --- a/lasso/xml/soap_binding_ext_credentials_context.c +++ b/lasso/xml/soap_binding_ext_credentials_context.c @@ -54,7 +54,8 @@ static struct XmlSnippet schema_snippets[] = { { "RequestAuthnContext", SNIPPET_NODE, - G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, RequestAuthnContext), NULL, NULL, NULL}, + G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, RequestAuthnContext), NULL, + LASSO_LIB_PREFIX, LASSO_LIB_HREF}, { "SecurityMechID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, SecurityMechID), NULL, NULL, NULL}, { "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, id), NULL, NULL, NULL},