Modified: webservices/rampart/trunk/c/src/util/rampart_sec_processed_result.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_sec_processed_result.c?view=diff&rev=523239&r1=523238&r2=523239 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_sec_processed_result.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_sec_processed_result.c Wed Mar 28 02:11:37 2007 @@ -16,7 +16,7 @@ */ -/* +/* * */ #include <rampart_util.h> @@ -28,9 +28,9 @@ AXIS2_EXTERN axis2_status_t AXIS2_CALL rampart_set_security_processed_result(const axis2_env_t *env, - axis2_msg_ctx_t *msg_ctx, - axis2_char_t *key, - void *value) + axis2_msg_ctx_t *msg_ctx, + axis2_char_t *key, + void *value) { axis2_hash_t *sec_processed_results = NULL; @@ -45,8 +45,8 @@ AXIS2_EXTERN void *AXIS2_CALL rampart_get_security_processed_result(const axis2_env_t *env, - axis2_msg_ctx_t *msg_ctx, - axis2_char_t *key) + axis2_msg_ctx_t *msg_ctx, + axis2_char_t *key) { axis2_hash_t *sec_processed_results = NULL; @@ -59,7 +59,7 @@ AXIS2_EXTERN axis2_status_t AXIS2_CALL rampart_set_security_processed_results_property(const axis2_env_t *env, - axis2_msg_ctx_t *msg_ctx) + axis2_msg_ctx_t *msg_ctx) { axis2_hash_t *sec_processed_results = NULL; axis2_property_t *sec_processed_results_prop = NULL; @@ -70,7 +70,7 @@ sec_processed_results = axis2_hash_make(env); sec_processed_results_prop = axis2_property_create(env); - + axis2_property_set_value(sec_processed_results_prop, env, sec_processed_results); axis2_msg_ctx_set_property(msg_ctx, env, RAMPART_SECURITY_PROCESSED_RESULTS, sec_processed_results_prop); @@ -79,14 +79,14 @@ AXIS2_EXTERN axis2_hash_t* AXIS2_CALL rampart_get_all_security_processed_results(const axis2_env_t *env, - axis2_msg_ctx_t *msg_ctx) + axis2_msg_ctx_t *msg_ctx) { axis2_property_t *sec_processed_results_prop = NULL; axis2_hash_t *sec_processed_results = NULL; sec_processed_results_prop = axis2_msg_ctx_get_property(msg_ctx, env, RAMPART_SECURITY_PROCESSED_RESULTS); if(!sec_processed_results_prop){ - AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][spr] Cannot get %s from msg ctx ", RAMPART_SECURITY_PROCESSED_RESULTS); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][spr] Cannot get %s from msg ctx ", RAMPART_SECURITY_PROCESSED_RESULTS); return NULL; } @@ -101,18 +101,18 @@ AXIS2_EXTERN void AXIS2_CALL rampart_print_security_processed_results_set(const axis2_env_t *env, - axis2_msg_ctx_t *msg_ctx) + axis2_msg_ctx_t *msg_ctx) { axis2_hash_t *sec_processed_results = NULL; axis2_hash_index_t *hi = NULL; const void *key = NULL; void *val = NULL; - + sec_processed_results = rampart_get_all_security_processed_results(env, msg_ctx); if(!sec_processed_results){ return; } - + for (hi = axis2_hash_first(sec_processed_results, env); hi; hi = axis2_hash_next(env, hi)) { axis2_hash_this(hi, &key, NULL, &val); AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][spr] (key, val) %s = %s\n", (axis2_char_t*)key, (axis2_char_t*)val);
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=523239&r1=523238&r2=523239 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_signature.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_signature.c Wed Mar 28 02:11:37 2007 @@ -39,13 +39,13 @@ #include <rampart_token_builder.h> /*Public functions*/ -oxs_x509_cert_t *AXIS2_CALL +oxs_x509_cert_t *AXIS2_CALL rampart_sig_get_cert(const axis2_env_t *env, - rampart_context_t *rampart_context) + rampart_context_t *rampart_context) { void *key_buf = NULL; axis2_key_type_t type = 0; - oxs_x509_cert_t *cert = NULL; + oxs_x509_cert_t *cert = NULL; axis2_char_t *certificate_file = NULL; key_buf = rampart_context_get_certificate(rampart_context,env); @@ -59,8 +59,8 @@ { AXIS2_LOG_INFO(env->log,"[rampart][rampart_signature] Certificate cannot be loaded from the buffer."); return NULL; - } - else return cert; + } + else return cert; } else { @@ -92,10 +92,10 @@ AXIS2_EXTERN axis2_status_t AXIS2_CALL rampart_sig_sign_message(const axis2_env_t *env, - axis2_msg_ctx_t *msg_ctx, - rampart_context_t *rampart_context, - axiom_soap_envelope_t *soap_envelope, - axiom_node_t *sec_node) + axis2_msg_ctx_t *msg_ctx, + rampart_context_t *rampart_context, + axiom_soap_envelope_t *soap_envelope, + axiom_node_t *sec_node) { axis2_array_list_t *nodes_to_sign = NULL; axis2_status_t status = AXIS2_FAILURE; @@ -107,7 +107,7 @@ axis2_char_t *prv_key_file = NULL; axis2_char_t *password = NULL; axis2_bool_t server_side = AXIS2_FALSE; - int token_type = 0; + int token_type = 0; rp_property_t *token = NULL; axis2_char_t *enc_user = NULL; openssl_pkey_t *prvkey = NULL; @@ -145,9 +145,9 @@ { AXIS2_LOG_INFO(env->log, "[rampart][rampart_signature] Required timestamp cannot be found."); return AXIS2_FAILURE; - } + } axis2_array_list_add(nodes_to_sign,env,ts_node); - } + } if(rampart_context_get_require_ut(rampart_context,env)) { axiom_node_t *ut_node = NULL; @@ -156,18 +156,18 @@ { AXIS2_LOG_INFO(env->log, "[rampart][rampart_signature] Required username token cannot be found."); return AXIS2_FAILURE; - } - axis2_array_list_add(nodes_to_sign,env,ut_node); - } + } + axis2_array_list_add(nodes_to_sign,env,ut_node); + } /*Now we have to check whether a token is specified.*/ token = rampart_context_get_token(rampart_context,env,AXIS2_FALSE,server_side); if(!token) { AXIS2_LOG_INFO(env->log,"[rampart][rampart_signature] Signature Token is not specified"); return AXIS2_FAILURE; - } + } token_type = rp_property_get_type(token,env); - + if(!rampart_context_is_token_type_supported(token_type,env)) return AXIS2_FAILURE; @@ -185,54 +185,54 @@ cert = rampart_sig_get_cert(env,rampart_context); if(!cert) { - return AXIS2_FAILURE; + return AXIS2_FAILURE; } - /*This flag will be useful when creating key Info element.*/ + /*This flag will be useful when creating key Info element.*/ is_direct_reference = AXIS2_TRUE; eki = RAMPART_STR_DIRECT_REFERENCE; cert_id = oxs_util_generate_id(env,(axis2_char_t*)OXS_CERT_ID); - bst_data = oxs_x509_cert_get_data(cert, env); + bst_data = oxs_x509_cert_get_data(cert, env); if(!bst_data) { AXIS2_LOG_INFO(env->log,"[rampart][rampart_signature] Certificate data cannot be loaded from the cert."); return AXIS2_FAILURE; - } - - bst_node = oxs_token_build_binary_security_token_element(env,sec_node, - cert_id , OXS_ENCODING_BASE64BINARY, OXS_VALUE_X509V3, bst_data); + } + + bst_node = oxs_token_build_binary_security_token_element(env,sec_node, + cert_id , OXS_ENCODING_BASE64BINARY, OXS_VALUE_X509V3, bst_data); if(!bst_node) { AXIS2_LOG_INFO(env->log,"[rampart][rampart_signature] Binary Security Token creation failed."); return AXIS2_FAILURE; - } - + } + } else { eki = rampart_context_get_key_identifier(rampart_context,token,env); is_direct_reference = AXIS2_FALSE; - } + } if(!eki) { AXIS2_LOG_INFO(env->log,"[rampart][rampart_signature] No way of attaching the token."); return AXIS2_FAILURE; - } + } /*Get the asymmetric signature algorithm*/ asym_sig_algo = rampart_context_get_asym_sig_algo(rampart_context,env); digest_method = rampart_context_get_digest_mtd(rampart_context,env); - - sign_parts = axis2_array_list_create(env,0); + + sign_parts = axis2_array_list_create(env,0); /*tr_list = axis2_array_list_create(env,0);*/ /*Now we should create sign part for each node in the arraylist.*/ - + for(i=0 ; i < axis2_array_list_size(nodes_to_sign, env); i++) { axiom_node_t *node_to_sign = NULL; axis2_char_t *id = NULL; - oxs_sign_part_t *sign_part = NULL; + oxs_sign_part_t *sign_part = NULL; oxs_transform_t *tr = NULL; axis2_array_list_t *tr_list = NULL; @@ -244,15 +244,15 @@ id = oxs_util_generate_id(env,(axis2_char_t*)OXS_SIG_ID); tr = oxs_transforms_factory_produce_transform(env, OXS_HREF_TRANSFORM_XML_EXC_C14N); axis2_array_list_add(tr_list, env, tr); - oxs_sign_part_set_transforms(sign_part, env, tr_list); + oxs_sign_part_set_transforms(sign_part, env, tr_list); oxs_axiom_add_attribute(env, node_to_sign, OXS_WSU,RAMPART_WSU_XMLNS,OXS_ATTR_ID,id); oxs_sign_part_set_node(sign_part, env,node_to_sign); oxs_sign_part_set_digest_mtd(sign_part, env, digest_method); axis2_array_list_add(sign_parts, env, sign_part); - } + } } sign_ctx = oxs_sign_ctx_create(env); - + /*First check whether the private key is set*/ key_buf = rampart_context_get_prv_key(rampart_context,env); if(key_buf) @@ -267,9 +267,9 @@ AXIS2_LOG_INFO(env->log, "[rampart][rampart_signature] Can't load the key from buffer"); return AXIS2_FAILURE; } - } - } - + } + } + /*Buffer is null load from the file*/ else { @@ -317,11 +317,11 @@ } /*These properties will set for creating signed info element*/ oxs_sign_ctx_set_private_key(sign_ctx, env, prvkey); - oxs_sign_ctx_set_sign_mtd_algo(sign_ctx, env, asym_sig_algo); + oxs_sign_ctx_set_sign_mtd_algo(sign_ctx, env, asym_sig_algo); oxs_sign_ctx_set_c14n_mtd(sign_ctx, env, OXS_HREF_XML_EXC_C14N); oxs_sign_ctx_set_sign_parts(sign_ctx, env, sign_parts); oxs_sign_ctx_set_operation(sign_ctx, env, OXS_SIGN_OPERATION_SIGN); - + /*All the things are ready for signing. So lets try signing*/ @@ -330,9 +330,9 @@ { AXIS2_LOG_INFO(env->log, "[rampart][rampart_signature] Message signing failed."); return AXIS2_FAILURE; - } + } /*Now we must build the Key Info element*/ - + key_info_node = oxs_token_build_key_info_element(env,sig_node); if(!key_info_node) { @@ -349,25 +349,25 @@ { AXIS2_LOG_INFO(env->log, "[rampart][rampart_signature] Security Token element creation failed in Direct reference."); return AXIS2_FAILURE; - } + } cert_id_ref = axis2_stracat("#",cert_id,env); - reference_node = oxs_token_build_reference_element(env,str_node,cert_id_ref,OXS_VALUE_X509V3); + reference_node = oxs_token_build_reference_element(env,str_node,cert_id_ref,OXS_VALUE_X509V3); if(!reference_node) { AXIS2_LOG_INFO(env->log, "[rampart][rampart_signature] Security Token element creation failed in Direct reference."); return AXIS2_FAILURE; } - } + } else { cert = rampart_sig_get_cert(env,rampart_context); if(!cert) { - return AXIS2_FAILURE; + return AXIS2_FAILURE; } if(axis2_strcmp(eki,RAMPART_STR_EMBEDDED)==0) { - status = rampart_token_build_security_token_reference(env,key_info_node,cert,RTBP_EMBEDDED); + status = rampart_token_build_security_token_reference(env,key_info_node,cert,RTBP_EMBEDDED); } else if(axis2_strcmp(eki,RAMPART_STR_ISSUER_SERIAL)==0) { @@ -380,7 +380,7 @@ else { AXIS2_LOG_INFO(env->log, "[rampart][rampart_signature] Unknown key Identifier type.Token attaching failed"); - status = AXIS2_FAILURE; + status = AXIS2_FAILURE; } } return status; Modified: webservices/rampart/trunk/c/src/util/rampart_token_builder.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_token_builder.c?view=diff&rev=523239&r1=523238&r2=523239 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_token_builder.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_token_builder.c Wed Mar 28 02:11:37 2007 @@ -15,7 +15,7 @@ * limitations under the License. */ -/* +/* * */ #include <stdio.h> @@ -34,9 +34,9 @@ AXIS2_EXTERN axis2_status_t AXIS2_CALL rampart_token_build_security_token_reference(const axis2_env_t *env, - axiom_node_t *parent, - oxs_x509_cert_t *cert, - rampart_token_build_pattern_t pattern) + axiom_node_t *parent, + oxs_x509_cert_t *cert, + rampart_token_build_pattern_t pattern) { axis2_status_t status = AXIS2_FAILURE; axiom_node_t *stref_node = NULL; @@ -63,8 +63,8 @@ AXIS2_EXTERN axis2_status_t AXIS2_CALL rampart_token_build_embedded(const axis2_env_t *env, - axiom_node_t *parent, - oxs_x509_cert_t *cert) + axiom_node_t *parent, + oxs_x509_cert_t *cert) { axis2_char_t *data = NULL; axis2_char_t *bst_id = NULL; @@ -78,14 +78,14 @@ } embedded_node = oxs_token_build_embedded_element(env, parent, "ID"); bst_id = "bst-id";/*TODO*/ - bst_node = oxs_token_build_binary_security_token_element(env, embedded_node, bst_id , OXS_VALUE_X509V3, OXS_ENCODING_BASE64BINARY, data); + bst_node = oxs_token_build_binary_security_token_element(env, embedded_node, bst_id , OXS_VALUE_X509V3, OXS_ENCODING_BASE64BINARY, data); return AXIS2_SUCCESS; } AXIS2_EXTERN axis2_status_t AXIS2_CALL rampart_token_build_key_identifier(const axis2_env_t *env, - axiom_node_t *parent, - oxs_x509_cert_t *cert) + axiom_node_t *parent, + oxs_x509_cert_t *cert) { axiom_node_t *ki_node = NULL; axis2_char_t *ki = NULL; @@ -95,14 +95,14 @@ return AXIS2_FAILURE; } ki_node = oxs_token_build_key_identifier_element(env, parent, OXS_ENCODING_BASE64BINARY, - OXS_X509_SUBJ_KI, ki); + OXS_X509_SUBJ_KI, ki); return AXIS2_SUCCESS; } AXIS2_EXTERN axis2_status_t AXIS2_CALL rampart_token_build_x509_data_x509_certificate(const axis2_env_t *env, - axiom_node_t *parent, - oxs_x509_cert_t *cert) + axiom_node_t *parent, + oxs_x509_cert_t *cert) { axiom_node_t *x509_data_node = NULL; axiom_node_t *x509_cert_node = NULL; @@ -122,8 +122,8 @@ AXIS2_EXTERN axis2_status_t AXIS2_CALL rampart_token_build_x509_data_issuer_serial(const axis2_env_t *env, - axiom_node_t *parent, - oxs_x509_cert_t *cert) + axiom_node_t *parent, + oxs_x509_cert_t *cert) { axiom_node_t *x509_data_node = NULL; axiom_node_t *x509_issuer_serial_node = NULL; Modified: webservices/rampart/trunk/c/src/util/rampart_token_processor.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_token_processor.c?view=diff&rev=523239&r1=523238&r2=523239 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_token_processor.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_token_processor.c Wed Mar 28 02:11:37 2007 @@ -15,7 +15,7 @@ * limitations under the License. */ -/* +/* * */ #include <stdio.h> @@ -35,9 +35,9 @@ AXIS2_EXTERN axis2_status_t AXIS2_CALL rampart_token_process_security_token_reference(const axis2_env_t *env, - axiom_node_t *st_ref_node, - axiom_node_t *scope_node,/*Can be NULL for all other scenarios but the Direct Reference*/ - oxs_x509_cert_t *cert) + axiom_node_t *st_ref_node, + axiom_node_t *scope_node,/*Can be NULL for all other scenarios but the Direct Reference*/ + oxs_x509_cert_t *cert) { axis2_char_t *child_name = NULL; axiom_node_t *child_node = NULL; @@ -64,10 +64,10 @@ } AXIS2_EXTERN axis2_status_t AXIS2_CALL -rampart_token_process_direct_ref(const axis2_env_t *env, - axiom_node_t *ref_node, - axiom_node_t *scope_node, - oxs_x509_cert_t *cert) +rampart_token_process_direct_ref(const axis2_env_t *env, + axiom_node_t *ref_node, + axiom_node_t *scope_node, + oxs_x509_cert_t *cert) { axis2_char_t *ref = NULL; axis2_char_t *ref_id = NULL; @@ -95,20 +95,20 @@ }else{ status = AXIS2_FAILURE; } - + oxs_x509_cert_copy_to(_cert, env, cert); return status; } AXIS2_EXTERN axis2_status_t AXIS2_CALL rampart_token_process_embedded(const axis2_env_t *env, - axiom_node_t *embed_node, - oxs_x509_cert_t *cert) + axiom_node_t *embed_node, + oxs_x509_cert_t *cert) { axis2_status_t status = AXIS2_FAILURE; axis2_char_t *data = NULL; oxs_x509_cert_t *_cert = NULL; - + data = oxs_axiom_get_node_content(env, embed_node); /*Process data*/ _cert = oxs_key_mgr_load_x509_cert_from_string(env, data); @@ -124,8 +124,8 @@ AXIS2_EXTERN axis2_status_t AXIS2_CALL rampart_token_process_key_identifier(const axis2_env_t *env, - axiom_node_t *ki_node, - oxs_x509_cert_t *cert) + axiom_node_t *ki_node, + oxs_x509_cert_t *cert) { axis2_char_t *ki = NULL; @@ -137,8 +137,8 @@ AXIS2_EXTERN axis2_status_t AXIS2_CALL rampart_token_process_x509_data(const axis2_env_t *env, - axiom_node_t *x509_data_node, - oxs_x509_cert_t *cert) + axiom_node_t *x509_data_node, + oxs_x509_cert_t *cert) { return oxs_xml_key_process_X509Data(env, x509_data_node, cert); } 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=523239&r1=523238&r2=523239 ============================================================================== --- webservices/rampart/trunk/c/src/util/rampart_util.c (original) +++ webservices/rampart/trunk/c/src/util/rampart_util.c Wed Mar 28 02:11:37 2007 @@ -15,7 +15,7 @@ * limitations under the License. */ -/* +/* * */ #include <stdio.h> @@ -44,14 +44,14 @@ AXIS2_EXTERN void* AXIS2_CALL rampart_load_module(const axis2_env_t *env, - axis2_char_t *module_name) + axis2_char_t *module_name) { axis2_dll_desc_t *dll_desc = NULL; axis2_param_t *impl_info_param = NULL; void *ptr = NULL; dll_desc = axis2_dll_desc_create(env); - axis2_dll_desc_set_name(dll_desc, env, module_name); + axis2_dll_desc_set_name(dll_desc, env, module_name); impl_info_param = axis2_param_create(env, NULL, NULL); axis2_param_set_value(impl_info_param, env, dll_desc); axis2_class_loader_init(env); @@ -68,10 +68,10 @@ AXIS2_EXTERN rampart_credentials_status_t AXIS2_CALL rampart_call_credentials(const axis2_env_t *env, - rampart_credentials_t *cred_module, - axis2_msg_ctx_t *msg_ctx, - axis2_char_t **username, - axis2_char_t **password) + rampart_credentials_t *cred_module, + axis2_msg_ctx_t *msg_ctx, + axis2_char_t **username, + axis2_char_t **password) { rampart_credentials_status_t cred_status = RAMPART_CREDENTIALS_GENERAL_ERROR; @@ -81,7 +81,7 @@ AXIS2_EXTERN rampart_credentials_t* AXIS2_CALL rampart_load_credentials_module(const axis2_env_t *env, - axis2_char_t *cred_module_name) + axis2_char_t *cred_module_name) { rampart_credentials_t *cred = NULL; @@ -97,7 +97,7 @@ AXIS2_EXTERN rampart_authn_provider_t* AXIS2_CALL rampart_load_auth_module(const axis2_env_t *env, - axis2_char_t *auth_module_name) + axis2_char_t *auth_module_name) { rampart_authn_provider_t *authp = NULL; @@ -113,13 +113,13 @@ AXIS2_EXTERN rampart_authn_provider_status_t AXIS2_CALL rampart_authenticate_un_pw(const axis2_env_t *env, - rampart_authn_provider_t *authp, - const axis2_char_t *username, - const axis2_char_t *password, - const axis2_char_t *nonce,/*Can be NULL if plain text*/ - const axis2_char_t *created,/*Can be NULL if plain text*/ - const axis2_char_t *password_type, - axis2_msg_ctx_t *msg_ctx) + rampart_authn_provider_t *authp, + const axis2_char_t *username, + const axis2_char_t *password, + const axis2_char_t *nonce,/*Can be NULL if plain text*/ + const axis2_char_t *created,/*Can be NULL if plain text*/ + const axis2_char_t *password_type, + axis2_msg_ctx_t *msg_ctx) { rampart_authn_provider_status_t auth_status = RAMPART_AUTHN_PROVIDER_GENERAL_ERROR; @@ -139,7 +139,7 @@ AXIS2_EXTERN rampart_callback_t* AXIS2_CALL rampart_load_pwcb_module(const axis2_env_t *env, - axis2_char_t *callback_module_name) + axis2_char_t *callback_module_name) { rampart_callback_t *cb = NULL; @@ -157,8 +157,8 @@ AXIS2_EXTERN axis2_char_t* AXIS2_CALL rampart_callback_password(const axis2_env_t *env, - rampart_callback_t *callback_module, - const axis2_char_t *username) + rampart_callback_t *callback_module, + const axis2_char_t *username) { axis2_char_t *password = NULL; void *cb_prop_val= NULL; @@ -209,7 +209,7 @@ axis2_date_time_t *dt1 = NULL; axis2_date_time_t *dt2 = NULL; axis2_date_time_comp_result_t res = AXIS2_DATE_TIME_COMP_RES_UNKNOWN; -#if 0 +#if 0 int yyyy1, mm1, dd1, hh1, mi1, ss1, ml1; int yyyy2, mm2, dd2, hh2, mi2, ss2, ml2; #endif @@ -282,7 +282,7 @@ { return AXIS2_FAILURE; } - if (mi1 < mi2) + if (mi1 < mi2) { return AXIS2_SUCCESS; } Modified: webservices/rampart/trunk/c/src/util/timestamp_token.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/timestamp_token.c?view=diff&rev=523239&r1=523238&r2=523239 ============================================================================== --- webservices/rampart/trunk/c/src/util/timestamp_token.c (original) +++ webservices/rampart/trunk/c/src/util/timestamp_token.c Wed Mar 28 02:11:37 2007 @@ -32,10 +32,10 @@ axis2_status_t AXIS2_CALL rampart_timestamp_token_build( - const axis2_env_t *env, - axiom_node_t *sec_node, - const axiom_namespace_t *sec_ns_obj, - int ttl) + const axis2_env_t *env, + axiom_node_t *sec_node, + const axiom_namespace_t *sec_ns_obj, + int ttl) { axiom_node_t *ts_node = NULL; axiom_node_t *created_node = NULL; @@ -48,17 +48,17 @@ axiom_namespace_t *wsu_ns_obj = NULL; wsu_ns_obj = axiom_namespace_create(env, RAMPART_WSU_XMLNS, - RAMPART_WSU); + RAMPART_WSU); ts_ele = axiom_element_create(env, sec_node, - RAMPART_SECURITY_TIMESTAMP, - wsu_ns_obj, - &ts_node); + RAMPART_SECURITY_TIMESTAMP, + wsu_ns_obj, + &ts_node); if (ts_ele) { /*First we build Created element*/ created_ele = axiom_element_create(env, ts_node, RAMPART_SECURITY_TIMESTAMP_CREATED, wsu_ns_obj, - &created_node); + &created_node); if (created_ele) { @@ -72,7 +72,7 @@ return AXIS2_SUCCESS; } expires_ele = axiom_element_create(env, ts_node, RAMPART_SECURITY_TIMESTAMP_EXPIRES, wsu_ns_obj, - &expires_node); + &expires_node); if (expires_ele) { @@ -87,9 +87,9 @@ axis2_status_t AXIS2_CALL rampart_timestamp_token_validate( - const axis2_env_t *env, - axis2_msg_ctx_t *msg_ctx, - axiom_node_t *ts_node ) + const axis2_env_t *env, + axis2_msg_ctx_t *msg_ctx, + axiom_node_t *ts_node ) { axis2_status_t validity = AXIS2_FAILURE; axiom_element_t *created_ele = NULL; @@ -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 (axis2_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 (axis2_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/username_token.c URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/username_token.c?view=diff&rev=523239&r1=523238&r2=523239 ============================================================================== --- webservices/rampart/trunk/c/src/util/username_token.c (original) +++ webservices/rampart/trunk/c/src/util/username_token.c Wed Mar 28 02:11:37 2007 @@ -39,11 +39,11 @@ axis2_status_t AXIS2_CALL rampart_username_token_build( - const axis2_env_t *env, - rampart_context_t *rampart_context, - axiom_node_t *sec_node, - axiom_namespace_t *sec_ns_obj - ) + const axis2_env_t *env, + rampart_context_t *rampart_context, + axiom_node_t *sec_node, + axiom_namespace_t *sec_ns_obj +) { axiom_node_t *ut_node = NULL; @@ -52,22 +52,22 @@ axiom_node_t *nonce_node = NULL; axiom_node_t *created_node = NULL; axiom_element_t *ut_ele = NULL; - axiom_element_t *un_ele = NULL; + axiom_element_t *un_ele = NULL; axiom_element_t *pw_ele = NULL; axiom_element_t *nonce_ele = NULL; axiom_element_t *created_ele = NULL; axiom_namespace_t *wsu_ns_obj = NULL; axiom_attribute_t *om_attr = NULL; - axis2_char_t *password = NULL; + axis2_char_t *password = NULL; axis2_char_t *username = NULL; rampart_callback_t *password_callback = NULL; -/* axis2_bool_t isdigest = AXIS2_FALSE;*/ + /* axis2_bool_t isdigest = AXIS2_FALSE;*/ axis2_char_t *password_type = NULL; password_callback_fn password_function = NULL; void *param = NULL; - - AXIS2_ENV_CHECK(env, AXIS2_FAILURE); + + AXIS2_ENV_CHECK(env, AXIS2_FAILURE); /*Directly call the password from callback module*/ @@ -79,18 +79,18 @@ } password = rampart_context_get_password(rampart_context,env); - + if(!password) { password_function = rampart_context_get_pwcb_function(rampart_context,env); if(password_function) - { + { param = rampart_context_get_ctx(rampart_context,env); if(!param) { AXIS2_LOG_INFO(env->log, "[rampart][rampart_usernametoken] Param is not set."); return AXIS2_FAILURE; - } + } password = (*password_function)(env,username,param); } else @@ -111,32 +111,32 @@ } ut_ele = axiom_element_create(env, sec_node, - RAMPART_SECURITY_USERNAMETOKEN, - sec_ns_obj, - &ut_node); + RAMPART_SECURITY_USERNAMETOKEN, + sec_ns_obj, + &ut_node); wsu_ns_obj = axiom_namespace_create(env, RAMPART_WSU_XMLNS, - RAMPART_WSU); + RAMPART_WSU); axiom_element_declare_namespace(ut_ele, env, - ut_node, wsu_ns_obj); + ut_node, wsu_ns_obj); if (ut_ele) { un_ele = axiom_element_create(env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_USERNAME, sec_ns_obj, - &un_node); + &un_node); if (un_ele) { axiom_namespace_t *dec_ns = NULL; axiom_element_set_text(un_ele, env, username, un_node); dec_ns = axiom_element_find_declared_namespace(un_ele, env, - RAMPART_WSSE_XMLNS, - RAMPART_WSSE); + RAMPART_WSSE_XMLNS, + RAMPART_WSSE); axiom_element_set_namespace(un_ele, env, sec_ns_obj, un_node); } - + password_type = rampart_context_get_password_type(rampart_context,env); if(!password_type) password_type = RAMPART_PASSWORD_TEXT; @@ -152,49 +152,49 @@ digest_val = rampart_crypto_sha1(env, nonce_val, created_val, password); pw_ele = axiom_element_create(env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_PASSWORD, sec_ns_obj, - &pw_node); + &pw_node); if (pw_ele) { axiom_element_set_text(pw_ele, env, digest_val, pw_node); dec_ns = axiom_element_find_declared_namespace(pw_ele, env, - RAMPART_WSSE_XMLNS, - RAMPART_WSSE); + RAMPART_WSSE_XMLNS, + RAMPART_WSSE); om_attr = axiom_attribute_create(env, - RAMPART_SECURITY_USERNAMETOKEN_PASSWORD_ATTR_TYPE, - RAMPART_PASSWORD_DIGEST_URI, - NULL); + RAMPART_SECURITY_USERNAMETOKEN_PASSWORD_ATTR_TYPE, + RAMPART_PASSWORD_DIGEST_URI, + NULL); axiom_element_add_attribute(pw_ele, env, - om_attr, pw_node); + om_attr, pw_node); } nonce_ele = axiom_element_create(env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_NONCE, sec_ns_obj, - &nonce_node); + &nonce_node); if (nonce_ele) { axiom_namespace_t *dec_ns = NULL; axiom_element_set_text(nonce_ele, env, nonce_val , nonce_node); dec_ns = axiom_element_find_declared_namespace(nonce_ele, env, - RAMPART_WSSE_XMLNS, - RAMPART_WSSE); + RAMPART_WSSE_XMLNS, + RAMPART_WSSE); } created_ele = axiom_element_create(env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_CREATED, sec_ns_obj, - &created_node); + &created_node); if (created_ele) { axiom_namespace_t *dec_ns = NULL; axiom_element_set_text(created_ele, env, created_val, created_node); dec_ns = axiom_element_find_declared_namespace(created_ele, env, - RAMPART_WSSE_XMLNS, - RAMPART_WSSE); + RAMPART_WSSE_XMLNS, + RAMPART_WSSE); axiom_element_set_namespace(created_ele, env, wsu_ns_obj, created_node); } - + if(nonce_val){ /*AXIS2_FREE(env->allocator, nonce_val); nonce_val = NULL;*//*TODO Check*/ @@ -211,22 +211,22 @@ else /*default is passwordText*/ { pw_ele = axiom_element_create(env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_PASSWORD, sec_ns_obj, - &pw_node); + &pw_node); if (pw_ele) { axiom_namespace_t *dec_ns = NULL; axiom_element_set_text(pw_ele, env, password, pw_node); dec_ns = axiom_element_find_declared_namespace(pw_ele, env, - RAMPART_WSSE_XMLNS, - RAMPART_WSSE); + RAMPART_WSSE_XMLNS, + RAMPART_WSSE); om_attr = axiom_attribute_create(env, - RAMPART_SECURITY_USERNAMETOKEN_PASSWORD_ATTR_TYPE, - RAMPART_PASSWORD_TEXT_URI, - NULL); + RAMPART_SECURITY_USERNAMETOKEN_PASSWORD_ATTR_TYPE, + RAMPART_PASSWORD_TEXT_URI, + NULL); axiom_element_add_attribute(pw_ele, env, - om_attr, pw_node); + om_attr, pw_node); } } /*End if passwordType == passwordText*/ } @@ -235,10 +235,10 @@ axis2_status_t AXIS2_CALL rampart_username_token_validate( - const axis2_env_t *env, - axis2_msg_ctx_t *msg_ctx, - axiom_node_t *ut_node, - rampart_context_t *rampart_context) + const axis2_env_t *env, + axis2_msg_ctx_t *msg_ctx, + axiom_node_t *ut_node, + rampart_context_t *rampart_context) { axiom_child_element_iterator_t *children = NULL; axis2_char_t *username = NULL; @@ -257,7 +257,7 @@ void *param = NULL; auth_password_func authenticate_with_password = NULL; auth_digest_func authenticate_with_digest = NULL; - axis2_char_t *password_type_pol = NULL; + axis2_char_t *password_type_pol = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); @@ -309,8 +309,8 @@ else if (0 == axis2_strcmp(localname , RAMPART_SECURITY_USERNAMETOKEN_PASSWORD)) { password_type = axiom_element_get_attribute_value_by_name(element, - env, - RAMPART_SECURITY_USERNAMETOKEN_PASSWORD_ATTR_TYPE); + env, + RAMPART_SECURITY_USERNAMETOKEN_PASSWORD_ATTR_TYPE); if (!password_type) { @@ -329,15 +329,15 @@ { AXIS2_LOG_INFO(env->log, "[rampart][rampart_usernametoken] Password Type is Wrong"); return AXIS2_FAILURE; - } - } - else if(axis2_strcmp(password_type_pol,RP_PLAINTEXT)==0) + } + } + else if(axis2_strcmp(password_type_pol,RP_PLAINTEXT)==0) { if(0 == axis2_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI)) { AXIS2_LOG_INFO(env->log, "[rampart][rampart_usernametoken] Password Type is Wrong"); return AXIS2_FAILURE; - } + } } password = axiom_element_get_text(element, env, node); @@ -374,7 +374,7 @@ AXIS2_LOG_INFO(env->log, "[rampart][rampart_usernametoken] Username is not specified"); return AXIS2_FAILURE; } - + /*Set the username to the SPR*/ rampart_set_security_processed_result(env, msg_ctx, RAMPART_SPR_UT_USERNAME, username); ctx = axis2_msg_ctx_get_base(msg_ctx, env); @@ -388,10 +388,10 @@ * Else try the usual approach to get password from the callback and compare * */ /*In both authentication and password callback methods we should first try to - *use function pointers. */ + *use function pointers. */ /*authn_module_name = "/home/kau/axis2/c/deploy/bin/samples/rampart/authn_provider/libauthn.so";*/ - if (0 == axis2_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI)) + if (0 == axis2_strcmp(password_type, RAMPART_PASSWORD_DIGEST_URI)) { authenticate_with_digest = rampart_context_get_auth_digest_function(rampart_context,env); if(authenticate_with_digest) @@ -409,7 +409,7 @@ return AXIS2_FAILURE; } } - } + } else { authenticate_with_password = rampart_context_get_auth_password_function(rampart_context,env); @@ -437,20 +437,20 @@ if(RAMPART_AUTHN_PROVIDER_GRANTED == auth_status){ AXIS2_LOG_INFO(env->log, "[rampart][rampart_usernametoken] User authenticated"); rampart_set_security_processed_result(env, msg_ctx,RAMPART_SPR_UT_CHECKED, RAMPART_YES); - return AXIS2_SUCCESS; + return AXIS2_SUCCESS; }else{ AXIS2_LOG_INFO(env->log, "[rampart][rampart_usernametoken] Password is not valid for user %s : status %d", username, auth_status); return AXIS2_FAILURE; } - + }else{ /*Auth module is NULL. Use Callback password*/ /*First we must check the password in rampart_context.*/ password_from_svr = rampart_context_get_password(rampart_context,env); - + /*If not then check the call back function*/ if(!password_from_svr) - { + { password_function = rampart_context_get_pwcb_function(rampart_context,env); if(password_function) { @@ -463,7 +463,7 @@ password_from_svr = (*password_function)(env,username,param); } else - { + { password_callback = rampart_context_get_password_callback(rampart_context,env); if(!password_callback){ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][rampart_usernametoken] Password callback module is not specified"); @@ -472,7 +472,7 @@ AXIS2_LOG_INFO(env->log, "[rampart][rampart_usernametoken] Password authentication using CALLBACK MODULE "); /*password_from_svr = rampart_callback_password(env, pw_callback_module, username, ctx);*/ password_from_svr = rampart_callback_password(env, password_callback, username); - } + } } if (!password_from_svr)
