You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sh...@apache.org on 2009/08/18 12:45:18 UTC
svn commit: r805352 [3/5] - in /webservices/axis2/trunk/c/neethi/src: ./
rmpolicy/ secpolicy/builder/ secpolicy/model/
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/recipient_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/recipient_token_builder.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/recipient_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/recipient_token_builder.c Tue Aug 18 10:45:16 2009
@@ -25,7 +25,8 @@
/*private functions*/
-axis2_status_t AXIS2_CALL recipient_token_process_alternatives(
+axis2_status_t AXIS2_CALL
+recipient_token_process_alternatives(
const axutil_env_t *env,
neethi_all_t *all,
rp_property_t *recipient_token);
@@ -52,39 +53,32 @@
child_node = axiom_node_get_first_element(node, env);
- if (!child_node)
+ if(!child_node)
{
return NULL;
}
- if (axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
+ if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
- child_element =
- (axiom_element_t *) axiom_node_get_data_element(child_node, env);
- if (child_element)
+ child_element = (axiom_element_t *)axiom_node_get_data_element(child_node, env);
+ if(child_element)
{
policy = neethi_engine_get_policy(env, child_node, child_element);
- if (!policy)
+ if(!policy)
{
return NULL;
}
- normalized_policy =
- neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
+ normalized_policy = neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
neethi_policy_free(policy, env);
policy = NULL;
- alternatives =
- neethi_policy_get_alternatives(normalized_policy, env);
- component =
- (neethi_operator_t *) axutil_array_list_get(alternatives, env,
- 0);
- all = (neethi_all_t *) neethi_operator_get_value(component, env);
+ alternatives = neethi_policy_get_alternatives(normalized_policy, env);
+ component = (neethi_operator_t *)axutil_array_list_get(alternatives, env, 0);
+ all = (neethi_all_t *)neethi_operator_get_value(component, env);
recipient_token_process_alternatives(env, all, recipient_token);
- assertion =
- neethi_assertion_create_with_args(env,
- (AXIS2_FREE_VOID_ARG)rp_property_free,
- recipient_token,
- ASSERTION_TYPE_RECIPIENT_TOKEN);
+ assertion = neethi_assertion_create_with_args(env,
+ (AXIS2_FREE_VOID_ARG)rp_property_free, recipient_token,
+ ASSERTION_TYPE_RECIPIENT_TOKEN);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -115,27 +109,22 @@
arraylist = neethi_all_get_policy_components(all, env);
- for (i = 0; i < axutil_array_list_size(arraylist, env); i++)
+ for(i = 0; i < axutil_array_list_size(arraylist, env); i++)
{
- operator =(neethi_operator_t *) axutil_array_list_get(arraylist, env,
- i);
- assertion =
- (neethi_assertion_t *) neethi_operator_get_value(operator, env);
+ operator = (neethi_operator_t *)axutil_array_list_get(arraylist, env, i);
+ assertion = (neethi_assertion_t *)neethi_operator_get_value(operator, env);
value = neethi_assertion_get_value(assertion, env);
type = neethi_assertion_get_type(assertion, env);
- if (value)
+ if(value)
{
- if (type == ASSERTION_TYPE_X509_TOKEN)
+ if(type == ASSERTION_TYPE_X509_TOKEN)
{
rp_x509_token_t *x509_token = NULL;
- x509_token =
- (rp_x509_token_t *) neethi_assertion_get_value(assertion,
- env);
- if (x509_token)
+ x509_token = (rp_x509_token_t *)neethi_assertion_get_value(assertion, env);
+ if(x509_token)
{
- rp_property_set_value(recipient_token, env, x509_token,
- RP_PROPERTY_X509_TOKEN);
+ rp_property_set_value(recipient_token, env, x509_token, RP_PROPERTY_X509_TOKEN);
}
else
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/saml_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/saml_token_builder.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/saml_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/saml_token_builder.c Tue Aug 18 10:45:16 2009
@@ -17,13 +17,14 @@
#include <rp_saml_token_builder.h>
-axis2_status_t AXIS2_CALL saml_token_process_alternatives(
+axis2_status_t AXIS2_CALL
+saml_token_process_alternatives(
const axutil_env_t *env,
neethi_all_t *all,
rp_saml_token_t *saml_token);
AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
- rp_saml_token_builder_build(
+rp_saml_token_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
axiom_element_t *element)
@@ -39,7 +40,7 @@
axutil_qname_t *qname = NULL;
neethi_assertion_t *assertion = NULL;
neethi_policy_t *normalized_policy = NULL;
-
+
saml_token = rp_saml_token_create(env);
qname = axutil_qname_create(env, RP_INCLUDE_TOKEN, RP_SP_NS_11, RP_SP_PREFIX);
inclusion_value = axiom_element_get_attribute_value(element, env, qname);
@@ -56,44 +57,34 @@
}
rp_saml_token_set_inclusion(saml_token, env, inclusion_value);
-
+
child_node = axiom_node_get_first_element(node, env);
- if (!child_node)
+ if(!child_node)
{
assertion = neethi_assertion_create(env);
- neethi_assertion_set_value(assertion, env,
- saml_token,
- ASSERTION_TYPE_SAML_TOKEN);
+ neethi_assertion_set_value(assertion, env, saml_token, ASSERTION_TYPE_SAML_TOKEN);
return assertion;
}
- if (axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
+ if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
- child_element =
- (axiom_element_t *) axiom_node_get_data_element(child_node, env);
- if (child_element)
+ child_element = (axiom_element_t *)axiom_node_get_data_element(child_node, env);
+ if(child_element)
{
policy = neethi_engine_get_policy(env, child_node, child_element);
- if (!policy)
+ if(!policy)
{
return NULL;
}
- normalized_policy =
- neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
+ normalized_policy = neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
neethi_policy_free(policy, env);
policy = NULL;
- alternatives =
- neethi_policy_get_alternatives(normalized_policy, env);
- component =
- (neethi_operator_t *) axutil_array_list_get(alternatives, env,
- 0);
- all = (neethi_all_t *) neethi_operator_get_value(component, env);
+ alternatives = neethi_policy_get_alternatives(normalized_policy, env);
+ component = (neethi_operator_t *)axutil_array_list_get(alternatives, env, 0);
+ all = (neethi_all_t *)neethi_operator_get_value(component, env);
saml_token_process_alternatives(env, all, saml_token);
- assertion =
- neethi_assertion_create_with_args(env,
- (AXIS2_FREE_VOID_ARG)rp_saml_token_free,
- saml_token,
- ASSERTION_TYPE_SAML_TOKEN);
+ assertion = neethi_assertion_create_with_args(env,
+ (AXIS2_FREE_VOID_ARG)rp_saml_token_free, saml_token, ASSERTION_TYPE_SAML_TOKEN);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -107,7 +98,8 @@
return NULL;
}
-axis2_status_t AXIS2_CALL saml_token_process_alternatives(
+axis2_status_t AXIS2_CALL
+saml_token_process_alternatives(
const axutil_env_t *env,
neethi_all_t *all,
rp_saml_token_t *saml_token)
@@ -121,22 +113,19 @@
arraylist = neethi_all_get_policy_components(all, env);
- for (i = 0; i < axutil_array_list_size(arraylist, env); i++)
+ for(i = 0; i < axutil_array_list_size(arraylist, env); i++)
{
- operator =(neethi_operator_t *) axutil_array_list_get(arraylist, env,
- i);
- assertion =
- (neethi_assertion_t *) neethi_operator_get_value(operator, env);
+ operator = (neethi_operator_t *)axutil_array_list_get(arraylist, env, i);
+ assertion = (neethi_assertion_t *)neethi_operator_get_value(operator, env);
type = neethi_assertion_get_type(assertion, env);
-
+
if(type == ASSERTION_TYPE_REQUIRE_DERIVED_KEYS_SC10)
{
rp_saml_token_set_derivedkeys(saml_token, env, AXIS2_TRUE);
}
- else if (type == ASSERTION_TYPE_REQUIRE_KEY_IDENTIFIRE_REFERENCE)
+ else if(type == ASSERTION_TYPE_REQUIRE_KEY_IDENTIFIRE_REFERENCE)
{
- rp_saml_token_set_require_key_identifier_reference(saml_token, env,
- AXIS2_TRUE);
+ rp_saml_token_set_require_key_identifier_reference(saml_token, env, AXIS2_TRUE);
}
else if(type == ASSERTION_TYPE_WSS_SAML_V10_TOKEN_V10)
{
@@ -148,7 +137,7 @@
}
else if(type == ASSERTION_TYPE_WSS_SAML_V11_TOKEN_V10)
{
- rp_saml_token_set_token_version_and_type(saml_token, env,RP_WSS_SAML_V11_TOKEN_V10);
+ rp_saml_token_set_token_version_and_type(saml_token, env, RP_WSS_SAML_V11_TOKEN_V10);
}
else if(type == ASSERTION_TYPE_WSS_SAML_V11_TOKEN_V11)
{
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/secpolicy_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/secpolicy_builder.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/secpolicy_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/secpolicy_builder.c Tue Aug 18 10:45:16 2009
@@ -24,7 +24,8 @@
/*private functions*/
-axis2_status_t AXIS2_CALL secpolicy_process_alternatives(
+axis2_status_t AXIS2_CALL
+secpolicy_process_alternatives(
const axutil_env_t *env,
neethi_all_t *all,
rp_secpolicy_t *secpolicy);
@@ -45,11 +46,10 @@
alternatives = neethi_policy_get_alternatives(policy, env);
- component =
- (neethi_operator_t *) axutil_array_list_get(alternatives, env, 0);
- all = (neethi_all_t *) neethi_operator_get_value(component, env);
+ component = (neethi_operator_t *)axutil_array_list_get(alternatives, env, 0);
+ all = (neethi_all_t *)neethi_operator_get_value(component, env);
- if (secpolicy_process_alternatives(env, all, secpolicy) == AXIS2_FAILURE)
+ if(secpolicy_process_alternatives(env, all, secpolicy) == AXIS2_FAILURE)
{
return NULL;
}
@@ -73,104 +73,89 @@
arraylist = neethi_all_get_policy_components(all, env);
- for (i = 0; i < axutil_array_list_size(arraylist, env); i++)
+ for(i = 0; i < axutil_array_list_size(arraylist, env); i++)
{
- operator =(neethi_operator_t *) axutil_array_list_get(arraylist, env,
- i);
- assertion =
- (neethi_assertion_t *) neethi_operator_get_value(operator, env);
+ operator = (neethi_operator_t *)axutil_array_list_get(arraylist, env, i);
+ assertion = (neethi_assertion_t *)neethi_operator_get_value(operator, env);
value = neethi_assertion_get_value(assertion, env);
type = neethi_assertion_get_type(assertion, env);
- if (value)
+ if(value)
{
- if (type == ASSERTION_TYPE_TRANSPORT_BINDING)
+ if(type == ASSERTION_TYPE_TRANSPORT_BINDING)
{
rp_property_t *binding = NULL;
rp_transport_binding_t *transport_binding = NULL;
- transport_binding =
- (rp_transport_binding_t *)
- neethi_assertion_get_value(assertion, env);
- if (!transport_binding)
+ transport_binding = (rp_transport_binding_t *)neethi_assertion_get_value(assertion,
+ env);
+ if(!transport_binding)
{
return AXIS2_FAILURE;
}
binding = rp_property_create(env);
rp_property_set_value(binding, env, transport_binding,
- RP_PROPERTY_TRANSPORT_BINDING);
+ RP_PROPERTY_TRANSPORT_BINDING);
rp_secpolicy_set_binding(secpolicy, env, binding);
}
- else if (type == ASSERTION_TYPE_ASSYMMETRIC_BINDING)
+ else if(type == ASSERTION_TYPE_ASSYMMETRIC_BINDING)
{
rp_property_t *binding = NULL;
rp_asymmetric_binding_t *asymmetric_binding = NULL;
- asymmetric_binding =
- (rp_asymmetric_binding_t *)
- neethi_assertion_get_value(assertion, env);
- if (!asymmetric_binding)
+ asymmetric_binding = (rp_asymmetric_binding_t *)neethi_assertion_get_value(
+ assertion, env);
+ if(!asymmetric_binding)
{
return AXIS2_FAILURE;
}
binding = rp_property_create(env);
rp_property_set_value(binding, env, asymmetric_binding,
- RP_PROPERTY_ASYMMETRIC_BINDING);
+ RP_PROPERTY_ASYMMETRIC_BINDING);
rp_secpolicy_set_binding(secpolicy, env, binding);
}
- else if (type == ASSERTION_TYPE_SYMMETRIC_BINDING)
+ else if(type == ASSERTION_TYPE_SYMMETRIC_BINDING)
{
rp_property_t *binding = NULL;
rp_symmetric_binding_t *symmetric_binding = NULL;
- symmetric_binding =
- (rp_symmetric_binding_t *)
- neethi_assertion_get_value(assertion, env);
- if (!symmetric_binding)
+ symmetric_binding = (rp_symmetric_binding_t *)neethi_assertion_get_value(assertion,
+ env);
+ if(!symmetric_binding)
{
return AXIS2_FAILURE;
}
binding = rp_property_create(env);
rp_property_set_value(binding, env, symmetric_binding,
- RP_PROPERTY_SYMMETRIC_BINDING);
+ RP_PROPERTY_SYMMETRIC_BINDING);
rp_secpolicy_set_binding(secpolicy, env, binding);
}
- else if (type == ASSERTION_TYPE_SUPPORTING_TOKENS)
+ else if(type == ASSERTION_TYPE_SUPPORTING_TOKENS)
{
rp_supporting_tokens_t *supporting_tokens = NULL;
- supporting_tokens =
- (rp_supporting_tokens_t *)
- neethi_assertion_get_value(assertion, env);
- if (supporting_tokens)
+ supporting_tokens = (rp_supporting_tokens_t *)neethi_assertion_get_value(assertion,
+ env);
+ if(supporting_tokens)
{
rp_property_type_t type;
- type =
- rp_supporting_tokens_get_type(supporting_tokens, env);
- if (type == RP_PROPERTY_SIGNED_SUPPORTING_TOKEN)
+ type = rp_supporting_tokens_get_type(supporting_tokens, env);
+ if(type == RP_PROPERTY_SIGNED_SUPPORTING_TOKEN)
{
- rp_secpolicy_set_signed_supporting_tokens(secpolicy,
- env,
- supporting_tokens);
+ rp_secpolicy_set_signed_supporting_tokens(secpolicy, env, supporting_tokens);
}
- else if (type ==
- RP_PROPERTY_SIGNED_ENDORSING_SUPPORTING_TOKEN)
+ else if(type == RP_PROPERTY_SIGNED_ENDORSING_SUPPORTING_TOKEN)
{
- rp_secpolicy_set_signed_endorsing_supporting_tokens(secpolicy,
- env,
- supporting_tokens);
+ rp_secpolicy_set_signed_endorsing_supporting_tokens(secpolicy, env,
+ supporting_tokens);
}
- else if (type == RP_PROPERTY_SUPPORTING_SUPPORTING_TOKEN)
+ else if(type == RP_PROPERTY_SUPPORTING_SUPPORTING_TOKEN)
{
- rp_secpolicy_set_supporting_tokens(secpolicy,
- env,
- supporting_tokens);
+ rp_secpolicy_set_supporting_tokens(secpolicy, env, supporting_tokens);
}
- else if (type ==
- RP_PROPERTY_ENDORSING_SUPPORTING_TOKEN)
+ else if(type == RP_PROPERTY_ENDORSING_SUPPORTING_TOKEN)
{
- rp_secpolicy_set_endorsing_supporting_tokens(secpolicy,
- env,
- supporting_tokens);
+ rp_secpolicy_set_endorsing_supporting_tokens(secpolicy, env,
+ supporting_tokens);
}
else
return AXIS2_FAILURE;
@@ -178,13 +163,12 @@
else
return AXIS2_FAILURE;
}
- else if (type == ASSERTION_TYPE_WSS10)
+ else if(type == ASSERTION_TYPE_WSS10)
{
rp_wss10_t *wss10 = NULL;
rp_property_t *wss = NULL;
- wss10 =
- (rp_wss10_t *) neethi_assertion_get_value(assertion, env);
- if (!wss10)
+ wss10 = (rp_wss10_t *)neethi_assertion_get_value(assertion, env);
+ if(!wss10)
{
return AXIS2_FAILURE;
}
@@ -192,13 +176,12 @@
rp_property_set_value(wss, env, wss10, RP_PROPERTY_WSS10);
rp_secpolicy_set_wss(secpolicy, env, wss);
}
- else if (type == ASSERTION_TYPE_WSS11)
+ else if(type == ASSERTION_TYPE_WSS11)
{
rp_wss11_t *wss11 = NULL;
rp_property_t *wss = NULL;
- wss11 =
- (rp_wss11_t *) neethi_assertion_get_value(assertion, env);
- if (!wss11)
+ wss11 = (rp_wss11_t *)neethi_assertion_get_value(assertion, env);
+ if(!wss11)
{
return AXIS2_FAILURE;
}
@@ -206,48 +189,41 @@
rp_property_set_value(wss, env, wss11, RP_PROPERTY_WSS11);
rp_secpolicy_set_wss(secpolicy, env, wss);
}
- else if (type == ASSERTION_TYPE_TRUST10)
+ else if(type == ASSERTION_TYPE_TRUST10)
{
rp_trust10_t *trust10 = NULL;
- trust10 =
- (rp_trust10_t *) neethi_assertion_get_value(assertion, env);
- if (!trust10)
+ trust10 = (rp_trust10_t *)neethi_assertion_get_value(assertion, env);
+ if(!trust10)
{
return AXIS2_FAILURE;
}
rp_secpolicy_set_trust10(secpolicy, env, trust10);
- }
- else if (type == ASSERTION_TYPE_SIGNED_ENCRYPTED_PARTS)
+ }
+ else if(type == ASSERTION_TYPE_SIGNED_ENCRYPTED_PARTS)
{
rp_signed_encrypted_parts_t *signed_encrypted_parts = NULL;
- signed_encrypted_parts =
- (rp_signed_encrypted_parts_t *)
- neethi_assertion_get_value(assertion, env);
- if (signed_encrypted_parts)
+ signed_encrypted_parts = (rp_signed_encrypted_parts_t *)neethi_assertion_get_value(
+ assertion, env);
+ if(signed_encrypted_parts)
{
- if (rp_signed_encrypted_parts_get_signedparts
- (signed_encrypted_parts, env))
+ if(rp_signed_encrypted_parts_get_signedparts(signed_encrypted_parts, env))
{
- rp_secpolicy_set_signed_parts(secpolicy, env,
- signed_encrypted_parts);
+ rp_secpolicy_set_signed_parts(secpolicy, env, signed_encrypted_parts);
}
else
{
- rp_secpolicy_set_encrypted_parts(secpolicy, env,
- signed_encrypted_parts);
+ rp_secpolicy_set_encrypted_parts(secpolicy, env, signed_encrypted_parts);
}
}
else
return AXIS2_FAILURE;
}
- else if (type == ASSERTION_TYPE_RAMPART_CONFIG)
+ else if(type == ASSERTION_TYPE_RAMPART_CONFIG)
{
rp_rampart_config_t *rampart_config = NULL;
- rampart_config =
- (rp_rampart_config_t *)
- neethi_assertion_get_value(assertion, env);
- if (!rampart_config)
+ rampart_config = (rp_rampart_config_t *)neethi_assertion_get_value(assertion, env);
+ if(!rampart_config)
{
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/security_context_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/security_context_token_builder.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/security_context_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/security_context_token_builder.c Tue Aug 18 10:45:16 2009
@@ -24,7 +24,8 @@
/*private functions*/
-axis2_status_t AXIS2_CALL security_context_token_process_alternatives(
+axis2_status_t AXIS2_CALL
+security_context_token_process_alternatives(
const axutil_env_t *env,
neethi_all_t *all,
rp_security_context_token_t * security_context_token);
@@ -59,43 +60,42 @@
qname = NULL;
rp_security_context_token_set_inclusion(security_context_token, env, inclusion_value);
- rp_security_context_token_set_is_secure_conversation_token(
- security_context_token, env, is_secure_conversation_token);
+ rp_security_context_token_set_is_secure_conversation_token(security_context_token, env,
+ is_secure_conversation_token);
if(!axutil_strcmp(sp_ns_uri, RP_SP_NS_11))
{
- rp_security_context_token_set_sc10_security_context_token(
- security_context_token, env, AXIS2_TRUE);
+ rp_security_context_token_set_sc10_security_context_token(security_context_token, env,
+ AXIS2_TRUE);
}
else
{
- rp_security_context_token_set_sc10_security_context_token(
- security_context_token, env, AXIS2_FALSE);
+ rp_security_context_token_set_sc10_security_context_token(security_context_token, env,
+ AXIS2_FALSE);
}
child_node = axiom_node_get_first_element(node, env);
- if (!child_node)
+ if(!child_node)
{
return NULL;
}
children_iter = axiom_element_get_children(element, env, node);
- if (children_iter)
+ if(children_iter)
{
- while (axiom_children_iterator_has_next(children_iter, env))
+ while(axiom_children_iterator_has_next(children_iter, env))
{
child_node = axiom_children_iterator_next(children_iter, env);
- if (child_node)
+ if(child_node)
{
- if (axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
+ if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
- child_element =
- (axiom_element_t *) axiom_node_get_data_element(child_node, env);
- if (child_element)
+ child_element = (axiom_element_t *)axiom_node_get_data_element(child_node, env);
+ if(child_element)
{
axis2_char_t *localname = NULL;
localname = axiom_element_get_localname(child_element, env);
- if (axutil_strcmp(localname, RP_ISSUER) == 0)
+ if(axutil_strcmp(localname, RP_ISSUER) == 0)
{
axis2_char_t *ns = NULL;
axutil_qname_t *node_qname = NULL;
@@ -103,7 +103,7 @@
node_qname = axiom_element_get_qname(child_element, env, child_node);
if(!node_qname)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[neethi] Cannot get qname from element %s.", localname);
return NULL;
}
@@ -111,7 +111,7 @@
ns = axutil_qname_get_uri(node_qname, env);
if(!ns)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[neethi] Cannot get namespace from element %s.", localname);
return NULL;
}
@@ -119,40 +119,38 @@
{
axis2_char_t *issuer = NULL;
issuer = axiom_element_get_text(child_element, env, child_node);
- rp_security_context_token_set_issuer(
- security_context_token, env, issuer);
+ rp_security_context_token_set_issuer(security_context_token, env,
+ issuer);
}
else
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[neethi] Unknown Assertion %s with namespace %s", localname, ns);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[neethi] Unknown Assertion %s with namespace %s", localname,
+ ns);
return NULL;
}
}
else
{
policy = neethi_engine_get_policy(env, child_node, child_element);
- if (!policy)
+ if(!policy)
{
return NULL;
}
- normalized_policy =
- neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
+ normalized_policy = neethi_engine_get_normalize(env, AXIS2_FALSE,
+ policy);
neethi_policy_free(policy, env);
policy = NULL;
- alternatives =
- neethi_policy_get_alternatives(normalized_policy, env);
- component =
- (neethi_operator_t *) axutil_array_list_get(alternatives, env,
- 0);
- all = (neethi_all_t *) neethi_operator_get_value(component, env);
- security_context_token_process_alternatives(env, all, security_context_token);
-
- assertion =
- neethi_assertion_create_with_args(env,
- (AXIS2_FREE_VOID_ARG)rp_security_context_token_free,
- security_context_token,
- ASSERTION_TYPE_SECURITY_CONTEXT_TOKEN);
+ alternatives = neethi_policy_get_alternatives(normalized_policy, env);
+ component = (neethi_operator_t *)axutil_array_list_get(alternatives,
+ env, 0);
+ all = (neethi_all_t *)neethi_operator_get_value(component, env);
+ security_context_token_process_alternatives(env, all,
+ security_context_token);
+
+ assertion = neethi_assertion_create_with_args(env,
+ (AXIS2_FREE_VOID_ARG)rp_security_context_token_free,
+ security_context_token, ASSERTION_TYPE_SECURITY_CONTEXT_TOKEN);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -180,40 +178,38 @@
arraylist = neethi_all_get_policy_components(all, env);
- for (i = 0; i < axutil_array_list_size(arraylist, env); i++)
+ for(i = 0; i < axutil_array_list_size(arraylist, env); i++)
{
- operator =(neethi_operator_t *) axutil_array_list_get(arraylist, env,
- i);
- assertion =
- (neethi_assertion_t *) neethi_operator_get_value(operator, env);
+ operator = (neethi_operator_t *)axutil_array_list_get(arraylist, env, i);
+ assertion = (neethi_assertion_t *)neethi_operator_get_value(operator, env);
type = neethi_assertion_get_type(assertion, env);
if(type == ASSERTION_TYPE_REQUIRE_DERIVED_KEYS_SC10)
{
rp_security_context_token_set_derivedkey(security_context_token, env, DERIVEKEY_NEEDED);
- rp_security_context_token_set_derivedkey_version(
- security_context_token, env, DERIVEKEY_VERSION_SC10);
- }
+ rp_security_context_token_set_derivedkey_version(security_context_token, env,
+ DERIVEKEY_VERSION_SC10);
+ }
else if(type == ASSERTION_TYPE_REQUIRE_DERIVED_KEYS_SC13)
{
rp_security_context_token_set_derivedkey(security_context_token, env, DERIVEKEY_NEEDED);
- rp_security_context_token_set_derivedkey_version(
- security_context_token, env, DERIVEKEY_VERSION_SC13);
- }
+ rp_security_context_token_set_derivedkey_version(security_context_token, env,
+ DERIVEKEY_VERSION_SC13);
+ }
else if(type == ASSERTION_TYPE_REQUIRE_EXTERNAL_URI)
{
rp_security_context_token_set_require_external_uri_ref(security_context_token, env,
- AXIS2_TRUE);
+ AXIS2_TRUE);
}
else if(type == ASSERTION_TYPE_SC10_SECURITY_CONTEXT_TOKEN)
{
rp_security_context_token_set_sc10_security_context_token(security_context_token, env,
- AXIS2_TRUE);
+ AXIS2_TRUE);
}
else if(type == ASSERTION_TYPE_SC13_SECURITY_CONTEXT_TOKEN)
{
rp_security_context_token_set_sc10_security_context_token(security_context_token, env,
- AXIS2_FALSE);
+ AXIS2_FALSE);
}
else if(type == ASSERTION_TYPE_ISSUER)
{
@@ -225,7 +221,8 @@
{
neethi_policy_t *bootstrap_policy = NULL;
bootstrap_policy = (neethi_policy_t *)neethi_assertion_get_value(assertion, env);
- rp_security_context_token_set_bootstrap_policy(security_context_token, env, bootstrap_policy);
+ rp_security_context_token_set_bootstrap_policy(security_context_token, env,
+ bootstrap_policy);
}
else
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signature_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signature_token_builder.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signature_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signature_token_builder.c Tue Aug 18 10:45:16 2009
@@ -25,7 +25,8 @@
/*private functions*/
-axis2_status_t AXIS2_CALL signature_token_process_alternatives(
+axis2_status_t AXIS2_CALL
+signature_token_process_alternatives(
const axutil_env_t *env,
neethi_all_t *all,
rp_property_t *signature_token);
@@ -51,39 +52,32 @@
signature_token = rp_property_create(env);
child_node = axiom_node_get_first_element(node, env);
- if (!child_node)
+ if(!child_node)
{
return NULL;
}
- if (axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
+ if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
- child_element =
- (axiom_element_t *) axiom_node_get_data_element(child_node, env);
- if (child_element)
+ child_element = (axiom_element_t *)axiom_node_get_data_element(child_node, env);
+ if(child_element)
{
policy = neethi_engine_get_policy(env, child_node, child_element);
- if (!policy)
+ if(!policy)
{
return NULL;
}
- normalized_policy =
- neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
+ normalized_policy = neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
neethi_policy_free(policy, env);
policy = NULL;
- alternatives =
- neethi_policy_get_alternatives(normalized_policy, env);
- component =
- (neethi_operator_t *) axutil_array_list_get(alternatives, env,
- 0);
- all = (neethi_all_t *) neethi_operator_get_value(component, env);
+ alternatives = neethi_policy_get_alternatives(normalized_policy, env);
+ component = (neethi_operator_t *)axutil_array_list_get(alternatives, env, 0);
+ all = (neethi_all_t *)neethi_operator_get_value(component, env);
signature_token_process_alternatives(env, all, signature_token);
- assertion =
- neethi_assertion_create_with_args(env,
- (AXIS2_FREE_VOID_ARG)rp_property_free,
- signature_token,
- ASSERTION_TYPE_SIGNATURE_TOKEN);
+ assertion = neethi_assertion_create_with_args(env,
+ (AXIS2_FREE_VOID_ARG)rp_property_free, signature_token,
+ ASSERTION_TYPE_SIGNATURE_TOKEN);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -114,27 +108,22 @@
arraylist = neethi_all_get_policy_components(all, env);
- for (i = 0; i < axutil_array_list_size(arraylist, env); i++)
+ for(i = 0; i < axutil_array_list_size(arraylist, env); i++)
{
- operator =(neethi_operator_t *) axutil_array_list_get(arraylist, env,
- i);
- assertion =
- (neethi_assertion_t *) neethi_operator_get_value(operator, env);
+ operator = (neethi_operator_t *)axutil_array_list_get(arraylist, env, i);
+ assertion = (neethi_assertion_t *)neethi_operator_get_value(operator, env);
value = neethi_assertion_get_value(assertion, env);
type = neethi_assertion_get_type(assertion, env);
- if (value)
+ if(value)
{
- if (type == ASSERTION_TYPE_X509_TOKEN)
+ if(type == ASSERTION_TYPE_X509_TOKEN)
{
rp_x509_token_t *x509_token = NULL;
- x509_token =
- (rp_x509_token_t *) neethi_assertion_get_value(assertion,
- env);
- if (x509_token)
+ x509_token = (rp_x509_token_t *)neethi_assertion_get_value(assertion, env);
+ if(x509_token)
{
- rp_property_set_value(signature_token, env, x509_token,
- RP_PROPERTY_X509_TOKEN);
+ rp_property_set_value(signature_token, env, x509_token, RP_PROPERTY_X509_TOKEN);
}
else
return AXIS2_FAILURE;
@@ -145,7 +134,8 @@
issued_token = (rp_issued_token_t *)neethi_assertion_get_value(assertion, env);
if(issued_token)
{
- rp_property_set_value(signature_token, env, issued_token, RP_PROPERTY_ISSUED_TOKEN);
+ rp_property_set_value(signature_token, env, issued_token,
+ RP_PROPERTY_ISSUED_TOKEN);
}
else
return AXIS2_FAILURE;
@@ -161,15 +151,16 @@
else
return AXIS2_FAILURE;
}
- else if (type == ASSERTION_TYPE_SECURITY_CONTEXT_TOKEN)
+ else if(type == ASSERTION_TYPE_SECURITY_CONTEXT_TOKEN)
{
rp_security_context_token_t *security_context_token = NULL;
- security_context_token =
- (rp_security_context_token_t *) neethi_assertion_get_value(assertion, env);
+ security_context_token = (rp_security_context_token_t *)neethi_assertion_get_value(
+ assertion, env);
- if (security_context_token)
+ if(security_context_token)
{
- rp_property_set_value(signature_token, env, security_context_token, RP_PROPERTY_SECURITY_CONTEXT_TOKEN);
+ rp_property_set_value(signature_token, env, security_context_token,
+ RP_PROPERTY_SECURITY_CONTEXT_TOKEN);
}
else
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c Tue Aug 18 10:45:16 2009
@@ -22,11 +22,13 @@
#include <neethi_all.h>
#include <neethi_engine.h>
-static rp_header_t *AXIS2_CALL rp_signed_encrypted_parts_builder_build_header(
+static rp_header_t *AXIS2_CALL
+rp_signed_encrypted_parts_builder_build_header(
axiom_element_t *element,
const axutil_env_t *env);
-static axis2_status_t AXIS2_CALL rp_signed_encrypted_parts_builder_set_properties(
+static axis2_status_t AXIS2_CALL
+rp_signed_encrypted_parts_builder_set_properties(
axiom_node_t *node,
axiom_element_t *element,
axis2_char_t *local_name,
@@ -45,7 +47,7 @@
rp_signed_encrypted_parts_builder_build(
const axutil_env_t *env,
axiom_node_t *parts,
- axiom_element_t *parts_ele,
+ axiom_element_t *parts_ele,
axis2_bool_t is_signed)
{
rp_signed_encrypted_parts_t *signed_encrypted_parts = NULL;
@@ -54,44 +56,43 @@
axis2_status_t status = AXIS2_SUCCESS;
signed_encrypted_parts = rp_signed_encrypted_parts_create(env);
- if (!signed_encrypted_parts)
+ if(!signed_encrypted_parts)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[neethi] Cannot create signed_encrypted_parts.");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[neethi] Cannot create signed_encrypted_parts.");
return NULL;
}
rp_signed_encrypted_parts_set_signedparts(signed_encrypted_parts, env, is_signed);
children_iter = axiom_element_get_children(parts_ele, env, parts);
- if (children_iter)
+ if(children_iter)
{
- while (axiom_children_iterator_has_next(children_iter, env))
+ while(axiom_children_iterator_has_next(children_iter, env))
{
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
node = axiom_children_iterator_next(children_iter, env);
- if (node)
+ if(node)
{
- if (axiom_node_get_node_type(node, env) == AXIOM_ELEMENT)
+ if(axiom_node_get_node_type(node, env) == AXIOM_ELEMENT)
{
- ele = (axiom_element_t *) axiom_node_get_data_element(node, env);
- if (ele)
+ ele = (axiom_element_t *)axiom_node_get_data_element(node, env);
+ if(ele)
{
local_name = axiom_element_get_localname(ele, env);
- if (local_name)
+ if(local_name)
{
- status = rp_signed_encrypted_parts_builder_set_properties
- (node, ele, local_name, signed_encrypted_parts, env);
- if (status != AXIS2_SUCCESS)
+ status = rp_signed_encrypted_parts_builder_set_properties(node, ele,
+ local_name, signed_encrypted_parts, env);
+ if(status != AXIS2_SUCCESS)
{
- rp_signed_encrypted_parts_free (signed_encrypted_parts, env);
+ rp_signed_encrypted_parts_free(signed_encrypted_parts, env);
signed_encrypted_parts = NULL;
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[neethi] Cannot create signed_encrypted_parts. "
- "Error in processing child element %s", local_name);
- return NULL;
+ "Error in processing child element %s", local_name);
+ return NULL;
}
}
}
@@ -99,9 +100,9 @@
}
}
}
- assertion = neethi_assertion_create_with_args(
- env, (AXIS2_FREE_VOID_ARG)rp_signed_encrypted_parts_free,
- signed_encrypted_parts, ASSERTION_TYPE_SIGNED_ENCRYPTED_PARTS);
+ assertion = neethi_assertion_create_with_args(env,
+ (AXIS2_FREE_VOID_ARG)rp_signed_encrypted_parts_free, signed_encrypted_parts,
+ ASSERTION_TYPE_SIGNED_ENCRYPTED_PARTS);
return assertion;
}
@@ -119,16 +120,16 @@
node_qname = axiom_element_get_qname(element, env, node);
if(!node_qname)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[neethi] Cannot get qname from element %s.", local_name);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[neethi] Cannot get qname from element %s.",
+ local_name);
return AXIS2_FAILURE;
}
ns = axutil_qname_get_uri(node_qname, env);
if(!ns)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[neethi] Cannot get namespace from element %s.", local_name);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[neethi] Cannot get namespace from element %s.",
+ local_name);
return AXIS2_FAILURE;
}
@@ -147,7 +148,7 @@
header = rp_signed_encrypted_parts_builder_build_header(element, env);
if(!header)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[neethi] Failed to process Header Assertion.");
return AXIS2_FAILURE;
}
@@ -165,10 +166,10 @@
return AXIS2_SUCCESS;
}
}
-
+
/* either namespace or assertion is not understood */
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[neethi] Unknown Assertion %s with namespace %s", local_name, ns);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[neethi] Unknown Assertion %s with namespace %s",
+ local_name, ns);
return AXIS2_FAILURE;
}
@@ -183,22 +184,22 @@
name = axiom_element_get_attribute_value_by_name(element, env, RP_NAME);
nspace = axiom_element_get_attribute_value_by_name(element, env, RP_NAMESPACE);
- if (!nspace)
+ if(!nspace)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[neethi] Header assertion should have namespace associated with it.");
return NULL;
}
header = rp_header_create(env);
- if (!header)
+ if(!header)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[neethi] Cannot create rp_header structure. Insufficient memory.");
return NULL;
}
- if (name)
+ if(name)
{
rp_header_set_name(header, env, name);
}
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/supporting_tokens_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/supporting_tokens_builder.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/supporting_tokens_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/supporting_tokens_builder.c Tue Aug 18 10:45:16 2009
@@ -24,12 +24,14 @@
/*private functions*/
-axis2_status_t AXIS2_CALL supporting_tokens_process_alternatives(
+axis2_status_t AXIS2_CALL
+supporting_tokens_process_alternatives(
const axutil_env_t *env,
neethi_all_t *all,
rp_supporting_tokens_t *supporting_tokens);
-axis2_bool_t AXIS2_CALL is_token_assertion(
+axis2_bool_t AXIS2_CALL
+is_token_assertion(
const axutil_env_t *env,
neethi_assertion_type_t type);
@@ -55,29 +57,27 @@
supporting_tokens = rp_supporting_tokens_create(env);
local_name = axiom_element_get_localname(element, env);
- if (local_name)
+ if(local_name)
{
- if (axutil_strcmp(local_name, RP_SIGNED_SUPPORTING_TOKENS) == 0)
+ if(axutil_strcmp(local_name, RP_SIGNED_SUPPORTING_TOKENS) == 0)
{
rp_supporting_tokens_set_type(supporting_tokens, env,
- RP_PROPERTY_SIGNED_SUPPORTING_TOKEN);
+ RP_PROPERTY_SIGNED_SUPPORTING_TOKEN);
}
- else if (axutil_strcmp
- (local_name, RP_SIGNED_ENDORSING_SUPPORTING_TOKENS) == 0)
+ else if(axutil_strcmp(local_name, RP_SIGNED_ENDORSING_SUPPORTING_TOKENS) == 0)
{
rp_supporting_tokens_set_type(supporting_tokens, env,
- RP_PROPERTY_SIGNED_ENDORSING_SUPPORTING_TOKEN);
+ RP_PROPERTY_SIGNED_ENDORSING_SUPPORTING_TOKEN);
}
- else if (axutil_strcmp(local_name, RP_SUPPORTING_TOKENS) == 0)
+ else if(axutil_strcmp(local_name, RP_SUPPORTING_TOKENS) == 0)
{
rp_supporting_tokens_set_type(supporting_tokens, env,
- RP_PROPERTY_SUPPORTING_SUPPORTING_TOKEN);
+ RP_PROPERTY_SUPPORTING_SUPPORTING_TOKEN);
}
- else if (axutil_strcmp
- (local_name, RP_ENDORSING_SUPPORTING_TOKENS) == 0)
+ else if(axutil_strcmp(local_name, RP_ENDORSING_SUPPORTING_TOKENS) == 0)
{
rp_supporting_tokens_set_type(supporting_tokens, env,
- RP_PROPERTY_ENDORSING_SUPPORTING_TOKEN);
+ RP_PROPERTY_ENDORSING_SUPPORTING_TOKEN);
}
else
return NULL;
@@ -86,39 +86,32 @@
return NULL;
child_node = axiom_node_get_first_element(node, env);
- if (!child_node)
+ if(!child_node)
{
return NULL;
}
- if (axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
+ if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
- child_element =
- (axiom_element_t *) axiom_node_get_data_element(child_node, env);
- if (child_element)
+ child_element = (axiom_element_t *)axiom_node_get_data_element(child_node, env);
+ if(child_element)
{
policy = neethi_engine_get_policy(env, child_node, child_element);
- if (!policy)
+ if(!policy)
{
return NULL;
}
- normalized_policy =
- neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
- alternatives =
- neethi_policy_get_alternatives(normalized_policy, env);
+ normalized_policy = neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
+ alternatives = neethi_policy_get_alternatives(normalized_policy, env);
neethi_policy_free(policy, env);
policy = NULL;
- component =
- (neethi_operator_t *) axutil_array_list_get(alternatives, env,
- 0);
- all = (neethi_all_t *) neethi_operator_get_value(component, env);
+ component = (neethi_operator_t *)axutil_array_list_get(alternatives, env, 0);
+ all = (neethi_all_t *)neethi_operator_get_value(component, env);
supporting_tokens_process_alternatives(env, all, supporting_tokens);
- assertion =
- neethi_assertion_create_with_args(env,
- (AXIS2_FREE_VOID_ARG)rp_supporting_tokens_free,
- supporting_tokens,
- ASSERTION_TYPE_SUPPORTING_TOKENS);
+ assertion = neethi_assertion_create_with_args(env,
+ (AXIS2_FREE_VOID_ARG)rp_supporting_tokens_free, supporting_tokens,
+ ASSERTION_TYPE_SUPPORTING_TOKENS);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -148,33 +141,27 @@
arraylist = neethi_all_get_policy_components(all, env);
- for (i = 0; i < axutil_array_list_size(arraylist, env); i++)
+ for(i = 0; i < axutil_array_list_size(arraylist, env); i++)
{
- operator =(neethi_operator_t *) axutil_array_list_get(arraylist, env,
- i);
- assertion =
- (neethi_assertion_t *) neethi_operator_get_value(operator, env);
+ operator = (neethi_operator_t *)axutil_array_list_get(arraylist, env, i);
+ assertion = (neethi_assertion_t *)neethi_operator_get_value(operator, env);
value = neethi_assertion_get_value(assertion, env);
type = neethi_assertion_get_type(assertion, env);
- if (value)
+ if(value)
{
- if (type == ASSERTION_TYPE_ALGORITHM_SUITE)
+ if(type == ASSERTION_TYPE_ALGORITHM_SUITE)
{
rp_algorithmsuite_t *algorithmsuite = NULL;
- algorithmsuite =
- (rp_algorithmsuite_t *)
- neethi_assertion_get_value(assertion, env);
- if (algorithmsuite)
+ algorithmsuite = (rp_algorithmsuite_t *)neethi_assertion_get_value(assertion, env);
+ if(algorithmsuite)
{
- rp_supporting_tokens_set_algorithmsuite(supporting_tokens,
- env,
- algorithmsuite);
+ rp_supporting_tokens_set_algorithmsuite(supporting_tokens, env, algorithmsuite);
}
else
return AXIS2_FAILURE;
}
- else if (is_token_assertion(env, type))
+ else if(is_token_assertion(env, type))
{
rp_property_t *token = NULL;
token = rp_property_create(env);
@@ -195,19 +182,19 @@
const axutil_env_t *env,
neethi_assertion_type_t type)
{
- if (type == ASSERTION_TYPE_USERNAME_TOKEN)
+ if(type == ASSERTION_TYPE_USERNAME_TOKEN)
{
return AXIS2_TRUE;
}
- else if (type == ASSERTION_TYPE_X509_TOKEN)
+ else if(type == ASSERTION_TYPE_X509_TOKEN)
{
return AXIS2_TRUE;
}
- else if (type == ASSERTION_TYPE_ISSUED_TOKEN)
+ else if(type == ASSERTION_TYPE_ISSUED_TOKEN)
{
return AXIS2_TRUE;
}
- else if (type == ASSERTION_TYPE_SAML_TOKEN)
+ else if(type == ASSERTION_TYPE_SAML_TOKEN)
{
return AXIS2_TRUE;
}
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/symmetric_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/symmetric_binding_builder.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/symmetric_binding_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/symmetric_binding_builder.c Tue Aug 18 10:45:16 2009
@@ -24,7 +24,8 @@
/*private functions*/
-axis2_status_t AXIS2_CALL symmetric_binding_process_alternatives(
+axis2_status_t AXIS2_CALL
+symmetric_binding_process_alternatives(
const axutil_env_t *env,
neethi_all_t *all,
rp_symmetric_binding_t *symmetric_binding);
@@ -50,40 +51,32 @@
symmetric_binding = rp_symmetric_binding_create(env);
child_node = axiom_node_get_first_element(node, env);
- if (!child_node)
+ if(!child_node)
{
return NULL;
}
- if (axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
+ if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
- child_element =
- (axiom_element_t *) axiom_node_get_data_element(child_node, env);
- if (child_element)
+ child_element = (axiom_element_t *)axiom_node_get_data_element(child_node, env);
+ if(child_element)
{
policy = neethi_engine_get_policy(env, child_node, child_element);
- if (!policy)
+ if(!policy)
{
return NULL;
}
- normalized_policy =
- neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
- alternatives =
- neethi_policy_get_alternatives(normalized_policy, env);
+ normalized_policy = neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
+ alternatives = neethi_policy_get_alternatives(normalized_policy, env);
neethi_policy_free(policy, env);
policy = NULL;
- component =
- (neethi_operator_t *) axutil_array_list_get(alternatives, env,
- 0);
- all = (neethi_all_t *) neethi_operator_get_value(component, env);
- symmetric_binding_process_alternatives(env, all,
- symmetric_binding);
-
- assertion =
- neethi_assertion_create_with_args(env,
- (AXIS2_FREE_VOID_ARG)rp_symmetric_binding_free,
- symmetric_binding,
- ASSERTION_TYPE_SYMMETRIC_BINDING);
+ component = (neethi_operator_t *)axutil_array_list_get(alternatives, env, 0);
+ all = (neethi_all_t *)neethi_operator_get_value(component, env);
+ symmetric_binding_process_alternatives(env, all, symmetric_binding);
+
+ assertion = neethi_assertion_create_with_args(env,
+ (AXIS2_FREE_VOID_ARG)rp_symmetric_binding_free, symmetric_binding,
+ ASSERTION_TYPE_SYMMETRIC_BINDING);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -117,137 +110,123 @@
commons = rp_binding_commons_create(env);
as_commons = rp_symmetric_asymmetric_binding_commons_create(env);
- for (i = 0; i < axutil_array_list_size(arraylist, env); i++)
+ for(i = 0; i < axutil_array_list_size(arraylist, env); i++)
{
- operator =(neethi_operator_t *) axutil_array_list_get(arraylist, env,
- i);
- assertion =
- (neethi_assertion_t *) neethi_operator_get_value(operator, env);
+ operator = (neethi_operator_t *)axutil_array_list_get(arraylist, env, i);
+ assertion = (neethi_assertion_t *)neethi_operator_get_value(operator, env);
value = neethi_assertion_get_value(assertion, env);
type = neethi_assertion_get_type(assertion, env);
- if (type == ASSERTION_TYPE_PROTECTION_TOKEN)
+ if(type == ASSERTION_TYPE_PROTECTION_TOKEN)
{
rp_property_t *protection_token = NULL;
- protection_token =
- (rp_property_t *) neethi_assertion_get_value(assertion, env);
- if (protection_token)
+ protection_token = (rp_property_t *)neethi_assertion_get_value(assertion, env);
+ if(protection_token)
{
- rp_symmetric_binding_set_protection_token(symmetric_binding,
- env, protection_token);
+ rp_symmetric_binding_set_protection_token(symmetric_binding, env, protection_token);
}
else
return AXIS2_FAILURE;
}
- else if (type == ASSERTION_TYPE_ENCRYPTION_TOKEN)
+ else if(type == ASSERTION_TYPE_ENCRYPTION_TOKEN)
{
rp_property_t *encryption_token = NULL;
- encryption_token =
- (rp_property_t *) neethi_assertion_get_value(assertion, env);
- if (encryption_token)
+ encryption_token = (rp_property_t *)neethi_assertion_get_value(assertion, env);
+ if(encryption_token)
{
- rp_symmetric_binding_set_encryption_token(symmetric_binding,
- env, encryption_token);
+ rp_symmetric_binding_set_encryption_token(symmetric_binding, env, encryption_token);
}
else
return AXIS2_FAILURE;
}
- else if (type == ASSERTION_TYPE_SIGNATURE_TOKEN)
+ else if(type == ASSERTION_TYPE_SIGNATURE_TOKEN)
{
rp_property_t *signature_token = NULL;
- signature_token =
- (rp_property_t *) neethi_assertion_get_value(assertion, env);
- if (signature_token)
+ signature_token = (rp_property_t *)neethi_assertion_get_value(assertion, env);
+ if(signature_token)
{
- rp_symmetric_binding_set_signature_token(symmetric_binding,
- env, signature_token);
+ rp_symmetric_binding_set_signature_token(symmetric_binding, env, signature_token);
}
else
return AXIS2_FAILURE;
}
- else if (type == ASSERTION_TYPE_ALGORITHM_SUITE)
+ else if(type == ASSERTION_TYPE_ALGORITHM_SUITE)
{
rp_algorithmsuite_t *algorithmsuite = NULL;
- algorithmsuite =
- (rp_algorithmsuite_t *) neethi_assertion_get_value(assertion,
- env);
- if (algorithmsuite)
+ algorithmsuite = (rp_algorithmsuite_t *)neethi_assertion_get_value(assertion, env);
+ if(algorithmsuite)
{
- rp_binding_commons_set_algorithmsuite(commons, env,
- algorithmsuite);
+ rp_binding_commons_set_algorithmsuite(commons, env, algorithmsuite);
}
else
return AXIS2_FAILURE;
}
- else if (type == ASSERTION_TYPE_INCLUDE_TIMESTAMP)
+ else if(type == ASSERTION_TYPE_INCLUDE_TIMESTAMP)
{
rp_binding_commons_set_include_timestamp(commons, env, AXIS2_TRUE);
}
- else if (type == ASSERTION_TYPE_LAYOUT)
+ else if(type == ASSERTION_TYPE_LAYOUT)
{
rp_layout_t *layout = NULL;
- layout = (rp_layout_t *) neethi_assertion_get_value(assertion, env);
- if (layout)
+ layout = (rp_layout_t *)neethi_assertion_get_value(assertion, env);
+ if(layout)
{
rp_binding_commons_set_layout(commons, env, layout);
}
else
return AXIS2_FAILURE;
}
- else if (type == ASSERTION_TYPE_ENCRYPT_BEFORE_SIGNING)
+ else if(type == ASSERTION_TYPE_ENCRYPT_BEFORE_SIGNING)
{
- rp_symmetric_asymmetric_binding_commons_set_protection_order
- (as_commons, env, RP_ENCRYPT_BEFORE_SIGNING);
+ rp_symmetric_asymmetric_binding_commons_set_protection_order(as_commons, env,
+ RP_ENCRYPT_BEFORE_SIGNING);
}
- else if (type == ASSERTION_TYPE_SIGN_BEFORE_ENCRYPTING)
+ else if(type == ASSERTION_TYPE_SIGN_BEFORE_ENCRYPTING)
{
- rp_symmetric_asymmetric_binding_commons_set_protection_order
- (as_commons, env, RP_SIGN_BEFORE_ENCRYPTING);
+ rp_symmetric_asymmetric_binding_commons_set_protection_order(as_commons, env,
+ RP_SIGN_BEFORE_ENCRYPTING);
}
- else if (type == ASSERTION_TYPE_ENCRYPT_SIGNATURE)
+ else if(type == ASSERTION_TYPE_ENCRYPT_SIGNATURE)
{
- rp_symmetric_asymmetric_binding_commons_set_signature_protection
- (as_commons, env, AXIS2_TRUE);
+ rp_symmetric_asymmetric_binding_commons_set_signature_protection(as_commons, env,
+ AXIS2_TRUE);
}
- else if (type == ASSERTION_TYPE_PROTECT_TOKENS)
+ else if(type == ASSERTION_TYPE_PROTECT_TOKENS)
{
- rp_symmetric_asymmetric_binding_commons_set_token_protection
- (as_commons, env, AXIS2_TRUE);
+ rp_symmetric_asymmetric_binding_commons_set_token_protection(as_commons, env,
+ AXIS2_TRUE);
}
- else if (type == ASSERTION_TYPE_ONLY_SIGN_ENTIRE_HEADERS_AND_BODY)
+ else if(type == ASSERTION_TYPE_ONLY_SIGN_ENTIRE_HEADERS_AND_BODY)
{
- rp_symmetric_asymmetric_binding_commons_set_entire_headers_and_body_signatures
- (as_commons, env, AXIS2_TRUE);
+ rp_symmetric_asymmetric_binding_commons_set_entire_headers_and_body_signatures(
+ as_commons, env, AXIS2_TRUE);
}
- else if (type == ASSERTION_TYPE_SUPPORTING_TOKENS)
+ else if(type == ASSERTION_TYPE_SUPPORTING_TOKENS)
{
rp_supporting_tokens_t *supporting_tokens = NULL;
- supporting_tokens =
- (rp_supporting_tokens_t *) neethi_assertion_get_value(assertion,
- env);
- if (supporting_tokens)
+ supporting_tokens
+ = (rp_supporting_tokens_t *)neethi_assertion_get_value(assertion, env);
+ if(supporting_tokens)
{
rp_property_type_t type;
type = rp_supporting_tokens_get_type(supporting_tokens, env);
- if (type == RP_PROPERTY_SIGNED_SUPPORTING_TOKEN)
+ if(type == RP_PROPERTY_SIGNED_SUPPORTING_TOKEN)
{
- rp_binding_commons_set_signed_supporting_tokens
- (commons, env, supporting_tokens);
+ rp_binding_commons_set_signed_supporting_tokens(commons, env, supporting_tokens);
}
- else if (type == RP_PROPERTY_SIGNED_ENDORSING_SUPPORTING_TOKEN)
+ else if(type == RP_PROPERTY_SIGNED_ENDORSING_SUPPORTING_TOKEN)
{
- rp_binding_commons_set_signed_endorsing_supporting_tokens
- (commons, env, supporting_tokens);
+ rp_binding_commons_set_signed_endorsing_supporting_tokens(commons, env,
+ supporting_tokens);
}
- else if (type == RP_PROPERTY_SUPPORTING_SUPPORTING_TOKEN)
+ else if(type == RP_PROPERTY_SUPPORTING_SUPPORTING_TOKEN)
{
- rp_binding_commons_set_supporting_tokens
- (commons, env, supporting_tokens);
+ rp_binding_commons_set_supporting_tokens(commons, env, supporting_tokens);
}
- else if (type == RP_PROPERTY_ENDORSING_SUPPORTING_TOKEN)
+ else if(type == RP_PROPERTY_ENDORSING_SUPPORTING_TOKEN)
{
- rp_binding_commons_set_endorsing_supporting_tokens
- (commons, env, supporting_tokens);
+ rp_binding_commons_set_endorsing_supporting_tokens(commons, env,
+ supporting_tokens);
}
else
return AXIS2_FAILURE;
@@ -258,10 +237,9 @@
else
return AXIS2_FAILURE;
}
- rp_symmetric_asymmetric_binding_commons_set_binding_commons(as_commons, env,
- commons);
- rp_symmetric_binding_set_symmetric_asymmetric_binding_commons
- (symmetric_binding, env, as_commons);
+ rp_symmetric_asymmetric_binding_commons_set_binding_commons(as_commons, env, commons);
+ rp_symmetric_binding_set_symmetric_asymmetric_binding_commons(symmetric_binding, env,
+ as_commons);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c Tue Aug 18 10:45:16 2009
@@ -39,42 +39,40 @@
value = neethi_assertion_get_value(assertion, env);
type = neethi_assertion_get_type(assertion, env);
- if (value)
+ if(value)
{
- if (type == ASSERTION_TYPE_USERNAME_TOKEN)
+ if(type == ASSERTION_TYPE_USERNAME_TOKEN)
{
rp_username_token_t *username_token = NULL;
- username_token = (rp_username_token_t *) value;
- rp_property_set_value(token, env, username_token,
- RP_PROPERTY_USERNAME_TOKEN);
+ username_token = (rp_username_token_t *)value;
+ rp_property_set_value(token, env, username_token, RP_PROPERTY_USERNAME_TOKEN);
return AXIS2_SUCCESS;
}
- else if (type == ASSERTION_TYPE_X509_TOKEN)
+ else if(type == ASSERTION_TYPE_X509_TOKEN)
{
rp_x509_token_t *x509_token = NULL;
- x509_token = (rp_x509_token_t *) value;
- rp_property_set_value(token, env, x509_token,
- RP_PROPERTY_X509_TOKEN);
+ x509_token = (rp_x509_token_t *)value;
+ rp_property_set_value(token, env, x509_token, RP_PROPERTY_X509_TOKEN);
return AXIS2_SUCCESS;
}
- else if (type == ASSERTION_TYPE_SAML_TOKEN)
+ else if(type == ASSERTION_TYPE_SAML_TOKEN)
{
rp_saml_token_t *saml_token = NULL;
- saml_token = (rp_saml_token_t *) value;
+ saml_token = (rp_saml_token_t *)value;
rp_property_set_value(token, env, saml_token, RP_PROPERTY_SAML_TOKEN);
return AXIS2_SUCCESS;
}
- else if (type == ASSERTION_TYPE_ISSUED_TOKEN)
+ else if(type == ASSERTION_TYPE_ISSUED_TOKEN)
{
rp_issued_token_t *issued_token = NULL;
- issued_token = (rp_issued_token_t *) value;
+ issued_token = (rp_issued_token_t *)value;
rp_property_set_value(token, env, issued_token, RP_PROPERTY_ISSUED_TOKEN);
return AXIS2_SUCCESS;
}
else
return AXIS2_FAILURE;
}
-
- return AXIS2_FAILURE;
+
+ return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_binding_builder.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_binding_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_binding_builder.c Tue Aug 18 10:45:16 2009
@@ -24,7 +24,8 @@
/*private functions*/
-axis2_status_t AXIS2_CALL transport_binding_process_alternatives(
+axis2_status_t AXIS2_CALL
+transport_binding_process_alternatives(
const axutil_env_t *env,
neethi_all_t *all,
rp_transport_binding_t *transport_binding);
@@ -51,39 +52,32 @@
child_node = axiom_node_get_first_element(node, env);
- if (!child_node)
+ if(!child_node)
{
return NULL;
}
- if (axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
+ if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
- child_element =
- (axiom_element_t *) axiom_node_get_data_element(child_node, env);
- if (child_element)
+ child_element = (axiom_element_t *)axiom_node_get_data_element(child_node, env);
+ if(child_element)
{
policy = neethi_engine_get_policy(env, child_node, child_element);
- if (!policy)
+ if(!policy)
{
return NULL;
}
- normalized_policy =
- neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
+ normalized_policy = neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
neethi_policy_free(policy, env);
policy = NULL;
- alternatives =
- neethi_policy_get_alternatives(normalized_policy, env);
- component =
- (neethi_operator_t *) axutil_array_list_get(alternatives, env,
- 0);
- all = (neethi_all_t *) neethi_operator_get_value(component, env);
+ alternatives = neethi_policy_get_alternatives(normalized_policy, env);
+ component = (neethi_operator_t *)axutil_array_list_get(alternatives, env, 0);
+ all = (neethi_all_t *)neethi_operator_get_value(component, env);
transport_binding_process_alternatives(env, all, transport_binding);
- assertion =
- neethi_assertion_create_with_args(env,
- (AXIS2_FREE_VOID_ARG)rp_transport_binding_free,
- transport_binding,
- ASSERTION_TYPE_TRANSPORT_BINDING);
+ assertion = neethi_assertion_create_with_args(env,
+ (AXIS2_FREE_VOID_ARG)rp_transport_binding_free, transport_binding,
+ ASSERTION_TYPE_TRANSPORT_BINDING);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -116,87 +110,76 @@
arraylist = neethi_all_get_policy_components(all, env);
commons = rp_binding_commons_create(env);
- for (i = 0; i < axutil_array_list_size(arraylist, env); i++)
+ for(i = 0; i < axutil_array_list_size(arraylist, env); i++)
{
- operator =(neethi_operator_t *) axutil_array_list_get(arraylist, env,
- i);
- assertion =
- (neethi_assertion_t *) neethi_operator_get_value(operator, env);
+ operator = (neethi_operator_t *)axutil_array_list_get(arraylist, env, i);
+ assertion = (neethi_assertion_t *)neethi_operator_get_value(operator, env);
value = neethi_assertion_get_value(assertion, env);
type = neethi_assertion_get_type(assertion, env);
- if (type == ASSERTION_TYPE_TRANSPORT_TOKEN)
+ if(type == ASSERTION_TYPE_TRANSPORT_TOKEN)
{
rp_property_t *transport_token = NULL;
- transport_token =
- (rp_property_t *) neethi_assertion_get_value(assertion, env);
- if (transport_token)
+ transport_token = (rp_property_t *)neethi_assertion_get_value(assertion, env);
+ if(transport_token)
{
- rp_transport_binding_set_transport_token(transport_binding, env,
- transport_token);
+ rp_transport_binding_set_transport_token(transport_binding, env, transport_token);
}
else
return AXIS2_FAILURE;
}
- else if (type == ASSERTION_TYPE_ALGORITHM_SUITE)
+ else if(type == ASSERTION_TYPE_ALGORITHM_SUITE)
{
rp_algorithmsuite_t *algorithmsuite = NULL;
- algorithmsuite =
- (rp_algorithmsuite_t *) neethi_assertion_get_value(assertion,
- env);
- if (algorithmsuite)
+ algorithmsuite = (rp_algorithmsuite_t *)neethi_assertion_get_value(assertion, env);
+ if(algorithmsuite)
{
- rp_binding_commons_set_algorithmsuite(commons, env,
- algorithmsuite);
+ rp_binding_commons_set_algorithmsuite(commons, env, algorithmsuite);
}
else
return AXIS2_FAILURE;
}
- else if (type == ASSERTION_TYPE_INCLUDE_TIMESTAMP)
+ else if(type == ASSERTION_TYPE_INCLUDE_TIMESTAMP)
{
rp_binding_commons_set_include_timestamp(commons, env, AXIS2_TRUE);
}
- else if (type == ASSERTION_TYPE_LAYOUT)
+ else if(type == ASSERTION_TYPE_LAYOUT)
{
rp_layout_t *layout = NULL;
- layout = (rp_layout_t *) neethi_assertion_get_value(assertion, env);
- if (layout)
+ layout = (rp_layout_t *)neethi_assertion_get_value(assertion, env);
+ if(layout)
{
rp_binding_commons_set_layout(commons, env, layout);
}
else
return AXIS2_FAILURE;
}
- else if (type == ASSERTION_TYPE_SUPPORTING_TOKENS)
+ else if(type == ASSERTION_TYPE_SUPPORTING_TOKENS)
{
rp_supporting_tokens_t *supporting_tokens = NULL;
- supporting_tokens =
- (rp_supporting_tokens_t *) neethi_assertion_get_value(assertion,
- env);
- if (supporting_tokens)
+ supporting_tokens
+ = (rp_supporting_tokens_t *)neethi_assertion_get_value(assertion, env);
+ if(supporting_tokens)
{
rp_property_type_t type;
type = rp_supporting_tokens_get_type(supporting_tokens, env);
- if (type == RP_PROPERTY_SIGNED_SUPPORTING_TOKEN)
+ if(type == RP_PROPERTY_SIGNED_SUPPORTING_TOKEN)
{
- rp_binding_commons_set_signed_supporting_tokens(commons,
- env,
- supporting_tokens);
+ rp_binding_commons_set_signed_supporting_tokens(commons, env, supporting_tokens);
}
- else if (type == RP_PROPERTY_SIGNED_ENDORSING_SUPPORTING_TOKEN)
+ else if(type == RP_PROPERTY_SIGNED_ENDORSING_SUPPORTING_TOKEN)
{
- rp_binding_commons_set_signed_endorsing_supporting_tokens
- (commons, env, supporting_tokens);
+ rp_binding_commons_set_signed_endorsing_supporting_tokens(commons, env,
+ supporting_tokens);
}
- else if (type == RP_PROPERTY_SUPPORTING_SUPPORTING_TOKEN)
+ else if(type == RP_PROPERTY_SUPPORTING_SUPPORTING_TOKEN)
{
- rp_binding_commons_set_supporting_tokens
- (commons, env, supporting_tokens);
+ rp_binding_commons_set_supporting_tokens(commons, env, supporting_tokens);
}
- else if (type == RP_PROPERTY_ENDORSING_SUPPORTING_TOKEN)
+ else if(type == RP_PROPERTY_ENDORSING_SUPPORTING_TOKEN)
{
- rp_binding_commons_set_endorsing_supporting_tokens
- (commons, env, supporting_tokens);
+ rp_binding_commons_set_endorsing_supporting_tokens(commons, env,
+ supporting_tokens);
}
else
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_token_builder.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_token_builder.c Tue Aug 18 10:45:16 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -26,7 +25,8 @@
/*private functions*/
-axis2_status_t AXIS2_CALL transport_token_process_alternatives(
+axis2_status_t AXIS2_CALL
+transport_token_process_alternatives(
const axutil_env_t * env,
neethi_all_t * all,
rp_property_t * transport_token);
@@ -52,38 +52,31 @@
transport_token = rp_property_create(env);
child_node = axiom_node_get_first_element(node, env);
- if (!child_node)
+ if(!child_node)
{
return NULL;
}
- if (axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
+ if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
- child_element =
- (axiom_element_t *) axiom_node_get_data_element(child_node, env);
- if (child_element)
+ child_element = (axiom_element_t *)axiom_node_get_data_element(child_node, env);
+ if(child_element)
{
policy = neethi_engine_get_policy(env, child_node, child_element);
- if (!policy)
+ if(!policy)
{
return NULL;
}
- normalized_policy =
- neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
+ normalized_policy = neethi_engine_get_normalize(env, AXIS2_FALSE, policy);
policy = NULL;
- alternatives =
- neethi_policy_get_alternatives(normalized_policy, env);
- component =
- (neethi_operator_t *) axutil_array_list_get(alternatives, env,
- 0);
- all = (neethi_all_t *) neethi_operator_get_value(component, env);
+ alternatives = neethi_policy_get_alternatives(normalized_policy, env);
+ component = (neethi_operator_t *)axutil_array_list_get(alternatives, env, 0);
+ all = (neethi_all_t *)neethi_operator_get_value(component, env);
transport_token_process_alternatives(env, all, transport_token);
- assertion =
- neethi_assertion_create_with_args(env,
- (AXIS2_FREE_VOID_ARG)rp_property_free,
- transport_token,
- ASSERTION_TYPE_TRANSPORT_TOKEN);
+ assertion = neethi_assertion_create_with_args(env,
+ (AXIS2_FREE_VOID_ARG)rp_property_free, transport_token,
+ ASSERTION_TYPE_TRANSPORT_TOKEN);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -114,27 +107,23 @@
arraylist = neethi_all_get_policy_components(all, env);
- for (i = 0; i < axutil_array_list_size(arraylist, env); i++)
+ for(i = 0; i < axutil_array_list_size(arraylist, env); i++)
{
- operator =(neethi_operator_t *) axutil_array_list_get(arraylist, env,
- i);
- assertion =
- (neethi_assertion_t *) neethi_operator_get_value(operator, env);
+ operator = (neethi_operator_t *)axutil_array_list_get(arraylist, env, i);
+ assertion = (neethi_assertion_t *)neethi_operator_get_value(operator, env);
value = neethi_assertion_get_value(assertion, env);
type = neethi_assertion_get_type(assertion, env);
- if (value)
+ if(value)
{
- if (type == ASSERTION_TYPE_HTTPS_TOKEN)
+ if(type == ASSERTION_TYPE_HTTPS_TOKEN)
{
rp_https_token_t *https_token = NULL;
- https_token =
- (rp_https_token_t *) neethi_assertion_get_value(assertion,
- env);
- if (https_token)
+ https_token = (rp_https_token_t *)neethi_assertion_get_value(assertion, env);
+ if(https_token)
{
- rp_property_set_value(transport_token, env,
- https_token, RP_PROPERTY_HTTPS_TOKEN);
+ rp_property_set_value(transport_token, env, https_token,
+ RP_PROPERTY_HTTPS_TOKEN);
}
else
return AXIS2_FAILURE;