You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ka...@apache.org on 2007/03/13 10:12:29 UTC
svn commit: r517601 - in /webservices/axis2/trunk/c/rampart/src/util:
rampart_encryption.c rampart_sec_header_builder.c
Author: kaushalye
Date: Tue Mar 13 02:12:28 2007
New Revision: 517601
URL: http://svn.apache.org/viewvc?view=rev&rev=517601
Log:
Code cleaning in Rampart
Modified:
webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c
webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c?view=diff&rev=517601&r1=517600&r2=517601
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c Tue Mar 13 02:12:28 2007
@@ -33,62 +33,6 @@
#include <axis2_key_type.h>
/*Private functions*/
-/*
- * Get encryption parts. Get node list to be encrypted. If nothing is found use the body.
- * If body is specified in the encryption parts encrypt the immediate child of <body>
- **/
-
-/*Private function implementations*/
-/*
-static axis2_status_t
-rampart_enc_get_nodes_to_encrypt(const axis2_env_t *env,
- rampart_actions_t *actions,
- axiom_soap_envelope_t *soap_envelope,
- axis2_array_list_t *nodes_to_encrypt)
-{
- axis2_char_t *encryption_parts = NULL;
-
- encryption_parts = AXIS2_STRDUP(RAMPART_ACTIONS_GET_ENCRYPTION_PARTS(actions, env), env);
- if((!encryption_parts) || (0 == AXIS2_STRCMP(encryption_parts, "") || (0 == AXIS2_STRCMP(encryption_parts, "Body")))){
- axiom_soap_body_t *body = NULL;
- axiom_node_t *body_node = NULL;
- axiom_node_t *body_child_node = NULL;
-
- AXIS2_LOG_INFO(env->log, "[rampart][rampart_encryption] No encryption parts specified. Using the body as default");
- body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
- body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
- body_child_node = axiom_node_get_first_element(body_node, env);
- axis2_array_list_add(nodes_to_encrypt, env, body_child_node);
- return AXIS2_SUCCESS;
- }else if(0 == AXIS2_STRCMP(encryption_parts, "Header")){
- AXIS2_LOG_INFO(env->log, "[rampart][rampart_encryption] We do not encrypt SOAP headers");
- return AXIS2_SUCCESS;
- }else{
- axis2_array_list_t *str_list = NULL;
- axiom_node_t *envelope_node = NULL;
- axiom_node_t *node = NULL;
- axis2_char_t *local_name = NULL;
- int size, i = 0;
-
- AXIS2_LOG_INFO(env->log, "[rampart][rampart_encryption] EncryptionParts specified = %s", encryption_parts);
- envelope_node = AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(soap_envelope, env);
- str_list = axis2_tokenize(env, encryption_parts, ' ');
- size = axis2_array_list_size(str_list, env);
- for(i=0 ; i < size ; i++ ){
- local_name = axis2_array_list_get(str_list, env, i);
- if(0 == AXIS2_STRCMP(local_name, "Security")){
- AXIS2_LOG_INFO(env->log, "[rampart][rampart_encryption] We do not encrypt %s", local_name);
- continue;
- }
- node = oxs_axiom_get_node_by_local_name(env, envelope_node, local_name);
- axis2_array_list_add(nodes_to_encrypt, env, node);
- }
- return AXIS2_SUCCESS;
- }
-
- return AXIS2_SUCCESS;
-}
-*/
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c?view=diff&rev=517601&r1=517600&r2=517601
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c Tue Mar 13 02:12:28 2007
@@ -231,150 +231,3 @@
}
-/*
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rampart_shb_build_message(const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- rampart_context_t *rampart_context,
- axiom_soap_envelope_t *soap_envelope)
-{
- axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
-
- if(soap_envelope){
- axis2_ctx_t *ctx = NULL;
- axiom_soap_header_t *soap_header = NULL;
- axiom_node_t *soap_header_node = NULL;
- axiom_element_t *soap_header_ele = NULL;
- axis2_char_t *items = NULL;
- axiom_soap_header_block_t *sec_header_block = NULL;
- axiom_namespace_t *sec_ns_obj = NULL;
-
- soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_envelope, env);
- soap_header_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
- soap_header_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
- soap_header_node, env);
-
- items = AXIS2_STRDUP(RAMPART_ACTIONS_GET_ITEMS(actions, env), env);
-
- if (!items)
- {
- AXIS2_LOG_INFO(env->log,
- "[rampart][shb] No action items defined. Nothing to do");
- return AXIS2_SUCCESS;
- }
-
- sec_ns_obj = axiom_namespace_create(env, RAMPART_WSSE_XMLNS,
- RAMPART_WSSE);
-
- sec_header_block = AXIOM_SOAP_HEADER_ADD_HEADER_BLOCK(soap_header,
- env, RAMPART_SECURITY, sec_ns_obj);
-
- AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_BOOL(sec_header_block,
- env, AXIS2_TRUE);
-
- if (sec_header_block)
- {
- axis2_char_t* item = NULL;
- axiom_node_t *sec_node = NULL;
- axiom_element_t *sec_ele = NULL;
- axis2_array_list_t *string_list = NULL;
- int i = 0, size = 0;
-
- sec_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(sec_header_block, env);
- sec_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(sec_node, env);
-
- string_list = axis2_tokenize(env, items, ' ');
- if (string_list)
- {
- size = axis2_array_list_size(string_list, env);
- }
-
- ctx = axis2_msg_ctx_get_base(msg_ctx, env);
- for (i = 0; i < size; i++)
- {
- item = axis2_array_list_get(string_list, env, i);
- if (0 == AXIS2_STRCMP(RAMPART_ACTION_ITEMS_USERNAMETOKEN ,
- AXIS2_STRTRIM(env, item, NULL)))
- {
- rampart_username_token_t *username_token = NULL;
- username_token = rampart_username_token_create(env);
-
- AXIS2_LOG_INFO(env->log, "[rampart][shb] building UsernmaeToken");
- status = RAMPART_USERNAME_TOKEN_BUILD(username_token,
- env,
- ctx,
- actions,
- sec_node,
- sec_ns_obj);
- if (status == AXIS2_FAILURE)
- {
- AXIS2_LOG_INFO(env->log, "[rampart][shb] UsernmaeToken build failed. ERROR");
- return AXIS2_FAILURE;
- }
- }
- else if (0 == AXIS2_STRCMP(RAMPART_ACTION_ITEMS_TIMESTAMP,
- AXIS2_STRTRIM(env, item, NULL)))
- {
- rampart_timestamp_token_t *timestamp_token = NULL;
- axis2_char_t *ttl_str = NULL;
- int ttl = -1;
-
- AXIS2_LOG_INFO(env->log, "[rampart][shb] building Timestamp Token");
- ttl_str = RAMPART_ACTIONS_GET_TIME_TO_LIVE(actions, env);
- if(!ttl_str){
- AXIS2_LOG_INFO(env->log, "[rampart][shb] Using default timeToLive value %d",
- RAMPART_TIMESTAMP_TOKEN_DEFAULT_TIME_TO_LIVE);
- ttl = RAMPART_TIMESTAMP_TOKEN_DEFAULT_TIME_TO_LIVE;
- }else {
- ttl = atoi(RAMPART_ACTIONS_GET_TIME_TO_LIVE(actions, env));
- }
-
- timestamp_token = rampart_timestamp_token_create(env);
- status = RAMPART_TIMESTAMP_TOKEN_BUILD(timestamp_token, env,
- ctx, sec_node, sec_ns_obj, ttl);
- if (status == AXIS2_FAILURE){
- AXIS2_LOG_INFO(env->log, "[rampart][shb] Timestamp Token build failed. ERROR");
- return AXIS2_FAILURE;
- }
- }
- else if (0 == AXIS2_STRCMP(RAMPART_ACTION_ITEMS_ENCRYPT,
- AXIS2_STRTRIM(env, item, NULL)))
- {
-
- AXIS2_LOG_INFO(env->log, "[rampart][shb] Encrypting we do not support yet");
- status = rampart_enc_encrypt_message(env, msg_ctx, actions, soap_envelope, sec_node);
- if (status == AXIS2_FAILURE)
- {
- AXIS2_LOG_INFO(env->log, "[rampart][shb] Message encryption failed. ERROR");
- return AXIS2_FAILURE;
- }
-
- }
- else if (0 == AXIS2_STRCMP(RAMPART_ACTION_ITEMS_SIGNATURE,
- AXIS2_STRTRIM(env, item, NULL)))
- {
- AXIS2_LOG_INFO(env->log, "[rampart][shb] Signing message. We do not support yet");
-
- }
- else
- {
- AXIS2_LOG_INFO(env->log, "[rampart][shb] We do not support %s item yet" , item);
- }
- }
-
- }
- else
- {
- AXIS2_LOG_INFO(env->log, "[rampart][shb] Security header block is NULL");
- }
- }else{
- return AXIS2_FAILURE;
- }
-
-
- return AXIS2_SUCCESS;
-}
-*/
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org