Author: kaushalye
Date: Wed Mar 28 00:21:22 2007
New Revision: 523207
URL: http://svn.apache.org/viewvc?view=rev&rev=523207
Log:
Removing rampart_action references in the code base.
Modified:
webservices/rampart/trunk/c/include/rampart_encryption.h
webservices/rampart/trunk/c/include/rampart_handler_util.h
webservices/rampart/trunk/c/include/rampart_sec_header_processor.h
webservices/rampart/trunk/c/src/util/Makefile.am
webservices/rampart/trunk/c/src/util/rampart_encryption.c
webservices/rampart/trunk/c/src/util/rampart_handler_util.c
webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c
webservices/rampart/trunk/c/src/util/username_token.c
Modified: webservices/rampart/trunk/c/include/rampart_encryption.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_encryption.h?view=diff&rev=523207&r1=523206&r2=523207
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_encryption.h (original)
+++ webservices/rampart/trunk/c/include/rampart_encryption.h Wed Mar 28
00:21:22 2007
@@ -19,7 +19,6 @@
#include <axis2_env.h>
#include <axiom_soap.h>
#include <axis2_msg_ctx.h>
-#include <rampart_action.h>
#include <oxs_asym_ctx.h>
#include <oxs_xml_encryption.h>
#include <rampart_context.h>
Modified: webservices/rampart/trunk/c/include/rampart_handler_util.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_handler_util.h?view=diff&rev=523207&r1=523206&r2=523207
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_handler_util.h (original)
+++ webservices/rampart/trunk/c/include/rampart_handler_util.h Wed Mar 28
00:21:22 2007
@@ -27,7 +27,6 @@
#include <axis2_msg_info_headers.h>
#include <axis2_property.h>
#include <rampart_constants.h>
-#include <rampart_action.h>
#include <rampart_util.h>
#include <axis2_conf_ctx.h>
@@ -45,17 +44,6 @@
{
#endif
-/**
- * Get the encryption user password from the callback module
- * @param env pointer to environment struct
- * @param ctx axis2 context
- * @param actions rampart actions to get parameters
- * @return password or NULL on failure
- */
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-rampart_callback_encuser_password(const axis2_env_t *env,
- rampart_actions_t *actions,
- axis2_msg_ctx_t *msg_ctx);
/**
* Get properties from the axis2 context
@@ -83,36 +71,8 @@
axis2_msg_ctx_t *msg_ctx,
axis2_char_t *parameter);
- /**
- * Get actions specified in In/OutflowSecurity
- * @param env pointer to environment struct
- * @param ctx context
- * @param Outflowsecurity
- * @return parameters in an array list
- */
-AXIS2_EXTERN axis2_array_list_t* AXIS2_CALL
-rampart_get_actions( const axis2_env_t *env,
- axis2_ctx_t *ctx,
- axis2_param_t *param_x_flow_security);
-
-
- /**
- * Get the value of the action parameter given the key name
- * Here the key name means the name of the subelement of the
- * action element.
- * @param env pointer to environment struct
- * @param param_action action parameter
- * @param key element name as a string
- * @return the value of the element
- */
-
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-rampart_get_action_params( const axis2_env_t *env,
- axis2_param_t *param_action,
- const axis2_char_t *key);
-
/**
* Get the security token from the header block
Modified: webservices/rampart/trunk/c/include/rampart_sec_header_processor.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_sec_header_processor.h?view=diff&rev=523207&r1=523206&r2=523207
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_sec_header_processor.h
(original)
+++ webservices/rampart/trunk/c/include/rampart_sec_header_processor.h Wed Mar
28 00:21:22 2007
@@ -19,7 +19,6 @@
#include <axis2_env.h>
#include <axiom_soap.h>
#include <axis2_msg_ctx.h>
-#include <rampart_action.h>
#include <oxs_asym_ctx.h>
#include <oxs_xml_encryption.h>
#include <rampart_context.h>
@@ -41,7 +40,6 @@
* Also the module will check for the InflowSecurity Settings
* @param env pointer to environment struct
* @param msg_ctx message context
-* @param actions actions defined in the descriptor file
* @param soap_envelope the SOAP envelope
* @param sec_node The security element
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
@@ -49,7 +47,6 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rampart_shp_process_message(const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- /* rampart_actions_t *actions,*/
rampart_context_t *rampart_context,
axiom_soap_envelope_t *soap_envelope,
axiom_node_t *sec_node);
Modified: webservices/rampart/trunk/c/src/util/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/Makefile.am?view=diff&rev=523207&r1=523206&r2=523207
==============================================================================
--- webservices/rampart/trunk/c/src/util/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/util/Makefile.am Wed Mar 28 00:21:22 2007
@@ -2,7 +2,7 @@
noinst_LTLIBRARIES = librampart_util.la
-librampart_util_la_SOURCES = rampart_action.c rampart_crypto_util.c \
+librampart_util_la_SOURCES = rampart_crypto_util.c \
rampart_util.c
rampart_handler_util.c username_token.c timestamp_token.c \
rampart_encryption.c
rampart_sec_header_processor.c rampart_sec_processed_result.c \
rampart_sec_header_builder.c rampart_context.c rampart_engine.c
rampart_token_processor.c rampart_signature.c \
Modified: webservices/rampart/trunk/c/src/util/rampart_encryption.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_encryption.c?view=diff&rev=523207&r1=523206&r2=523207
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_encryption.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_encryption.c Wed Mar 28
00:21:22 2007
@@ -22,7 +22,6 @@
#include <oxs_utility.h>
#include <rampart_encryption.h>
#include <oxs_key.h>
-#include <rampart_action.h>
#include <rampart_constants.h>
#include <rampart_handler_util.h>
#include <oxs_tokens.h>
Modified: webservices/rampart/trunk/c/src/util/rampart_handler_util.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_handler_util.c?view=diff&rev=523207&r1=523206&r2=523207
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_handler_util.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_handler_util.c Wed Mar 28
00:21:22 2007
@@ -30,10 +30,6 @@
#include <axis2_conf_ctx.h>
#include <oxs_axiom.h>
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-rampart_callback_encuser_password(const axis2_env_t *env,
- rampart_actions_t *actions,
- axis2_msg_ctx_t *msg_ctx);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
rampart_get_property_from_ctx(const axis2_env_t *env,
@@ -45,16 +41,6 @@
axis2_msg_ctx_t *msg_ctx,
axis2_char_t *parameter);
-AXIS2_EXTERN axis2_array_list_t* AXIS2_CALL
-rampart_get_actions(const axis2_env_t *env,
- axis2_ctx_t *ctx,
- axis2_param_t *param_x_flow_security);
-
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-rampart_get_action_params(const axis2_env_t *env,
- axis2_param_t *param_action,
- const axis2_char_t *key);
-
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
rampart_get_security_token(const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx,
@@ -79,46 +65,6 @@
/**********************end of header functions ****************************/
-axis2_char_t* AXIS2_CALL
-rampart_callback_encuser_password(const axis2_env_t *env,
- rampart_actions_t *actions,
- axis2_msg_ctx_t *msg_ctx)
-{
- axis2_char_t *enc_user = NULL;
- axis2_char_t *pw_callback_module = NULL;
- axis2_char_t *password = NULL;
- axis2_ctx_t *ctx = NULL;
-
- /*Check if encUserPassword is in the context. This is designed specially
for PHP
- i.e.In any context in the context hierarchy starting from msg, op, svc,
etc.*/
- ctx = axis2_msg_ctx_get_base(msg_ctx, env);
- password = rampart_get_property_from_ctx(env, ctx,
RAMPART_ACTION_ENC_USER_PASSWORD);
- if (password)
- {
- return password;
- }
- /*If not found then callback the password*/
-
- enc_user = RAMPART_ACTIONS_GET_ENC_USER(actions, env);
- pw_callback_module = RAMPART_ACTIONS_GET_PW_CB_CLASS(actions, env);
- if(!pw_callback_module){
- return NULL;
- }
- if(!enc_user){
- /*If a special enc_user hasn't specified try to get the user.
- * But it is advisable to use enc_user instead of user.*/
- enc_user = RAMPART_ACTIONS_GET_USER(actions, env);
- if(!enc_user){
- return NULL;
- }
- }
- /*Get axis2_ctx_t. This is designed specially for PHP*/
-
-/* password = rampart_callback_password(env, pw_callback_module, enc_user,
ctx);*/
-/* password = rampart_callback_password(env, pw_callback_module, enc_user);*/
-
- return password;
-}
axis2_char_t* AXIS2_CALL
rampart_get_property_from_ctx(const axis2_env_t *env,
@@ -153,76 +99,6 @@
}
-axis2_array_list_t *AXIS2_CALL
-rampart_get_actions(const axis2_env_t *env,
- axis2_ctx_t *ctx,
- axis2_param_t *param_x_flow_security)
-{
- axis2_array_list_t *action_list = NULL;
- int param_type;
- if (!param_x_flow_security)
- {
- AXIS2_LOG_INFO(env->log, "[rampart][rhu]param_in_flow_security is
NULL");
- return action_list;
- }
-
- /*ERROR HERE param returns TEXT even for DOM*/
- param_type = axis2_param_get_param_type(param_x_flow_security, env);
-
- action_list = axis2_param_get_value_list(param_x_flow_security, env);
- if (!action_list)
- {
- AXIS2_LOG_INFO(env->log, "[rampart][rhu] action_list is NULL ... ERROR
");
- }
- return action_list;
-}
-
-
-axis2_char_t* AXIS2_CALL
-rampart_get_action_params(const axis2_env_t *env,
- axis2_param_t *param_action,
- const axis2_char_t *key)
-{
- axis2_char_t *value = NULL;
- axis2_char_t *tmp_key = NULL;
- axis2_char_t * param_name = NULL;
- axis2_array_list_t *param_list = NULL;
- axis2_param_t *param = NULL;
- int param_type;
- int i, size = 0;
-
- if (!param_action)
- {
- AXIS2_LOG_INFO(env->log, "[rampart][rhu] param_action is NULL");
- }
-
- param_type = axis2_param_get_param_type(param_action, env);
- param_name = axis2_param_get_name(param_action, env);
-
- param_list = axis2_param_get_value_list(param_action, env);
- if (!param_list)
- {
- AXIS2_LOG_INFO(env->log, "[rampart][rhu] param list is NULL");
- }
-
- size = axis2_array_list_size(param_list, env);
- for (i = 0; i < size; i = i + 1)
- {
- param = (axis2_param_t*) axis2_array_list_get(param_list, env, i);
- if (param)
- {
- tmp_key = axis2_param_get_name(param, env);
-
- if (0 == axis2_strcmp(tmp_key , key))
- {
- value = axis2_param_get_value(param, env);
- return value;
- }
- }
- }
-
- return value;
-}
axiom_node_t *AXIS2_CALL
rampart_get_security_token(const axis2_env_t *env,
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?view=diff&rev=523207&r1=523206&r2=523207
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c Wed Mar
28 00:21:22 2007
@@ -180,7 +180,7 @@
}
/*If both encryption and signature is done we should interchange
them.
- * because the action done last should appear first in the header.
*/
+ * because the a-ction done last should appear first in the
header. */
sig_node =
oxs_axiom_get_node_by_local_name(env,sec_node,OXS_NODE_SIGNATURE);
enc_key_node =
oxs_axiom_get_node_by_local_name(env,sec_node,OXS_NODE_ENCRYPTED_KEY);
if(sig_node && enc_key_node)
Modified: webservices/rampart/trunk/c/src/util/username_token.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/username_token.c?view=diff&rev=523207&r1=523206&r2=523207
==============================================================================
--- webservices/rampart/trunk/c/src/util/username_token.c (original)
+++ webservices/rampart/trunk/c/src/util/username_token.c Wed Mar 28 00:21:22
2007
@@ -34,16 +34,6 @@
/** public functions*/
-/*
-axis2_status_t AXIS2_CALL
-rampart_username_token_build(rampart_username_token_t *username_token,
- const axis2_env_t *env,
- axis2_ctx_t *ctx,
- rampart_actions_t *actions,
- axiom_node_t *sec_node,
- axiom_namespace_t *sec_ns_obj);
-*/
-
