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 ma...@apache.org on 2007/08/01 11:07:56 UTC
svn commit: r561722 -
/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/
Author: manjula
Date: Wed Aug 1 02:07:54 2007
New Revision: 561722
URL: http://svn.apache.org/viewvc?view=rev&rev=561722
Log:
Fixing errors when a policy file has wrong syntaxs.
Modified:
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/asymmetric_binding_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/https_token_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/initiator_token_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/layout_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/recipient_token_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/secpolicy_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/supporting_tokens_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_binding_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_token_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/username_token_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss10_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c Wed Aug 1 02:07:54 2007
@@ -43,7 +43,15 @@
if(child_node)
{
algo_node = axiom_node_get_first_element(child_node, env);
- }
+ if(!algo_node)
+ {
+ return NULL;
+ }
+ }
+ else
+ {
+ return NULL;
+ }
if(axiom_node_get_node_type(algo_node, env) == AXIOM_ELEMENT)
{
@@ -54,7 +62,9 @@
algosuite_string = axiom_element_get_localname(algo_element, env);
if(!algosuite_string)
+ {
return NULL;
+ }
rp_algorithmsuite_set_algosuite(algorithmsuite, env, algosuite_string);
assertion = neethi_assertion_create_with_args(env, (void *)rp_algorithmsuite_free,
algorithmsuite, ASSERTION_TYPE_ALGORITHM_SUITE);
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/asymmetric_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/asymmetric_binding_builder.c?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/asymmetric_binding_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/asymmetric_binding_builder.c Wed Aug 1 02:07:54 2007
@@ -53,6 +53,10 @@
asymmetric_binding = rp_asymmetric_binding_create(env);
child_node = axiom_node_get_first_element(node,env);
+ if(!child_node)
+ {
+ return NULL;
+ }
if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
@@ -72,8 +76,8 @@
all = (neethi_all_t *)neethi_operator_get_value(component ,env);
asymmetric_binding_process_alternatives(env, all, asymmetric_binding);
-
- assertion = neethi_assertion_create_with_args(env, (void *)rp_asymmetric_binding_free, asymmetric_binding, ASSERTION_TYPE_ASSYMMETRIC_BINDING);
+ assertion = neethi_assertion_create_with_args(env, (void *)rp_asymmetric_binding_free,
+ asymmetric_binding, ASSERTION_TYPE_ASSYMMETRIC_BINDING);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -118,7 +122,8 @@
initiator_token = (rp_property_t *)neethi_assertion_get_value(assertion, env);
if(initiator_token)
{
- rp_asymmetric_binding_set_initiator_token(asymmetric_binding, env, initiator_token);
+ rp_asymmetric_binding_set_initiator_token(asymmetric_binding,
+ env, initiator_token);
}
else return AXIS2_FAILURE;
}
@@ -128,7 +133,8 @@
recipient_token = (rp_property_t *)neethi_assertion_get_value(assertion, env);
if(recipient_token)
{
- rp_asymmetric_binding_set_recipient_token(asymmetric_binding, env, recipient_token);
+ rp_asymmetric_binding_set_recipient_token(asymmetric_binding,
+ env, recipient_token);
}
else return AXIS2_FAILURE;
}
@@ -158,23 +164,28 @@
}
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)
{
- 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)
{
- 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)
{
- 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)
{
- 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)
{
@@ -186,11 +197,13 @@
type = rp_supporting_tokens_get_type(supporting_tokens, env);
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)
{
- 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 return AXIS2_FAILURE;
}
@@ -198,8 +211,10 @@
}
else return AXIS2_FAILURE;
}
- rp_symmetric_asymmetric_binding_commons_set_binding_commons(as_commons, env, commons);
- rp_asymmetric_binding_set_symmetric_asymmetric_binding_commons(asymmetric_binding, env, as_commons);
+ rp_symmetric_asymmetric_binding_commons_set_binding_commons(
+ as_commons, env, commons);
+ rp_asymmetric_binding_set_symmetric_asymmetric_binding_commons(
+ asymmetric_binding, env, as_commons);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/https_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/https_token_builder.c?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/https_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/https_token_builder.c Wed Aug 1 02:07:54 2007
@@ -36,23 +36,25 @@
https_token = rp_https_token_create(env);
- value = axiom_element_get_attribute_value_by_name(element, env, RP_REQUIRE_CLIENT_CERTIFICATE);
+ value = axiom_element_get_attribute_value_by_name(
+ element, env, RP_REQUIRE_CLIENT_CERTIFICATE);
if(value)
{
if(axutil_strcmp(value,"true")==0)
{
- rp_https_token_set_require_client_certificate(https_token,env,AXIS2_TRUE);
+ rp_https_token_set_require_client_certificate(
+ https_token, env, AXIS2_TRUE);
}
else if(axutil_strcmp(value,"false")==0)
{
- rp_https_token_set_require_client_certificate(https_token,env,AXIS2_FALSE);
+ rp_https_token_set_require_client_certificate(
+ https_token, env, AXIS2_FALSE);
}
else return NULL;
}
- /*assertion = neethi_assertion_create(env);
- neethi_assertion_set_value(assertion, env, https_token, ASSERTION_TYPE_HTTPS_TOKEN);
- */
- assertion = neethi_assertion_create_with_args(env, (void *)rp_https_token_free, https_token, ASSERTION_TYPE_HTTPS_TOKEN);
+
+ assertion = neethi_assertion_create_with_args(
+ env, (void *)rp_https_token_free, https_token, ASSERTION_TYPE_HTTPS_TOKEN);
return assertion;
}
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/initiator_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/initiator_token_builder.c?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/initiator_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/initiator_token_builder.c Wed Aug 1 02:07:54 2007
@@ -53,7 +53,11 @@
initiator_token = rp_property_create(env);
- child_node = axiom_node_get_first_element(node,env);
+ child_node = axiom_node_get_first_element(node, env);
+ if(!child_node)
+ {
+ return NULL;
+ }
if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
@@ -73,7 +77,8 @@
all = (neethi_all_t *)neethi_operator_get_value(component ,env);
initiator_token_process_alternatives(env, all, initiator_token);
- assertion = neethi_assertion_create_with_args(env, (void *)rp_property_free, initiator_token, ASSERTION_TYPE_INITIATOR_TOKEN);
+ assertion = neethi_assertion_create_with_args(
+ env, (void *)rp_property_free, initiator_token, ASSERTION_TYPE_INITIATOR_TOKEN);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -117,7 +122,8 @@
x509_token = (rp_x509_token_t *)neethi_assertion_get_value(assertion, env);
if(x509_token)
{
- rp_property_set_value(initiator_token, env, x509_token, RP_PROPERTY_X509_TOKEN);
+ rp_property_set_value(
+ initiator_token, env, x509_token, RP_PROPERTY_X509_TOKEN);
}
else return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/layout_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/layout_builder.c?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/layout_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/layout_builder.c Wed Aug 1 02:07:54 2007
@@ -39,12 +39,20 @@
layout = rp_layout_create(env);
- child_node = axiom_node_get_first_element(node,env);
+ child_node = axiom_node_get_first_element(node, env);
if(child_node)
{
layout_node = axiom_node_get_first_element(child_node, env);
- }
+ if(!layout_node)
+ {
+ return NULL;
+ }
+ }
+ else
+ {
+ return NULL;
+ }
if(axiom_node_get_node_type(layout_node, env) == AXIOM_ELEMENT)
{
@@ -57,7 +65,8 @@
if(!local_name)
return NULL;
rp_layout_set_value(layout, env, local_name);
- assertion = neethi_assertion_create_with_args(env, (void *)rp_layout_free, layout, ASSERTION_TYPE_LAYOUT);
+ assertion = neethi_assertion_create_with_args(
+ env, (void *)rp_layout_free, layout, ASSERTION_TYPE_LAYOUT);
return assertion;
}
else return NULL;
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c Wed Aug 1 02:07:54 2007
@@ -31,19 +31,19 @@
AXIS2_ENV_CHECK(env,AXIS2_FALSE);
- node_qname = axiom_element_get_qname(element,env,node);
+ node_qname = axiom_element_get_qname(element, env, node);
if(!node_qname)
{
- axutil_qname_free(qname,env);
+ axutil_qname_free(qname, env);
}
else
{
- qname = axutil_qname_create(env,local_name,RP_SP_NS,RP_SP_PREFIX);
+ qname = axutil_qname_create(env, local_name, RP_SP_NS, RP_SP_PREFIX);
if(!qname)
return AXIS2_FALSE;
}
- if(axutil_qname_equals(qname,env,node_qname))
+ if(axutil_qname_equals(qname, env, node_qname))
{
axutil_qname_free(qname,env);
qname = NULL;
@@ -51,7 +51,7 @@
}
else
{
- axutil_qname_free(qname,env);
+ axutil_qname_free(qname, env);
qname = NULL;
return AXIS2_FALSE;
}
@@ -70,11 +70,11 @@
AXIS2_ENV_CHECK(env,AXIS2_FALSE);
- qname = axutil_qname_create(env,local_name,RP_POLICY_NS,RP_POLICY_PREFIX);
+ qname = axutil_qname_create(env, local_name, RP_POLICY_NS, RP_POLICY_PREFIX);
if(!qname)
return AXIS2_FALSE;
- node_qname = axiom_element_get_qname(element,env,node);
+ node_qname = axiom_element_get_qname(element, env, node);
if(!node_qname)
{
@@ -82,19 +82,19 @@
}
else
{
- qname = axutil_qname_create(env,local_name,RP_POLICY_NS,RP_POLICY_PREFIX);
+ qname = axutil_qname_create(env, local_name, RP_POLICY_NS, RP_POLICY_PREFIX);
if(!qname)
return AXIS2_FALSE;
}
- if(axutil_qname_equals(qname,env,node_qname))
+ if(axutil_qname_equals(qname, env, node_qname))
{
- axutil_qname_free(qname,env);
+ axutil_qname_free(qname, env);
qname = NULL;
return AXIS2_TRUE;
}
else
{
- axutil_qname_free(qname,env);
+ axutil_qname_free(qname, env);
qname = NULL;
return AXIS2_FALSE;
}
@@ -112,9 +112,9 @@
axutil_qname_t *qname = NULL;
axutil_qname_t *node_qname = NULL;
- AXIS2_ENV_CHECK(env,AXIS2_FALSE);
+ AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- node_qname = axiom_element_get_qname(element,env,node);
+ node_qname = axiom_element_get_qname(element, env, node);
if(!node_qname)
{
@@ -122,19 +122,21 @@
}
else
{
- qname = axutil_qname_create(env,local_name,RP_RAMPART_NS,RP_RAMPART_PREFIX);
+ qname = axutil_qname_create(env, local_name, RP_RAMPART_NS, RP_RAMPART_PREFIX);
if(!qname)
+ {
return AXIS2_FALSE;
+ }
}
- if(axutil_qname_equals(qname,env,node_qname))
+ if(axutil_qname_equals(qname, env, node_qname))
{
- axutil_qname_free(qname,env);
+ axutil_qname_free(qname, env);
qname = NULL;
return AXIS2_TRUE;
}
else
{
- axutil_qname_free(qname,env);
+ axutil_qname_free(qname, env);
qname = NULL;
return AXIS2_FALSE;
}
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c Wed Aug 1 02:07:54 2007
@@ -49,7 +49,9 @@
rampart_config = rp_rampart_config_create(env);
if(!rampart_config)
+ {
return NULL;
+ }
children_iter = axiom_element_get_children(config_ele, env, config);
if(children_iter)
@@ -67,21 +69,23 @@
ele = (axiom_element_t*)axiom_node_get_data_element(node, env);
if(ele)
{
- local_name = axiom_element_get_localname(ele,env);
+ local_name = axiom_element_get_localname(ele, env);
if(local_name)
{
- status = rp_rampart_config_builder_populate(env,rampart_config,node,ele,local_name);
+ status = rp_rampart_config_builder_populate(
+ env, rampart_config, node, ele, local_name);
if(status!=AXIS2_SUCCESS)
+ {
return NULL;
+ }
}
}
}
}
}
}
- /*assertion = neethi_assertion_create(env);
- neethi_assertion_set_value(assertion , env, rampart_config, ASSERTION_TYPE_RAMPART_CONFIG);*/
- assertion = neethi_assertion_create_with_args(env, (void *)rp_rampart_config_free, rampart_config, ASSERTION_TYPE_RAMPART_CONFIG);
+ assertion = neethi_assertion_create_with_args(
+ env, (void *)rp_rampart_config_free, rampart_config, ASSERTION_TYPE_RAMPART_CONFIG);
return assertion;
}
@@ -95,105 +99,113 @@
{
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
- if(axutil_strcmp(local_name,RP_USER)==0)
+ if(axutil_strcmp(local_name, RP_USER)==0)
{
- if(rp_match_rampart_config_qname(env,RP_USER,node,element))
+ if(rp_match_rampart_config_qname(env, RP_USER, node, element))
{
axis2_char_t *user = NULL;
- user = axiom_element_get_text(element,env,node);
+ user = axiom_element_get_text(element, env, node);
- return rp_rampart_config_set_user(rampart_config,env,user);
+ return rp_rampart_config_set_user(rampart_config, env, user);
}
else
return AXIS2_FAILURE;
}
- else if(axutil_strcmp(local_name,RP_ENCRYPTION_USER)==0)
+ else if(axutil_strcmp(local_name, RP_ENCRYPTION_USER)==0)
{
- if(rp_match_rampart_config_qname(env,RP_ENCRYPTION_USER,node,element))
+ if(rp_match_rampart_config_qname(env, RP_ENCRYPTION_USER, node, element))
{
axis2_char_t *encryption_user = NULL;
- encryption_user = axiom_element_get_text(element,env,node);
- return rp_rampart_config_set_encryption_user(rampart_config,env,encryption_user);
+ encryption_user = axiom_element_get_text(element, env, node);
+ return rp_rampart_config_set_encryption_user(
+ rampart_config, env, encryption_user);
}
else
return AXIS2_FAILURE;
}
- else if(axutil_strcmp(local_name,RP_PASSWORD_CALLBACK_CLASS)==0)
+ else if(axutil_strcmp(local_name, RP_PASSWORD_CALLBACK_CLASS)==0)
{
- if(rp_match_rampart_config_qname(env,RP_PASSWORD_CALLBACK_CLASS,node,element))
+ if(rp_match_rampart_config_qname(env, RP_PASSWORD_CALLBACK_CLASS, node, element))
{
axis2_char_t *password_callback_class = NULL;
- password_callback_class = axiom_element_get_text(element,env,node);
- return rp_rampart_config_set_password_callback_class(rampart_config,env,password_callback_class);
+ password_callback_class = axiom_element_get_text(element, env, node);
+ return rp_rampart_config_set_password_callback_class(
+ rampart_config, env, password_callback_class);
}
else
return AXIS2_FAILURE;
}
- else if(axutil_strcmp(local_name,RP_AUTHN_MODULE_NAME)==0)
+ else if(axutil_strcmp(local_name, RP_AUTHN_MODULE_NAME)==0)
{
- if(rp_match_rampart_config_qname(env,RP_AUTHN_MODULE_NAME,node,element))
+ if(rp_match_rampart_config_qname(env, RP_AUTHN_MODULE_NAME, node, element))
{
axis2_char_t *authenticate_module = NULL;
- authenticate_module = axiom_element_get_text(element,env,node);
- return rp_rampart_config_set_authenticate_module(rampart_config,env,authenticate_module);
+ authenticate_module = axiom_element_get_text(element, env, node);
+ return rp_rampart_config_set_authenticate_module(
+ rampart_config, env, authenticate_module);
}
else
return AXIS2_FAILURE;
}
- else if(axutil_strcmp(local_name,RP_PASSWORD_TYPE)==0)
+ else if(axutil_strcmp(local_name, RP_PASSWORD_TYPE)==0)
{
- if(rp_match_rampart_config_qname(env,RP_PASSWORD_TYPE,node,element))
+ if(rp_match_rampart_config_qname(env, RP_PASSWORD_TYPE, node, element))
{
axis2_char_t *password_type = NULL;
- password_type = axiom_element_get_text(element,env,node);
- return rp_rampart_config_set_password_type(rampart_config,env,password_type);
+ password_type = axiom_element_get_text(element, env, node);
+ return rp_rampart_config_set_password_type(
+ rampart_config, env, password_type);
}
else
return AXIS2_FAILURE;
}
- else if(axutil_strcmp(local_name,RP_CERTIFICATE)==0)
+ else if(axutil_strcmp(local_name, RP_CERTIFICATE)==0)
{
- if(rp_match_rampart_config_qname(env,RP_CERTIFICATE,node,element))
+ if(rp_match_rampart_config_qname(env, RP_CERTIFICATE, node, element))
{
axis2_char_t *certificate_file = NULL;
- certificate_file = axiom_element_get_text(element,env,node);
- return rp_rampart_config_set_certificate_file(rampart_config,env,certificate_file);
+ certificate_file = axiom_element_get_text(element, env, node);
+ return rp_rampart_config_set_certificate_file(
+ rampart_config, env, certificate_file);
}
else
return AXIS2_FAILURE;
}
- else if(axutil_strcmp(local_name,RP_RECEIVER_CERTIFICATE)==0)
+ else if(axutil_strcmp(local_name, RP_RECEIVER_CERTIFICATE)==0)
{
- if(rp_match_rampart_config_qname(env,RP_RECEIVER_CERTIFICATE,node,element))
+ if(rp_match_rampart_config_qname(env, RP_RECEIVER_CERTIFICATE, node, element))
{
axis2_char_t *receiver_certificate_file = NULL;
- receiver_certificate_file = axiom_element_get_text(element,env,node);
- return rp_rampart_config_set_receiver_certificate_file(rampart_config,env,receiver_certificate_file);
+ receiver_certificate_file = axiom_element_get_text(element, env, node);
+ return rp_rampart_config_set_receiver_certificate_file(
+ rampart_config, env, receiver_certificate_file);
}
else
return AXIS2_FAILURE;
}
- else if(axutil_strcmp(local_name,RP_PRIVATE_KEY)==0)
+ else if(axutil_strcmp(local_name, RP_PRIVATE_KEY)==0)
{
- if(rp_match_rampart_config_qname(env,RP_PRIVATE_KEY,node,element))
+ if(rp_match_rampart_config_qname(env, RP_PRIVATE_KEY, node, element))
{
axis2_char_t *private_key_file = NULL;
- private_key_file = axiom_element_get_text(element,env,node);
- return rp_rampart_config_set_private_key_file(rampart_config,env,private_key_file);
+ private_key_file = axiom_element_get_text(element, env, node);
+ return rp_rampart_config_set_private_key_file(
+ rampart_config, env, private_key_file);
}
else
return AXIS2_FAILURE;
}
- else if(axutil_strcmp(local_name,RP_TIME_TO_LIVE)==0)
+ else if(axutil_strcmp(local_name, RP_TIME_TO_LIVE)==0)
{
- if(rp_match_rampart_config_qname(env,RP_TIME_TO_LIVE,node,element))
+ if(rp_match_rampart_config_qname(env, RP_TIME_TO_LIVE, node, element))
{
axis2_char_t *time_to_live = NULL;
- time_to_live = axiom_element_get_text(element,env,node);
- return rp_rampart_config_set_time_to_live(rampart_config,env,time_to_live);
+ time_to_live = axiom_element_get_text(element, env, node);
+ return rp_rampart_config_set_time_to_live(
+ rampart_config, env, time_to_live);
}
else
return AXIS2_FAILURE;
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?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- 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 Wed Aug 1 02:07:54 2007
@@ -55,6 +55,11 @@
child_node = axiom_node_get_first_element(node,env);
+ if(!child_node)
+ {
+ return NULL;
+ }
+
if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
child_element = (axiom_element_t*)axiom_node_get_data_element(child_node, env);
@@ -73,7 +78,8 @@
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, (void *)rp_property_free, recipient_token, ASSERTION_TYPE_RECIPIENT_TOKEN);
+ assertion = neethi_assertion_create_with_args(
+ env, (void *)rp_property_free, recipient_token, ASSERTION_TYPE_RECIPIENT_TOKEN);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -117,7 +123,8 @@
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/secpolicy_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/secpolicy_builder.c?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/secpolicy_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/secpolicy_builder.c Wed Aug 1 02:07:54 2007
@@ -54,9 +54,8 @@
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)
{
- /*printf("Cannot create secpolicy\n");*/
return NULL;
}
return secpolicy;
@@ -93,14 +92,15 @@
rp_property_t *binding = NULL;
rp_transport_binding_t *transport_binding = NULL;
- transport_binding = (rp_transport_binding_t *)neethi_assertion_get_value(assertion, env);
+ transport_binding = (rp_transport_binding_t *)neethi_assertion_get_value(
+ assertion, env);
if(!transport_binding)
{
- /*printf("Transport Binding not set\n");*/
return AXIS2_FAILURE;
}
binding = rp_property_create(env);
- rp_property_set_value(binding, env, transport_binding, RP_PROPERTY_TRANSPORT_BINDING);
+ rp_property_set_value(binding, env, transport_binding,
+ RP_PROPERTY_TRANSPORT_BINDING);
rp_secpolicy_set_binding(secpolicy, env, binding);
}
else if(type == ASSERTION_TYPE_ASSYMMETRIC_BINDING)
@@ -108,7 +108,8 @@
rp_property_t *binding = NULL;
rp_asymmetric_binding_t *asymmetric_binding = NULL;
- asymmetric_binding = (rp_asymmetric_binding_t *)neethi_assertion_get_value(assertion, env);
+ asymmetric_binding = (rp_asymmetric_binding_t *)neethi_assertion_get_value(
+ assertion, env);
if(!asymmetric_binding)
{
/*printf("Asymmetric Binding not set\n");*/
@@ -121,18 +122,21 @@
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);
+ 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)
{
- 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)
{
- rp_secpolicy_set_endorsing_supporting_tokens(secpolicy, env, supporting_tokens);
+ rp_secpolicy_set_endorsing_supporting_tokens(
+ secpolicy, env, supporting_tokens);
}
else return AXIS2_FAILURE;
}
@@ -145,7 +149,6 @@
wss10 = (rp_wss10_t *)neethi_assertion_get_value(assertion, env);
if(!wss10)
{
- /*printf("WSS not set\n");*/
return AXIS2_FAILURE;
}
wss = rp_property_create(env);
@@ -155,16 +158,19 @@
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);
+ 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))
{
- 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;
@@ -173,10 +179,10 @@
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);
+ rampart_config = (rp_rampart_config_t *)neethi_assertion_get_value(
+ assertion, env);
if(!rampart_config)
{
- /*printf("Rampart_config not set\n");*/
return AXIS2_FAILURE;
}
rp_secpolicy_set_rampart_config(secpolicy, env, rampart_config);
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?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- 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 Wed Aug 1 02:07:54 2007
@@ -57,18 +57,22 @@
signed_encrypted_parts = rp_signed_encrypted_parts_create(env);
if(!signed_encrypted_parts)
+ {
return NULL;
+ }
ele_name = axiom_element_get_localname(parts_ele, env);
if(ele_name)
{
if((axutil_strcmp(ele_name,RP_SIGNED_PARTS)==0))
{
- rp_signed_encrypted_parts_set_signedparts(signed_encrypted_parts, env, AXIS2_TRUE);
+ rp_signed_encrypted_parts_set_signedparts(
+ signed_encrypted_parts, env, AXIS2_TRUE);
}
else if(axutil_strcmp(ele_name,RP_ENCRYPTED_PARTS)==0)
{
- rp_signed_encrypted_parts_set_signedparts(signed_encrypted_parts, env, AXIS2_FALSE);
+ rp_signed_encrypted_parts_set_signedparts(
+ signed_encrypted_parts, env, AXIS2_FALSE);
}
else return NULL;
}
@@ -90,13 +94,14 @@
ele = (axiom_element_t*)axiom_node_get_data_element(node, env);
if(ele)
{
- local_name = axiom_element_get_localname(ele,env);
+ local_name = axiom_element_get_localname(ele, env);
if(local_name)
{
- status = rp_signed_encrypted_parts_builder_set_properties(node,ele,local_name,signed_encrypted_parts,env);
+ 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;
}
}
@@ -105,9 +110,8 @@
}
}
}
- /*assertion = neethi_assertion_create(env);
- neethi_assertion_set_value(assertion, env, signed_encrypted_parts, ASSERTION_TYPE_SIGNED_ENCRYPTED_PARTS);*/
- assertion = neethi_assertion_create_with_args(env, (void *)rp_signed_encrypted_parts_free, signed_encrypted_parts, ASSERTION_TYPE_SIGNED_ENCRYPTED_PARTS);
+ assertion = neethi_assertion_create_with_args(
+ env, (void *)rp_signed_encrypted_parts_free, signed_encrypted_parts, ASSERTION_TYPE_SIGNED_ENCRYPTED_PARTS);
return assertion;
}
@@ -120,34 +124,44 @@
rp_signed_encrypted_parts_t *signed_encrypted_parts,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if(strcmp(local_name,RP_BODY)==0)
+ if(strcmp(local_name, RP_BODY)==0)
{
- if(rp_match_secpolicy_qname(env,RP_BODY,node,element))
+ if(rp_match_secpolicy_qname(env, RP_BODY, node, element))
{
- rp_signed_encrypted_parts_set_body(signed_encrypted_parts,env,AXIS2_TRUE);
+ rp_signed_encrypted_parts_set_body(
+ signed_encrypted_parts, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
else
+ {
return AXIS2_FAILURE;
+ }
}
- else if(strcmp(local_name,RP_HEADER)==0)
+ else if(strcmp(local_name, RP_HEADER)==0)
{
- if(rp_match_secpolicy_qname(env,RP_HEADER,node,element))
+ if(rp_match_secpolicy_qname(env, RP_HEADER, node, element))
{
rp_header_t *header = NULL;
- header = rp_signed_encrypted_parts_builder_build_header(element,env);
+ header = rp_signed_encrypted_parts_builder_build_header(element, env);
if(!header)
+ {
return AXIS2_FAILURE;
-
- return rp_signed_encrypted_parts_add_header(signed_encrypted_parts,env,header);
+ }
+
+ return rp_signed_encrypted_parts_add_header(
+ signed_encrypted_parts, env, header);
}
else
+ {
return AXIS2_FAILURE;
+ }
}
else
+ {
return AXIS2_FAILURE;
+ }
}
rp_header_t *AXIS2_CALL
@@ -165,18 +179,21 @@
if(!header)
return NULL;
- name = axiom_element_get_attribute_value_by_name(element,env,RP_NAME);
- namespace = axiom_element_get_attribute_value_by_name(element,env,RP_NAMESPACE);
+ name = axiom_element_get_attribute_value_by_name(element, env, RP_NAME);
+ namespace = axiom_element_get_attribute_value_by_name(
+ element, env, RP_NAMESPACE);
if(!namespace)
{
- rp_header_free(header,env);
+ rp_header_free(header, env);
header = NULL;
return NULL;
}
if(name)
- rp_header_set_name(header,env,name);
-
- rp_header_set_namespace(header,env,namespace);
+ {
+ rp_header_set_name(header, env, name);
+ }
+
+ rp_header_set_namespace(header, env, namespace);
return header;
}
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?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- 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 Wed Aug 1 02:07:54 2007
@@ -64,17 +64,23 @@
{
if(axutil_strcmp(local_name, RP_SIGNED_SUPPORTING_TOKENS) == 0)
{
- rp_supporting_tokens_set_type(supporting_tokens, env, RP_PROPERTY_SIGNED_SUPPORTING_TOKEN);
+ rp_supporting_tokens_set_type(
+ supporting_tokens, env, RP_PROPERTY_SIGNED_SUPPORTING_TOKEN);
}
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_supporting_tokens_set_type(
+ supporting_tokens, env, RP_PROPERTY_SIGNED_ENDORSING_SUPPORTING_TOKEN);
}
else return NULL;
}
else return NULL;
child_node = axiom_node_get_first_element(node,env);
+ if(!child_node)
+ {
+ return NULL;
+ }
if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
@@ -86,7 +92,7 @@
{
return NULL;
}
- normalized_policy = neethi_engine_get_normalize(env, AXIS2_FALSE,policy);
+ 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;
@@ -94,7 +100,8 @@
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, (void *)rp_supporting_tokens_free, supporting_tokens, ASSERTION_TYPE_SUPPORTING_TOKENS);
+ assertion = neethi_assertion_create_with_args(
+ env, (void *)rp_supporting_tokens_free, supporting_tokens, ASSERTION_TYPE_SUPPORTING_TOKENS);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -134,10 +141,12 @@
if(type == ASSERTION_TYPE_ALGORITHM_SUITE)
{
rp_algorithmsuite_t *algorithmsuite = NULL;
- algorithmsuite = (rp_algorithmsuite_t *)neethi_assertion_get_value(assertion, env);
+ 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;
}
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?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c Wed Aug 1 02:07:54 2007
@@ -47,14 +47,16 @@
{
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);
+ rp_property_set_value(token, env, username_token,
+ RP_PROPERTY_USERNAME_TOKEN);
return AXIS2_SUCCESS;
}
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);
+ rp_property_set_value(token, env, x509_token,
+ RP_PROPERTY_X509_TOKEN);
return AXIS2_SUCCESS;
}
else
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?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- 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 Wed Aug 1 02:07:54 2007
@@ -54,6 +54,11 @@
child_node = axiom_node_get_first_element(node,env);
+ if(!child_node)
+ {
+ return NULL;
+ }
+
if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
child_element = (axiom_element_t*)axiom_node_get_data_element(child_node, env);
@@ -67,12 +72,15 @@
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);
+ 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, (void *)rp_transport_binding_free, transport_binding, ASSERTION_TYPE_TRANSPORT_BINDING);
+ assertion = neethi_assertion_create_with_args(
+ env, (void *)rp_transport_binding_free, transport_binding, ASSERTION_TYPE_TRANSPORT_BINDING);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -113,17 +121,20 @@
if(type == ASSERTION_TYPE_TRANSPORT_TOKEN)
{
rp_property_t *transport_token = NULL;
- transport_token = (rp_property_t *)neethi_assertion_get_value(assertion, env);
+ 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)
{
rp_algorithmsuite_t *algorithmsuite = NULL;
- algorithmsuite = (rp_algorithmsuite_t *)neethi_assertion_get_value(assertion, env);
+ algorithmsuite = (rp_algorithmsuite_t *)neethi_assertion_get_value(
+ assertion, env);
if(algorithmsuite)
{
rp_binding_commons_set_algorithmsuite(commons, env, algorithmsuite);
@@ -147,18 +158,21 @@
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);
+ 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)
{
- 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)
{
- 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 return AXIS2_FAILURE;
}
@@ -167,6 +181,7 @@
else return AXIS2_FAILURE;
}
- rp_transport_binding_set_binding_commons(transport_binding, env, commons);
+ rp_transport_binding_set_binding_commons(
+ transport_binding, env, commons);
return AXIS2_SUCCESS;
}
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?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- 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 Wed Aug 1 02:07:54 2007
@@ -54,6 +54,10 @@
transport_token = rp_property_create(env);
child_node = axiom_node_get_first_element(node,env);
+ if(!child_node)
+ {
+ return NULL;
+ }
if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
@@ -72,7 +76,8 @@
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, (void *)rp_property_free, transport_token, ASSERTION_TYPE_TRANSPORT_TOKEN);
+ assertion = neethi_assertion_create_with_args(
+ env, (void *)rp_property_free, transport_token, ASSERTION_TYPE_TRANSPORT_TOKEN);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -104,7 +109,8 @@
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);
+ assertion = (neethi_assertion_t *)neethi_operator_get_value(
+ operator, env);
value = neethi_assertion_get_value(assertion, env);
type = neethi_assertion_get_type(assertion, env);
@@ -113,10 +119,12 @@
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);
+ 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;
}
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/username_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/username_token_builder.c?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/username_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/username_token_builder.c Wed Aug 1 02:07:54 2007
@@ -53,26 +53,28 @@
neethi_policy_t *normalized_policy = NULL;
username_token = rp_username_token_create(env);
- qname = axutil_qname_create(env,RP_INCLUDE_TOKEN,RP_SP_NS,RP_SP_PREFIX);
+ qname = axutil_qname_create(env, RP_INCLUDE_TOKEN, RP_SP_NS, RP_SP_PREFIX);
- inclusion_value = axiom_element_get_attribute_value(element,env,qname);
+ inclusion_value = axiom_element_get_attribute_value(element, env, qname);
- axutil_qname_free(qname,env);
+ axutil_qname_free(qname, env);
qname = NULL;
- rp_username_token_set_inclusion(username_token,env,inclusion_value);
+ rp_username_token_set_inclusion(username_token, env, inclusion_value);
- child_node = axiom_node_get_first_element(node,env);
+ child_node = axiom_node_get_first_element(node, env);
if(!child_node)
{
assertion = neethi_assertion_create(env);
- neethi_assertion_set_value(assertion, env, username_token, ASSERTION_TYPE_USERNAME_TOKEN);
+ neethi_assertion_set_value(assertion, env,
+ username_token, ASSERTION_TYPE_USERNAME_TOKEN);
return assertion;
}
if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
- child_element = (axiom_element_t*)axiom_node_get_data_element(child_node, env);
+ 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);
@@ -88,7 +90,8 @@
all = (neethi_all_t *)neethi_operator_get_value(component ,env);
username_token_process_alternatives(env, all, username_token);
- assertion = neethi_assertion_create_with_args(env, (void *)rp_username_token_free, username_token, ASSERTION_TYPE_USERNAME_TOKEN);
+ assertion = neethi_assertion_create_with_args(
+ env, (void *)rp_username_token_free, username_token, ASSERTION_TYPE_USERNAME_TOKEN);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -118,8 +121,10 @@
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);
@@ -127,11 +132,13 @@
{
if(type == ASSERTION_TYPE_WSS_USERNAME_TOKEN_10)
{
- rp_username_token_set_useUTprofile10(username_token,env,AXIS2_TRUE);
+ rp_username_token_set_useUTprofile10(
+ username_token, env, AXIS2_TRUE);
}
else if(type == ASSERTION_TYPE_WSS_USERNAME_TOKEN_11)
{
- rp_username_token_set_useUTprofile11(username_token,env,AXIS2_TRUE);
+ rp_username_token_set_useUTprofile11(
+ username_token, env, AXIS2_TRUE);
}
else return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss10_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss10_builder.c?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss10_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss10_builder.c Wed Aug 1 02:07:54 2007
@@ -53,7 +53,11 @@
wss10 = rp_wss10_create(env);
child_node = axiom_node_get_first_element(node,env);
-
+ if(!child_node)
+ {
+ return NULL;
+ }
+
if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
child_element = (axiom_element_t*)axiom_node_get_data_element(child_node, env);
@@ -72,7 +76,8 @@
all = (neethi_all_t *)neethi_operator_get_value(component ,env);
wss10_process_alternatives(env, all, wss10);
- assertion = neethi_assertion_create_with_args(env, (void *)rp_wss10_free, wss10, ASSERTION_TYPE_WSS10);
+ assertion = neethi_assertion_create_with_args(
+ env, (void *)rp_wss10_free, wss10, ASSERTION_TYPE_WSS10);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -102,26 +107,32 @@
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_MUST_SUPPORT_REF_KEY_IDENTIFIER)
{
- rp_wss10_set_must_support_ref_key_identifier(wss10,env,AXIS2_TRUE);
+ rp_wss10_set_must_support_ref_key_identifier(
+ wss10, env, AXIS2_TRUE);
}
else if(type == ASSERTION_TYPE_MUST_SUPPORT_REF_ISSUER_SERIAL)
{
- rp_wss10_set_must_support_ref_issuer_serial(wss10,env,AXIS2_TRUE);
+ rp_wss10_set_must_support_ref_issuer_serial(
+ wss10, env, AXIS2_TRUE);
}
else if(type == ASSERTION_TYPE_MUST_SUPPORT_REF_EXTERNAL_URI)
{
- rp_wss10_set_must_support_ref_external_uri(wss10,env,AXIS2_TRUE);
+ rp_wss10_set_must_support_ref_external_uri(
+ wss10, env, AXIS2_TRUE);
}
else if(type == ASSERTION_TYPE_MUST_SUPPORT_REF_EMBEDDED_TOKEN)
{
- rp_wss10_set_must_support_ref_embedded_token(wss10,env,AXIS2_TRUE);
+ rp_wss10_set_must_support_ref_embedded_token(
+ wss10, env, AXIS2_TRUE);
}
else return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c?view=diff&rev=561722&r1=561721&r2=561722
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c Wed Aug 1 02:07:54 2007
@@ -54,16 +54,20 @@
/*axutil_array_list_t *temp = NULL;*/
x509_token = rp_x509_token_create(env);
- qname = axutil_qname_create(env,RP_INCLUDE_TOKEN,RP_SP_NS,RP_SP_PREFIX);
+ qname = axutil_qname_create(env, RP_INCLUDE_TOKEN, RP_SP_NS, RP_SP_PREFIX);
- inclusion_value = axiom_element_get_attribute_value(element,env,qname);
+ inclusion_value = axiom_element_get_attribute_value(element, env, qname);
- axutil_qname_free(qname,env);
+ axutil_qname_free(qname, env);
qname = NULL;
- rp_x509_token_set_inclusion(x509_token,env,inclusion_value);
+ rp_x509_token_set_inclusion(x509_token, env, inclusion_value);
- child_node = axiom_node_get_first_element(node,env);
+ child_node = axiom_node_get_first_element(node, env);
+ if(!child_node)
+ {
+ return NULL;
+ }
if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
{
@@ -83,7 +87,8 @@
all = (neethi_all_t *)neethi_operator_get_value(component ,env);
x509_token_process_alternatives(env, all, x509_token);
- assertion = neethi_assertion_create_with_args(env, (void *)rp_x509_token_free, x509_token, ASSERTION_TYPE_X509_TOKEN);
+ assertion = neethi_assertion_create_with_args(
+ env, (void *)rp_x509_token_free, x509_token, ASSERTION_TYPE_X509_TOKEN);
neethi_policy_free(normalized_policy, env);
normalized_policy = NULL;
@@ -118,31 +123,33 @@
if(type == ASSERTION_TYPE_REQUIRE_KEY_IDENTIFIRE_REFERENCE)
{
- rp_x509_token_set_require_key_identifier_reference(x509_token, env, AXIS2_TRUE);
+ rp_x509_token_set_require_key_identifier_reference(
+ x509_token, env, AXIS2_TRUE);
}
else if(type == ASSERTION_TYPE_REQUIRE_ISSUER_SERIAL_REFERENCE)
{
- rp_x509_token_set_require_issuer_serial_reference(x509_token, env, AXIS2_TRUE);
+ rp_x509_token_set_require_issuer_serial_reference(
+ x509_token, env, AXIS2_TRUE);
}
if(type == ASSERTION_TYPE_REQUIRE_EMBEDDED_TOKEN_REFERENCE)
{
- rp_x509_token_set_require_embedded_token_reference(x509_token, env, AXIS2_TRUE);
+ rp_x509_token_set_require_embedded_token_reference(
+ x509_token, env, AXIS2_TRUE);
}
else if(type == ASSERTION_TYPE_REQUIRE_THUMBPRINT_REFERENCE)
{
- rp_x509_token_set_require_thumb_print_reference(x509_token, env, AXIS2_TRUE);
+ rp_x509_token_set_require_thumb_print_reference(
+ x509_token, env, AXIS2_TRUE);
}
else if(type == ASSERTION_TYPE_WSS_X509_V1_TOKEN_10)
{
- rp_x509_token_set_token_version_and_type(x509_token, env, RP_WSS_X509_V1_TOKEN_10);
+ rp_x509_token_set_token_version_and_type(
+ x509_token, env, RP_WSS_X509_V1_TOKEN_10);
}
else if(type == ASSERTION_TYPE_WSS_X509_V3_TOKEN_10)
{
- /*neethi_assertion_free(assertion, env);
- assertion = NULL;*/
- /*neethi_operator_free(operator, env);
- operator = NULL;*/
- rp_x509_token_set_token_version_and_type(x509_token, env, RP_WSS_X509_V3_TOKEN_10);
+ rp_x509_token_set_token_version_and_type(
+ x509_token, env, RP_WSS_X509_V3_TOKEN_10);
}
else return AXIS2_FAILURE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org