Author: kaushalye
Date: Thu Dec 13 07:48:38 2007
New Revision: 603942
URL: http://svn.apache.org/viewvc?rev=603942&view=rev
Log:
Modificatins to rampart_error
Setting security processed result on body encryption
Modified:
webservices/rampart/trunk/c/include/rampart_error.h
webservices/rampart/trunk/c/src/util/rampart_error.c
webservices/rampart/trunk/c/src/util/rampart_policy_validator.c
webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c
webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
Modified: webservices/rampart/trunk/c/include/rampart_error.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_error.h?rev=603942&r1=603941&r2=603942&view=diff
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_error.h (original)
+++ webservices/rampart/trunk/c/include/rampart_error.h Thu Dec 13 07:48:38 2007
@@ -55,7 +55,8 @@
RAMPART_ERROR_IN_POLICY ,
RAMPART_ERROR_LAST
};
-
+
+
axis2_status_t AXIS2_CALL
rampart_error_init();
Modified: webservices/rampart/trunk/c/src/util/rampart_error.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_error.c?rev=603942&r1=603941&r2=603942&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_error.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_error.c Thu Dec 13 07:48:38
2007
@@ -20,73 +20,39 @@
AXIS2_IMPORT extern const axis2_char_t* axutil_error_messages[];
-/**
- * RAMPART_ERROR_NONE = RAMPART_ERROR_CODES_START,
- RAMPART_ERROR_UNSUPPORTED_SECURITY_TOKEN,
- RAMPART_ERROR_INVALID_SECURITY,
- RAMPART_ERROR_INVALID_SECURITY_TOKEN,
- RAMPART_ERROR_FAILED_AUTHENTICATION,
- RAMPART_ERROR_FAILED_CHECK,
- RAMPART_ERROR_SECURITY_TOKEN_UNAVAILABLE,
- RAMPART_ERROR_IN_TIMESTAMP,
- RAMPART_ERROR_IN_USERNAMETOKEN ,
- RAMPART_ERROR_IN_ENCRYPTED_KEY ,
- RAMPART_ERROR_IN_ENCRYPTED_DATA ,
- RAMPART_ERROR_IN_SIGNATURE ,
- RAMPART_ERROR_MSG_REPLAYED ,
- RAMPART_ERROR_IN_POLICY ,
- RAMPART_ERROR_LAST
-
- */
-
axis2_status_t AXIS2_CALL
rampart_error_init()
{
/* A namespace that is not supported by Sandesha2 */
- axutil_error_messages[RAMPART_ERROR_NONE] =
- "Unidentified error in Rampart";
+ axutil_error_messages[RAMPART_ERROR_NONE] = "Unidentified error in
Rampart";
- axutil_error_messages[RAMPART_ERROR_UNSUPPORTED_SECURITY_TOKEN] =
- "Unsupported security token";
+ axutil_error_messages[RAMPART_ERROR_UNSUPPORTED_SECURITY_TOKEN] =
"Unsupported security token";
- axutil_error_messages[RAMPART_ERROR_INVALID_SECURITY]=
- "Invalid security";
+ axutil_error_messages[RAMPART_ERROR_INVALID_SECURITY]= "Invalid security";
- axutil_error_messages[RAMPART_ERROR_INVALID_SECURITY_TOKEN]=
- "Invalid security token";
+ axutil_error_messages[RAMPART_ERROR_INVALID_SECURITY_TOKEN]= "Invalid
security token";
- axutil_error_messages[RAMPART_ERROR_LAST]=
- "Last error of the stack in rampart";
+ axutil_error_messages[RAMPART_ERROR_LAST]= "Last error of the stack in
rampart";
- axutil_error_messages[RAMPART_ERROR_FAILED_AUTHENTICATION]=
- "Failed authentication";
+ axutil_error_messages[RAMPART_ERROR_FAILED_AUTHENTICATION]= "Failed
authentication";
- axutil_error_messages[RAMPART_ERROR_FAILED_CHECK]=
- "Failed check";
+ axutil_error_messages[RAMPART_ERROR_FAILED_CHECK]= "Failed check";
- axutil_error_messages[RAMPART_ERROR_SECURITY_TOKEN_UNAVAILABLE]=
- "Security token unavailable";
+ axutil_error_messages[RAMPART_ERROR_SECURITY_TOKEN_UNAVAILABLE]= "Security
token unavailable";
- axutil_error_messages[RAMPART_ERROR_IN_TIMESTAMP]=
- "Error in timestamp";
+ axutil_error_messages[RAMPART_ERROR_IN_TIMESTAMP]= "Error in timestamp";
- axutil_error_messages[RAMPART_ERROR_IN_USERNAMETOKEN]=
- "Error in username token";
+ axutil_error_messages[RAMPART_ERROR_IN_USERNAMETOKEN]= "Error in username
token";
- axutil_error_messages[RAMPART_ERROR_IN_ENCRYPTED_KEY]=
- "Error in Encrypted Key";
+ axutil_error_messages[RAMPART_ERROR_IN_ENCRYPTED_KEY]= "Error in Encrypted
Key";
- axutil_error_messages[RAMPART_ERROR_IN_ENCRYPTED_DATA]=
- "Error in Encrypted Data";
+ axutil_error_messages[RAMPART_ERROR_IN_ENCRYPTED_DATA]= "Error in
Encrypted Data";
- axutil_error_messages[RAMPART_ERROR_IN_SIGNATURE]=
- "Error in Signature";
+ axutil_error_messages[RAMPART_ERROR_IN_SIGNATURE]= "Error in Signature";
- axutil_error_messages[RAMPART_ERROR_MSG_REPLAYED]=
- "Message probarbly be replayed";
+ axutil_error_messages[RAMPART_ERROR_MSG_REPLAYED]= "Message probarbly be
replayed";
- axutil_error_messages[RAMPART_ERROR_IN_POLICY]=
- "Error in security policy";
+ axutil_error_messages[RAMPART_ERROR_IN_POLICY]= "Error in security policy";
axutil_error_messages[RAMPART_ERROR_LAST]=
"Error last";
Modified: webservices/rampart/trunk/c/src/util/rampart_policy_validator.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_policy_validator.c?rev=603942&r1=603941&r2=603942&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_policy_validator.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_policy_validator.c Thu Dec 13
07:48:38 2007
@@ -157,7 +157,7 @@
node_to_enc = (axiom_node_t *)axutil_array_list_get
(nodes_to_encrypt, env, i);
if(node_to_enc){
- if(0 == axutil_strcmp( OXS_NODE_BODY ,
axiom_util_get_localname(node_to_enc, env))){
+ if(0 == axutil_strcmp( OXS_NODE_BODY ,
axiom_util_get_localname(axiom_node_get_parent(node_to_enc,env), env))){
body_encryption = AXIS2_TRUE;
break;
}
Modified: webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c?rev=603942&r1=603941&r2=603942&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c Thu Dec
13 07:48:38 2007
@@ -446,6 +446,7 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][shb] Asymmetric
Binding failed");
if(axis2_msg_ctx_get_server_side(msg_ctx,env)){
AXIS2_ERROR_SET(env->error, RAMPART_ERROR_INVALID_SECURITY ,
AXIS2_FAILURE);
+ AXIS2_LOG_INFO(env->log, "[rampart][shb] %s",
AXIS2_ERROR_GET_MESSAGE(env->error));
rampart_create_fault_envelope(env,
RAMPART_FAULT_INVALID_SECURITY,
" Asymmetric Binding failed. Check
configurations ", RAMPART_FAULT_IN_POLICY, msg_ctx);
}
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?rev=603942&r1=603941&r2=603942&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
(original)
+++ webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c Thu Dec
13 07:48:38 2007
@@ -585,7 +585,7 @@
rampart_set_security_processed_result(env, msg_ctx,
RAMPART_SPR_SIG_ENCRYPTED, RAMPART_YES);
}
/*Check if the body is encrypted*/
- if(0 == axutil_strcmp(OXS_NODE_BODY ,
axiom_util_get_localname(decrypted_node, env))){
+ if(0 == axutil_strcmp(OXS_NODE_BODY ,
axiom_util_get_localname(axiom_node_get_parent(decrypted_node, env), env))){
rampart_set_security_processed_result(env, msg_ctx,
RAMPART_SPR_BODY_ENCRYPTED, RAMPART_YES);
}
@@ -726,7 +726,7 @@
rampart_set_security_processed_result(env, msg_ctx,
RAMPART_SPR_SIG_ENCRYPTED, RAMPART_YES);
}
/*Check if the body is encrypted*/
- if(0 == axutil_strcmp(OXS_NODE_BODY ,
axiom_util_get_localname(decrypted_node, env))){
+ if(0 == axutil_strcmp(OXS_NODE_BODY ,
axiom_util_get_localname(axiom_node_get_parent(decrypted_node, env), env))){
rampart_set_security_processed_result(env, msg_ctx,
RAMPART_SPR_BODY_ENCRYPTED, RAMPART_YES);
}
