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 ka...@apache.org on 2006/12/11 06:09:26 UTC
svn commit: r485506 - in /webservices/axis2/trunk/c/rampart/src:
handlers/rampart_in_handler.c util/rampart_handler_util.c
util/rampart_sec_header_processor.c util/timestamp_token.c
Author: kaushalye
Date: Sun Dec 10 21:09:23 2006
New Revision: 485506
URL: http://svn.apache.org/viewvc?view=rev&rev=485506
Log:
Fixed JIRA AXIS2C-454
Modified:
webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c
webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c
Modified: webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c?view=diff&rev=485506&r1=485505&r2=485506
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c (original)
+++ webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c Sun Dec 10 21:09:23 2006
@@ -80,7 +80,6 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- rampart_print_info(env, " Starting rampart in handler ");
/*Get SOAP envelope*/
soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c?view=diff&rev=485506&r1=485505&r2=485506
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c Sun Dec 10 21:09:23 2006
@@ -111,7 +111,7 @@
int param_type;
if (!param_x_flow_security)
{
- AXIS2_LOG_INFO(env->log, "param_in_flow_security is NULL");
+ AXIS2_LOG_INFO(env->log, "[rampart][rhu]param_in_flow_security is NULL");
return action_list;
}
@@ -121,7 +121,7 @@
action_list = AXIS2_PARAM_GET_VALUE_LIST(param_x_flow_security, env);
if (!action_list)
{
- AXIS2_LOG_INFO(env->log, " action_list is NULL ... ERROR ");
+ AXIS2_LOG_INFO(env->log, "[rampart][rhu] action_list is NULL ... ERROR ");
}
return action_list;
}
@@ -142,7 +142,7 @@
if (!param_action)
{
- AXIS2_LOG_INFO(env->log, "[rampart][rampart_handler_util] param_action is NULL");
+ AXIS2_LOG_INFO(env->log, "[rampart][rhu] param_action is NULL");
}
param_type = AXIS2_PARAM_GET_PARAM_TYPE(param_action, env);
@@ -151,7 +151,7 @@
param_list = AXIS2_PARAM_GET_VALUE_LIST(param_action, env);
if (!param_list)
{
- AXIS2_LOG_INFO(env->log, "[rampart][rampart_handler_util] param list is NULL");
+ AXIS2_LOG_INFO(env->log, "[rampart][rhu] param list is NULL");
}
size = AXIS2_ARRAY_LIST_SIZE(param_list, env);
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c?view=diff&rev=485506&r1=485505&r2=485506
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c Sun Dec 10 21:09:23 2006
@@ -22,6 +22,7 @@
#include <rampart_username_token.h>
#include <rampart_timestamp_token.h>
#include <rampart_util.h>
+#include <rampart_sec_processed_result.h>
#include <rampart_handler_util.h>
#include <oxs_ctx.h>
#include <oxs_error.h>
Modified: webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c?view=diff&rev=485506&r1=485505&r2=485506
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c Sun Dec 10 21:09:23 2006
@@ -202,14 +202,14 @@
/*Check: TIMESTAMP MUST contain exactly one CREATED*/
if (1 != oxs_axiom_get_number_of_children_with_qname(env, ts_node, RAMPART_SECURITY_TIMESTAMP_CREATED, NULL, NULL))
{
- AXIS2_LOG_INFO(env->log, "Timestamp not valid: Timestamp must contain exactly one Created element");
+ AXIS2_LOG_INFO(env->log, "[rampart][ts]Timestamp not valid: Timestamp must contain exactly one Created element");
return AXIS2_FAILURE;
}
/*Check: TIMESTAMP MUST NOT contain more than one EXPIRES*/
if (1 < oxs_axiom_get_number_of_children_with_qname(env, ts_node, RAMPART_SECURITY_TIMESTAMP_CREATED, NULL, NULL))
{
- AXIS2_LOG_INFO(env->log, "Timestamp not valid: Timestamp must not contain more than one Expires element");
+ AXIS2_LOG_INFO(env->log, "[rampart][ts]Timestamp not valid: Timestamp must not contain more than one Expires element");
return AXIS2_FAILURE;
}
@@ -218,7 +218,7 @@
if (!ts_ele)
{
- AXIS2_LOG_INFO(env->log, "Timestamp not valid: Cannot find timestamp ");
+ AXIS2_LOG_INFO(env->log, "[rampart][ts]Timestamp not valid: Cannot find timestamp ");
return AXIS2_FAILURE;
}
@@ -228,7 +228,7 @@
if (AXIS2_STRCMP(RAMPART_SECURITY_TIMESTAMP_CREATED ,
AXIOM_ELEMENT_GET_LOCALNAME(created_ele, env)) != 0)
{
- AXIS2_LOG_INFO(env->log, "Timestamp not valid: Cannot find created in timestamp element. The first element MUST be CREATED");
+ 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;
}
@@ -239,7 +239,7 @@
validity = rampart_compare_date_time(env, created_val, current_val);
if (validity == AXIS2_FAILURE)
{
- AXIS2_LOG_INFO(env->log, "Timestamp not valid: Created time is not valid");
+ AXIS2_LOG_INFO(env->log, "[rampart][ts]Timestamp not valid: Created time is not valid");
return AXIS2_FAILURE;
}
@@ -247,7 +247,7 @@
expires_node = AXIOM_NODE_GET_NEXT_SIBLING(created_node, env);
if (!expires_node)
{
- AXIS2_LOG_INFO(env->log, "Cannot find expires in timestamp element...");
+ AXIS2_LOG_INFO(env->log, "[rampart][ts]Cannot find expires in timestamp element...");
/*If the expire element is not present, it means that the message will not be expired.*/
return AXIS2_SUCCESS;
}
@@ -255,7 +255,7 @@
if (AXIS2_STRCMP(RAMPART_SECURITY_TIMESTAMP_EXPIRES ,
AXIOM_ELEMENT_GET_LOCALNAME(expires_ele, env)) != 0)
{
- AXIS2_LOG_INFO(env->log, " Timestamp not valid: The second element of timestamp token (if any) MUST be EXPIRES");
+ AXIS2_LOG_INFO(env->log, "[rampart][ts] Timestamp not valid: The second element of timestamp token (if any) MUST be EXPIRES");
return AXIS2_FAILURE;
}
@@ -268,7 +268,7 @@
validity = rampart_compare_date_time(env, current_val, expires_val);
if (validity == AXIS2_FAILURE)
{
- AXIS2_LOG_INFO(env->log, " Timestamp not valid: Timestamp token has expired");
+ AXIS2_LOG_INFO(env->log, "[rampart][ts]Timestamp not valid: Timestamp token has expired");
return AXIS2_FAILURE;
}
AXIS2_LOG_INFO(env->log, "[rampart][ts] Timstamp is valid");
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org