You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by ka...@apache.org on 2007/06/08 06:25:18 UTC
svn commit: r545402 - in /webservices/rampart/trunk/c/src/util:
rampart_context.c rampart_engine.c rampart_rd_record.c
rampart_replay_detector.c rampart_sec_header_processor.c
rampart_signature.c rampart_timestamp_token.c rampart_util.c
Author: kaushalye
Date: Thu Jun 7 21:25:17 2007
New Revision: 545402
URL: http://svn.apache.org/viewvc?view=rev&rev=545402
Log:
Code cleaning
Modified:
webservices/rampart/trunk/c/src/util/rampart_context.c
webservices/rampart/trunk/c/src/util/rampart_engine.c
webservices/rampart/trunk/c/src/util/rampart_rd_record.c
webservices/rampart/trunk/c/src/util/rampart_replay_detector.c
webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
webservices/rampart/trunk/c/src/util/rampart_signature.c
webservices/rampart/trunk/c/src/util/rampart_timestamp_token.c
webservices/rampart/trunk/c/src/util/rampart_util.c
Modified: webservices/rampart/trunk/c/src/util/rampart_context.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_context.c?view=diff&rev=545402&r1=545401&r2=545402
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_context.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_context.c Thu Jun 7 21:25:17 2007
@@ -337,8 +337,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rampart_context_set_replay_detect_function(rampart_context_t *rampart_context,
- const axutil_env_t *env,
- rampart_is_replayed_fn is_replayed_function)
+ const axutil_env_t *env,
+ rampart_is_replayed_fn is_replayed_function)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, is_replayed_function, AXIS2_FAILURE);
@@ -376,8 +376,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rampart_context_set_rd_val(rampart_context_t *rampart_context,
- const axutil_env_t *env,
- axis2_char_t *rd_val)
+ const axutil_env_t *env,
+ axis2_char_t *rd_val)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -978,34 +978,34 @@
AXIS2_LOG_INFO(env->log, "[rampart][rampart_context] We do not sign or encrypt security namespace elements");
return AXIS2_FAILURE;
}
-
- local_name = (axis2_char_t*)rp_element_get_name(element,env);
-/* if(!local_name)
- {
- axutil_array_list_t *soap_header_blocks = NULL;
- int i = 0;
- soap_header_blocks = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header,env,namespace);
- if(!soap_header_blocks)
- return AXIS2_FAILURE;
- for(i=0 ; i<axutil_array_list_size(soap_header_blocks,env); i++)
+ local_name = (axis2_char_t*)rp_element_get_name(element,env);
+ /* if(!local_name)
{
- axiom_soap_header_block_t *header_block = NULL;
- axiom_node_t *node = NULL;
- header_block = (axiom_soap_header_block_t *)axutil_array_list_get(soap_header_blocks,env,i);
- if(header_block)
+ axutil_array_list_t *soap_header_blocks = NULL;
+ int i = 0;
+ soap_header_blocks = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header,env,namespace);
+ if(!soap_header_blocks)
+ return AXIS2_FAILURE;
+
+ for(i=0 ; i<axutil_array_list_size(soap_header_blocks,env); i++)
{
- node = axiom_soap_header_block_get_base_node(header_block,env);
- if(node)
+ axiom_soap_header_block_t *header_block = NULL;
+ axiom_node_t *node = NULL;
+ header_block = (axiom_soap_header_block_t *)axutil_array_list_get(soap_header_blocks,env,i);
+ if(header_block)
{
- axutil_array_list_add(nodes_to_encrypt_or_sign,env,node);
- return AXIS2_SUCCESS;
+ node = axiom_soap_header_block_get_base_node(header_block,env);
+ if(node)
+ {
+ axutil_array_list_add(nodes_to_encrypt_or_sign,env,node);
+ return AXIS2_SUCCESS;
+ }
}
+
}
-
}
- }
-*/ if(local_name)
+ */ if(local_name)
{
if(axutil_strcmp(local_name,"Security")==0)
{
@@ -1023,7 +1023,7 @@
{
axiom_element_t *ret_node_ele = NULL;
ret_node_ele = (axiom_element_t *)
- axiom_node_get_data_element(ret_node, env);
+ axiom_node_get_data_element(ret_node, env);
if(ret_node_ele)
{
axiom_namespace_t *ns = NULL;
@@ -1635,7 +1635,7 @@
encrypted_parts = rp_secpolicy_get_encrypted_parts(rampart_context->secpolicy,env);
if(!encrypted_parts)
- {
+ {
encrypted_items = rp_secpolicy_get_encrypted_items(rampart_context->secpolicy,env);
if(!encrypted_items)
return AXIS2_FALSE;
@@ -1649,7 +1649,7 @@
}
else
return AXIS2_TRUE;
- }
+ }
}
parts = rp_signed_encrypted_parts_get_headers(encrypted_parts,env);
if(!parts || (axutil_array_list_size(parts,env)==0))
@@ -1673,12 +1673,12 @@
const axutil_env_t *env)
{
rp_signed_encrypted_parts_t *signed_parts = NULL;
- rp_signed_encrypted_items_t *signed_items = NULL;
+ rp_signed_encrypted_items_t *signed_items = NULL;
axutil_array_list_t *parts = NULL;
signed_parts = rp_secpolicy_get_signed_parts(rampart_context->secpolicy,env);
if(!signed_parts)
- {
+ {
signed_items = rp_secpolicy_get_signed_items(rampart_context->secpolicy,env);
if(!signed_items)
return AXIS2_FALSE;
@@ -1692,7 +1692,7 @@
}
else
return AXIS2_TRUE;
- }
+ }
}
parts = rp_signed_encrypted_parts_get_headers(signed_parts,env);
if(!parts || (axutil_array_list_size(parts,env)==0))
@@ -1731,7 +1731,7 @@
if(asym_binding)
{
if(is_inpath)
- {
+ {
if((for_encryption && server_side) || (!for_encryption && !server_side))
{
return rp_asymmetric_binding_get_recipient_token(asym_binding,env);
@@ -1747,13 +1747,13 @@
if((server_side && for_encryption) || (!for_encryption && !server_side))
{
return rp_asymmetric_binding_get_initiator_token(asym_binding,env);
- }
+ }
else if((server_side && !for_encryption)|| (for_encryption && !server_side))
{
return rp_asymmetric_binding_get_recipient_token(asym_binding,env);
- }
+ }
else return NULL;
- }
+ }
}
else
return NULL;
@@ -1982,19 +1982,19 @@
if(is_inpath)
{
include = ((axutil_strcmp(inclusion,RP_INCLUDE_ALWAYS)==0)||
- (axutil_strcmp(inclusion,RP_INCLUDE_ONCE)==0)||
- (axutil_strcmp(inclusion,RP_INCLUDE_ALWAYS_TO_RECIPIENT)==0));
+ (axutil_strcmp(inclusion,RP_INCLUDE_ONCE)==0)||
+ (axutil_strcmp(inclusion,RP_INCLUDE_ALWAYS_TO_RECIPIENT)==0));
}
else
include = (axutil_strcmp(inclusion,RP_INCLUDE_ALWAYS)==0);
}
else
- {
+ {
if(!is_inpath)
- {
+ {
include = ((axutil_strcmp(inclusion,RP_INCLUDE_ALWAYS)==0)||
- (axutil_strcmp(inclusion,RP_INCLUDE_ONCE)==0)||
- (axutil_strcmp(inclusion,RP_INCLUDE_ALWAYS_TO_RECIPIENT)==0));
+ (axutil_strcmp(inclusion,RP_INCLUDE_ONCE)==0)||
+ (axutil_strcmp(inclusion,RP_INCLUDE_ALWAYS_TO_RECIPIENT)==0));
}
else
include = (axutil_strcmp(inclusion,RP_INCLUDE_ALWAYS)==0);
Modified: webservices/rampart/trunk/c/src/util/rampart_engine.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_engine.c?view=diff&rev=545402&r1=545401&r2=545402
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_engine.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_engine.c Thu Jun 7 21:25:17 2007
@@ -41,23 +41,23 @@
neethi_policy_t *AXIS2_CALL
build_policy(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- axis2_bool_t is_inflow);
+ const axutil_env_t *env,
+ axis2_msg_ctx_t *msg_ctx,
+ axis2_bool_t is_inflow);
axis2_status_t AXIS2_CALL
set_rampart_user_properties(
- const axutil_env_t *env,
- rampart_context_t *rampart_context);
+ const axutil_env_t *env,
+ rampart_context_t *rampart_context);
-AXIS2_EXTERN rampart_context_t *AXIS2_CALL
+AXIS2_EXTERN rampart_context_t *AXIS2_CALL
rampart_engine_build_configuration(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- axis2_bool_t is_inflow)
+ const axutil_env_t *env,
+ axis2_msg_ctx_t *msg_ctx,
+ axis2_bool_t is_inflow)
{
rp_secpolicy_t *secpolicy = NULL;
@@ -75,11 +75,11 @@
if(is_server_side || !is_inflow)
{
policy = build_policy(env, msg_ctx, is_inflow);
- if(!policy)
+ if(!policy)
{
AXIS2_LOG_INFO(env->log, "[rampart][engine] Policy Creation failed. ");
return NULL;
- }
+ }
}
else
{
@@ -91,8 +91,8 @@
AXIS2_LOG_INFO(env->log, "[rampart][rampart_engine] Cannot get saved rampart_context");
return NULL;
}
- }
-
+ }
+
secpolicy = rp_secpolicy_builder_build(env, policy);
if(!secpolicy)
{
@@ -116,9 +116,9 @@
{
AXIS2_LOG_INFO(env->log, "[rampart][engine] User property creation fails ");
return NULL;
- }
+ }
}
-
+
if(!is_server_side)
{
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx,env);
@@ -135,13 +135,13 @@
return NULL;
}
property = axutil_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
- AXIS2_FALSE, (void *)rampart_context_free, rampart_context);
+ AXIS2_FALSE, (void *)rampart_context_free, rampart_context);
axis2_ctx_set_property(ctx, env, RAMPART_CONTEXT, property);
}
else
{ /*Server side only*/
- /*We set our default impl of replay detection function*/
+ /*We set our default impl of replay detection function*/
if(is_inflow)
{
rampart_context_set_replay_detect_function(rampart_context, env, rampart_replay_detector_with_linked_list/*rampart_replay_detector_default*/);
@@ -151,11 +151,11 @@
}
-neethi_policy_t *AXIS2_CALL
+neethi_policy_t *AXIS2_CALL
build_policy(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- axis2_bool_t is_inflow)
+ const axutil_env_t *env,
+ axis2_msg_ctx_t *msg_ctx,
+ axis2_bool_t is_inflow)
{
axis2_svc_t *svc = NULL;
@@ -201,7 +201,7 @@
AXIS2_LOG_INFO(env->log, "[rampart][rampart_engine] axis2 description is NULL.");
return NULL;
}
-
+
policy_include = axis2_desc_get_policy_include(desc, env);
if(!policy_include)
{
@@ -216,16 +216,16 @@
AXIS2_LOG_INFO(env->log, "[rampart][rampart_engine] Policy is NULL.");
return NULL;
}
-
+
return service_policy;
}
-axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
set_rampart_user_properties(
- const axutil_env_t *env,
- rampart_context_t *rampart_context)
+ const axutil_env_t *env,
+ rampart_context_t *rampart_context)
{
rampart_callback_t* password_callback_module = NULL;
@@ -233,13 +233,13 @@
axis2_char_t *pwcb_module_name = NULL;
axis2_char_t *authn_provider_name = NULL;
axis2_status_t status = AXIS2_SUCCESS;
-
+
status = rampart_context_set_user_from_file(rampart_context,env);
if(status!=AXIS2_SUCCESS)
{
return AXIS2_FAILURE;
}
-
+
status = rampart_context_set_ttl_from_file(rampart_context,env);
if(status!=AXIS2_SUCCESS)
{
Modified: webservices/rampart/trunk/c/src/util/rampart_rd_record.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_rd_record.c?view=diff&rev=545402&r1=545401&r2=545402
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_rd_record.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_rd_record.c Thu Jun 7 21:25:17 2007
@@ -96,7 +96,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rampart_rd_record_free(rampart_rd_record_t *rd_record,
- const axutil_env_t *env)
+ const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
Modified: webservices/rampart/trunk/c/src/util/rampart_replay_detector.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_replay_detector.c?view=diff&rev=545402&r1=545401&r2=545402
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_replay_detector.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_replay_detector.c Thu Jun 7 21:25:17 2007
@@ -52,7 +52,7 @@
count = axutil_linked_list_size(linked_list, env);
for(i=0; i<count; i++){
axis2_char_t *tmp_id = NULL;
-
+
tmp_id = (axis2_char_t*)axutil_linked_list_get(linked_list, env, i);
if(0 == axutil_strcmp(id, tmp_id)){
return AXIS2_TRUE;
@@ -66,7 +66,7 @@
AXIS2_EXTERN axutil_linked_list_t *AXIS2_CALL
rampart_replay_detector_get_ll_db(const axutil_env_t *env,
- axis2_msg_ctx_t* msg_ctx)
+ axis2_msg_ctx_t* msg_ctx)
{
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_ctx_t *ctx = NULL;
@@ -90,18 +90,18 @@
if(property)
{
/*Get the DB*/
- ll = (axutil_linked_list_t*)axutil_property_get_value(property, env);
- return ll;
+ ll = (axutil_linked_list_t*)axutil_property_get_value(property, env);
+ return ll;
}else{
- ll = rampart_replay_detector_set_ll_db(env, ctx);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][rrd] Cannot get the property %s from msg_ctx. Creating a new DB", RAMPART_RD_DB_PROP);
- return ll;
+ ll = rampart_replay_detector_set_ll_db(env, ctx);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][rrd] Cannot get the property %s from msg_ctx. Creating a new DB", RAMPART_RD_DB_PROP);
+ return ll;
}
}
AXIS2_EXTERN axutil_hash_t *AXIS2_CALL
rampart_replay_detector_get_default_db(const axutil_env_t *env,
- axis2_msg_ctx_t* msg_ctx)
+ axis2_msg_ctx_t* msg_ctx)
{
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_ctx_t *ctx = NULL;
@@ -125,24 +125,24 @@
if(property)
{
/*Get the DB*/
- hash = (axutil_hash_t*)axutil_property_get_value(property, env);
- return hash;
+ hash = (axutil_hash_t*)axutil_property_get_value(property, env);
+ return hash;
}else{
- hash = rampart_replay_detector_set_default_db(env, ctx);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][rrd] Cannot get the property %s from msg_ctx. Creating a new DB", RAMPART_RD_DB_PROP);
- return hash;
+ hash = rampart_replay_detector_set_default_db(env, ctx);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][rrd] Cannot get the property %s from msg_ctx. Creating a new DB", RAMPART_RD_DB_PROP);
+ return hash;
}
}
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
rampart_replay_detector_get_ts(const axutil_env_t *env,
- axis2_msg_ctx_t* msg_ctx)
+ axis2_msg_ctx_t* msg_ctx)
{
axis2_char_t *ts = NULL;
axutil_hash_t *hash = NULL;
/*Get timestamp from security processed results*/
- hash = rampart_get_all_security_processed_results(env, msg_ctx);
+ hash = rampart_get_all_security_processed_results(env, msg_ctx);
ts = axutil_hash_get(hash, RAMPART_SPR_TS_CREATED, AXIS2_HASH_KEY_STRING);
return ts;
@@ -165,16 +165,16 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
rampart_replay_detector_is_overdue(const axutil_env_t *env,
- int valid_duration,
- const axis2_char_t *val)
+ int valid_duration,
+ const axis2_char_t *val)
{
axutil_date_time_comp_result_t res = AXIS2_DATE_TIME_COMP_RES_UNKNOWN;
axutil_date_time_t *dt1 = NULL;
axutil_date_time_t *dt2 = NULL;
- dt1 = axutil_date_time_create_with_offset(env, valid_duration);
+ dt1 = axutil_date_time_create_with_offset(env, valid_duration);
dt2 = axutil_date_time_create(env);
-
+
axutil_date_time_deserialize_date_time(dt2, env, val);
/*If the dt1(LIMIT) < dt2(TS) this returns expired*/
/*printf("Comparing time(TIME, TS) %s > %s\n", axutil_date_time_serialize_date_time(dt1, env), axutil_date_time_serialize_date_time(dt2, env));*/
@@ -189,7 +189,7 @@
/*Public functions*/
AXIS2_EXTERN axutil_hash_t *AXIS2_CALL
rampart_replay_detector_set_default_db(const axutil_env_t *env,
- axis2_ctx_t *ctx)
+ axis2_ctx_t *ctx)
{
axutil_hash_t *hash_db = NULL;
axutil_property_t *hash_db_prop = NULL;
@@ -210,7 +210,7 @@
AXIS2_EXTERN axutil_linked_list_t *AXIS2_CALL
rampart_replay_detector_set_ll_db(const axutil_env_t *env,
- axis2_ctx_t *ctx)
+ axis2_ctx_t *ctx)
{
axutil_linked_list_t *ll_db = NULL;
axutil_property_t *ll_db_prop = NULL;
@@ -231,7 +231,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rampart_replay_detector_final_cleanup(const axutil_env_t *env,
- axis2_msg_ctx_t* msg_ctx)
+ axis2_msg_ctx_t* msg_ctx)
{
axutil_linked_list_t *ll = NULL;
int count = 0;
@@ -251,8 +251,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rampart_replay_detector_with_linked_list(const axutil_env_t *env,
- axis2_msg_ctx_t* msg_ctx,
- rampart_context_t *rampart_context)
+ axis2_msg_ctx_t* msg_ctx,
+ rampart_context_t *rampart_context)
{
axutil_linked_list_t *ll = NULL;
const axis2_char_t *msg_id = NULL;
@@ -260,8 +260,8 @@
const axis2_char_t *addr_msg_id = NULL;
int max_rcds = RAMPART_RD_DEF_MAX_RCDS;
axis2_status_t status = AXIS2_FAILURE;
-
- /* By using just Timestamps we dont need addressing. But there is a chance that
+
+ /* By using just Timestamps we dont need addressing. But there is a chance that
* two messages might generated exactly at the same time*/
ts = rampart_replay_detector_get_ts( env, msg_ctx);
@@ -281,7 +281,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] NO msg_id specified, using default = %s", msg_id);
}
- ll = rampart_replay_detector_get_ll_db(env, msg_ctx);
+ ll = rampart_replay_detector_get_ll_db(env, msg_ctx);
if(!ll){
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][rrd] Cannot get the linked-list for replay detection from msg_ctx");
return AXIS2_FAILURE;
@@ -297,7 +297,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] Using the default max_rcds %d\n", max_rcds );
/*printf("[rampart][rrd] Using the default max_rcds %d\n", max_rcds);*/
}
-
+
/*If the table already have the same key it's a replay*/
/*if(AXIS2_TRUE == axutil_linked_list_contains(ll, env, (void*)msg_id)){*/
if(AXIS2_TRUE == rampart_replay_detector_linked_list_contains(ll, env, (void*)msg_id)){
@@ -308,12 +308,12 @@
/*Clean up clean up.... :)*/
while(axutil_linked_list_size(ll, env) > max_rcds){
- axis2_char_t *tmp_msg_id = NULL;
- tmp_msg_id = (axis2_char_t*)axutil_linked_list_remove_first(ll, env);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] Deleting record %s\n", tmp_msg_id );
- /*printf("[rampart][rrd] Deleting record %s\n", tmp_msg_id );*/
- AXIS2_FREE(env->allocator, tmp_msg_id);
- tmp_msg_id = NULL;
+ axis2_char_t *tmp_msg_id = NULL;
+ tmp_msg_id = (axis2_char_t*)axutil_linked_list_remove_first(ll, env);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] Deleting record %s\n", tmp_msg_id );
+ /*printf("[rampart][rrd] Deleting record %s\n", tmp_msg_id );*/
+ AXIS2_FREE(env->allocator, tmp_msg_id);
+ tmp_msg_id = NULL;
}
/*Add current record*/
@@ -328,7 +328,7 @@
return AXIS2_FAILURE;
}
}
-
+
}
@@ -343,21 +343,21 @@
const axis2_char_t *ts = NULL;
int valid_duration = RAMPART_RD_DEF_VALID_DURATION;
- msg_id = axis2_msg_ctx_get_wsa_message_id(msg_ctx, env);
+ msg_id = axis2_msg_ctx_get_wsa_message_id(msg_ctx, env);
if(!msg_id){
msg_id = "MSG-ID";/*This has to be changed to generate the hash*/
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] NO msg_id specified, using default = %s", msg_id);
}
- ts = rampart_replay_detector_get_ts( env, msg_ctx);
- /*Get the DB*/
+ ts = rampart_replay_detector_get_ts( env, msg_ctx);
+ /*Get the DB*/
hash = rampart_replay_detector_get_default_db(env, msg_ctx);
if(!hash){
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][rrd] Cannot get the default database for replay detection from msg_ctx");
return AXIS2_FAILURE;
}else{
-
+
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] Number of records =%d", axutil_hash_count(hash));
-
+
/*Get the valid duration for a record*/
if(rampart_context_get_rd_val(rampart_context, env)){
valid_duration = axutil_atoi(rampart_context_get_rd_val(rampart_context, env));
@@ -365,19 +365,19 @@
}else{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] Using the default valid duration %d\n", valid_duration );
}
-
+
/*If the table already have the same key it's a replay*/
if(AXIS2_TRUE == axutil_hash_contains_key(hash, env, msg_id)){
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,"[rampart][rrd] For ID=%s, a replay detected", msg_id);
- return AXIS2_FAILURE;
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,"[rampart][rrd] For ID=%s, a replay detected", msg_id);
+ return AXIS2_FAILURE;
}
-
+
/*Iterate thru records*/
/*printf("Iterate--------------------=%d\n", axutil_hash_count(hash));*/
for (hi = axutil_hash_first(hash, env); hi; hi = axutil_hash_next(env, hi)) {
axis2_char_t *id = NULL; /*Temp record id (of i'th recored)*/
axis2_char_t *tmp_ts = NULL; /*Temp time stamp (of i'th recored))*/
-
+
axutil_hash_this(hi, (void*)&id, NULL, (void*)&tmp_ts);
/*tmp_ts = (axis2_char_t*)val;*/
if(!id){
@@ -388,10 +388,10 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] (id, tmp_ts) %s = %s\n", (axis2_char_t*)id, (axis2_char_t*)tmp_ts);
/*Clean up old records*/
-
- if(AXIS2_TRUE == rampart_replay_detector_is_overdue(env , -valid_duration, tmp_ts)){ /*TODO*/
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] Removing old record (id, tmp_ts) = (%s , %s)\n",
- (axis2_char_t*)id, (axis2_char_t*)tmp_ts);
+
+ if(AXIS2_TRUE == rampart_replay_detector_is_overdue(env , -valid_duration, tmp_ts)){ /*TODO*/
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] Removing old record (id, tmp_ts) = (%s , %s)\n",
+ (axis2_char_t*)id, (axis2_char_t*)tmp_ts);
/*printf("Deleting record... , (id = tmp_ts) %s = %s\n", id, tmp_ts);*/
axutil_hash_set(hash, id, AXIS2_HASH_KEY_STRING, NULL);
if(id){
@@ -403,14 +403,14 @@
tmp_ts = NULL;
}
}
- }/*eof for loop*/
+ }/*eof for loop*/
/*If not replayed then we will insert the new record to the DB*/
/*NOTE: We do a strdup here, 'coz we dont need these values to be lost once the msg cycle is over.*/
/*printf("Adding record... , (id = ts) %s = %s\n", msg_id, ts);*/
axutil_hash_set(hash, axutil_strdup(env, msg_id), AXIS2_HASH_KEY_STRING, axutil_strdup(env, ts));
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] Adding record key=%s to the DB", msg_id);
return AXIS2_SUCCESS;
- }
+ }
}
Modified: webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c?view=diff&rev=545402&r1=545401&r2=545402
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c Thu Jun 7 21:25:17 2007
@@ -57,35 +57,37 @@
return AXIS2_FALSE;
local_name = axiom_element_get_localname(node_ele,env);
- if(!local_name)
+ if(!local_name){
return AXIS2_FALSE;
-
- if(axutil_strcmp(local_name,RAMPART_SECURITY_TIMESTAMP)==0)
+ }
+ if(axutil_strcmp(local_name,RAMPART_SECURITY_TIMESTAMP)==0){
qname = axutil_qname_create(env,local_name,RAMPART_WSU_XMLNS,RAMPART_WSU);
-
- else if(axutil_strcmp(local_name,RAMPART_SECURITY_USERNAMETOKEN)==0)
+ }
+ else if(axutil_strcmp(local_name,RAMPART_SECURITY_USERNAMETOKEN)==0){
qname = axutil_qname_create(env,local_name,RAMPART_WSSE_XMLNS,RAMPART_WSSE);
-
- else if(axutil_strcmp(local_name,OXS_NODE_ENCRYPTED_KEY)==0)
+ }
+ else if(axutil_strcmp(local_name,OXS_NODE_ENCRYPTED_KEY)==0){
qname = axutil_qname_create(env,local_name,OXS_ENC_NS,OXS_XENC);
-
- else if(axutil_strcmp(local_name,OXS_NODE_ENCRYPTED_DATA)==0)
+ }
+ else if(axutil_strcmp(local_name,OXS_NODE_ENCRYPTED_DATA)==0){
qname = axutil_qname_create(env,local_name,OXS_ENC_NS,OXS_XENC);
-
- else if(axutil_strcmp(local_name,OXS_NODE_SIGNATURE)==0)
+ }
+ else if(axutil_strcmp(local_name,OXS_NODE_SIGNATURE)==0){
qname = axutil_qname_create(env,local_name,OXS_DSIG_NS,OXS_DS);
-
- else if(axutil_strcmp(local_name,OXS_NODE_BINARY_SECURITY_TOKEN)==0)
+ }
+ else if(axutil_strcmp(local_name,OXS_NODE_BINARY_SECURITY_TOKEN)==0){
return AXIS2_FALSE;
-
- else if(axutil_strcmp(local_name,OXS_NODE_REFERENCE_LIST)==0)
+ }
+ else if(axutil_strcmp(local_name,OXS_NODE_REFERENCE_LIST)==0){
return AXIS2_FALSE;
-
- else return AXIS2_FALSE;
-
- if(!qname)
+ }
+ else{
return AXIS2_FALSE;
+ }
+ if(!qname){
+ return AXIS2_FALSE;
+ }
node_qname = axiom_element_get_qname(node_ele,env,node);
if(!node_qname)
@@ -751,6 +753,7 @@
AXIS2_LOG_INFO(env->log, "[rampart][shp] Process security header");
+
if((rampart_context_get_binding_type(rampart_context,env)) == RP_BINDING_ASYMMETRIC)
{
if(rampart_context_is_encrypt_before_sign(rampart_context,env))
@@ -938,7 +941,7 @@
else if((rampart_context_get_binding_type(rampart_context,env)) == RP_BINDING_TRANSPORT)
{
axis2_status_t status = AXIS2_FAILURE;
-
+
status = rampart_shp_process_timestamptoken(env,msg_ctx,rampart_context,sec_node);
if(status!=AXIS2_SUCCESS){
return status;
@@ -970,7 +973,7 @@
AXIS2_LOG_INFO(env->log, "[rampart][shp] Security header element processing, DONE ");
/*Do the action accordingly*/
return AXIS2_SUCCESS;
-
+
}
else
{
Modified: webservices/rampart/trunk/c/src/util/rampart_signature.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_signature.c?view=diff&rev=545402&r1=545401&r2=545402
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_signature.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_signature.c Thu Jun 7 21:25:17 2007
@@ -151,7 +151,7 @@
server_side = axis2_msg_ctx_get_server_side(msg_ctx,env);
nodes_to_sign = axutil_array_list_create(env,0);
-/* status = rampart_context_get_nodes_to_sign(rampart_context,env,soap_envelope,nodes_to_sign);*/
+ /* status = rampart_context_get_nodes_to_sign(rampart_context,env,soap_envelope,nodes_to_sign);*/
status = rampart_sig_get_nodes_to_sign(rampart_context,env,soap_envelope,nodes_to_sign);
if((status!=AXIS2_SUCCESS)||(axutil_array_list_size(nodes_to_sign,env)==0))
@@ -339,10 +339,10 @@
{
AXIS2_LOG_INFO(env->log, "[rampart][rampart_signature] Cannot load the private key from pfx file.");
return AXIS2_FAILURE;
- }
- }
+ }
+ }
else if(oxs_util_get_format_by_file_extension(env, prv_key_file)==OXS_ASYM_CTX_FORMAT_PEM)
- {
+ {
prvkey = oxs_key_mgr_load_private_key_from_pem_file(env, prv_key_file,password);
if(!prvkey)
{
@@ -354,7 +354,7 @@
{
AXIS2_LOG_INFO(env->log, "[rampart][rampart_signature] Unknown Private key format.");
return AXIS2_FAILURE;
- }
+ }
}
/*These properties will set for creating signed info element*/
oxs_sign_ctx_set_private_key(sign_ctx, env, prvkey);
Modified: webservices/rampart/trunk/c/src/util/rampart_timestamp_token.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_timestamp_token.c?view=diff&rev=545402&r1=545401&r2=545402
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_timestamp_token.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_timestamp_token.c Thu Jun 7 21:25:17 2007
@@ -128,7 +128,7 @@
created_node = axiom_node_get_first_element(ts_node, env);
created_ele = (axiom_element_t*)axiom_node_get_data_element(created_node, env);
if (axutil_strcmp(RAMPART_SECURITY_TIMESTAMP_CREATED ,
- axiom_element_get_localname(created_ele, env)) != 0)
+ axiom_element_get_localname(created_ele, env)) != 0)
{
AXIS2_LOG_INFO(env->log, "[rampart][ts]Timestamp not valid: Cannot find created in timestamp element. The first element MUST be CREATED");
return AXIS2_FAILURE;
@@ -155,7 +155,7 @@
}
expires_ele = (axiom_element_t*)axiom_node_get_data_element(expires_node, env);
if (axutil_strcmp(RAMPART_SECURITY_TIMESTAMP_EXPIRES ,
- axiom_element_get_localname(expires_ele, env)) != 0)
+ axiom_element_get_localname(expires_ele, env)) != 0)
{
AXIS2_LOG_INFO(env->log, "[rampart][ts] Timestamp not valid: The second element of timestamp token (if any) MUST be EXPIRES");
return AXIS2_FAILURE;
Modified: webservices/rampart/trunk/c/src/util/rampart_util.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_util.c?view=diff&rev=545402&r1=545401&r2=545402
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_util.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_util.c Thu Jun 7 21:25:17 2007
@@ -143,7 +143,7 @@
axis2_char_t *callback_module_name)
{
rampart_callback_t *cb = NULL;
-
+
cb = (rampart_callback_t*)rampart_load_module(env, callback_module_name);
if (!cb)
{