You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by ka...@apache.org on 2007/09/05 07:00:40 UTC
svn commit: r572873 - in /webservices/rampart/trunk/c:
samples/data/passwords.txt samples/secpolicy/scenario1/services.xml
src/omxmlsec/encryption.c src/util/rampart_signature.c
Author: kaushalye
Date: Tue Sep 4 22:00:39 2007
New Revision: 572873
URL: http://svn.apache.org/viewvc?rev=572873&view=rev
Log:
Code cleaning and memory leak fixes
Modified:
webservices/rampart/trunk/c/samples/data/passwords.txt
webservices/rampart/trunk/c/samples/secpolicy/scenario1/services.xml
webservices/rampart/trunk/c/src/omxmlsec/encryption.c
webservices/rampart/trunk/c/src/util/rampart_signature.c
Modified: webservices/rampart/trunk/c/samples/data/passwords.txt
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/data/passwords.txt?rev=572873&r1=572872&r2=572873&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/data/passwords.txt (original)
+++ webservices/rampart/trunk/c/samples/data/passwords.txt Tue Sep 4 22:00:39 2007
@@ -1,4 +1,5 @@
bob:bobPW
+Bob:bobPW
Raigama:RaigamaPW
Gampola:GampolaPW
alice:password
Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario1/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario1/services.xml?rev=572873&r1=572872&r2=572873&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario1/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario1/services.xml Tue Sep 4 22:00:39 2007
@@ -46,7 +46,7 @@
</wsp:Policy>
</sp:AsymmetricBinding>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
- <rampc:TimeToLive>360</rampc:TimeToLive>
+ <!--rampc:TimeToLive>360</rampc:TimeToLive-->
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/rampart/trunk/c/src/omxmlsec/encryption.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/encryption.c?rev=572873&r1=572872&r2=572873&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/encryption.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/encryption.c Tue Sep 4 22:00:39 2007
@@ -211,6 +211,9 @@
password = oxs_asym_ctx_get_password(asym_ctx, env);
status = oxs_key_mgr_load_key(env, asym_ctx, password);
if(AXIS2_FAILURE == status){
+ oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
+ "Key loading failed for Key encryption");
+
return AXIS2_FAILURE;
}
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?rev=572873&r1=572872&r2=572873&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_signature.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_signature.c Tue Sep 4 22:00:39 2007
@@ -58,7 +58,7 @@
(axis2_char_t *)key_buf);
if(!cert)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Certificate cannot be loaded from the buffer.");
return NULL;
}
@@ -69,7 +69,8 @@
}
else
{
- AXIS2_LOG_INFO(env->log,"[rampart][rampart_signature] Key file type unknown.");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[rampart][rampart_signature] Key file type unknown.");
return NULL;
}
}
@@ -81,7 +82,7 @@
cert = oxs_key_mgr_load_x509_cert_from_pem_file(env, certificate_file);
if(!cert)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Certificate cannot be loaded from the file.");
return NULL;
}
@@ -92,7 +93,7 @@
}
else
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Public key certificate file is not specified.");
return NULL;
}
@@ -166,12 +167,11 @@
server_side = axis2_msg_ctx_get_server_side(msg_ctx, env);
nodes_to_sign = axutil_array_list_create(env, 0);
- /* status = rampart_context_get_nodes_to_sign(rampart_context,env,soap_envelope,nodes_to_sign);*/
status = rampart_sig_get_nodes_to_sign(
rampart_context, env, soap_envelope, nodes_to_sign);
if(status != AXIS2_SUCCESS)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Error occured in Adding signed parts.");
axutil_array_list_free(nodes_to_sign, env);
nodes_to_sign = NULL;
@@ -193,7 +193,7 @@
env, sec_node, RAMPART_SECURITY_TIMESTAMP);
if(!ts_node)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Required timestamp cannot be found.");
return AXIS2_FAILURE;
}
@@ -209,7 +209,7 @@
env, sec_node, RAMPART_SECURITY_USERNAMETOKEN);
if(!ut_node)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Required username token cannot be found.");
return AXIS2_FAILURE;
}
@@ -222,7 +222,7 @@
rampart_context, env, AXIS2_FALSE, server_side, AXIS2_FALSE);
if(!token)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Signature Token is not specified");
return AXIS2_FAILURE;
}
@@ -230,12 +230,14 @@
if(!rampart_context_is_token_type_supported(token_type, env))
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[rampart][rampart_signature] Token type %d not supported", token_type);
return AXIS2_FAILURE;
}
if(rampart_context_check_is_derived_keys(env,token))
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] We still do not support derived keys");
return AXIS2_FAILURE;
}
@@ -251,6 +253,8 @@
cert = rampart_sig_get_cert(env, rampart_context);
if(!cert)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[rampart][rampart_signature] Cannot get certificate");
return AXIS2_FAILURE;
}
/*This flag will be useful when creating key Info element.*/
@@ -261,7 +265,7 @@
bst_data = oxs_x509_cert_get_data(cert, env);
if(!bst_data)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Certificate data cannot be loaded from the cert.");
return AXIS2_FAILURE;
}
@@ -270,7 +274,7 @@
cert_id , OXS_ENCODING_BASE64BINARY, OXS_VALUE_X509V3, bst_data);
if(!bst_node)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Binary Security Token creation failed.");
return AXIS2_FAILURE;
}
@@ -285,7 +289,8 @@
}
if(!eki)
{
- AXIS2_LOG_INFO(env->log,"[rampart][rampart_signature] No way of attaching the token.");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[rampart][rampart_signature] Cannot attach the token.");
return AXIS2_FAILURE;
}
@@ -339,7 +344,7 @@
env, (axis2_char_t *)key_buf, NULL);
if(!prvkey)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Can't load the key from buffer");
return AXIS2_FAILURE;
}
@@ -354,7 +359,8 @@
rampart_context, env);
if(!prv_key_file)
{
- AXIS2_LOG_INFO(env->log, "Private Key file is not specified.");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[rampart][rampart_signature]Private Key file is not specified.");
return AXIS2_FAILURE;
}
@@ -383,7 +389,7 @@
rampart_context, env);
if(!password_callback)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Password call back module is not loaded.");
return AXIS2_FAILURE;
}
@@ -398,7 +404,7 @@
if((oxs_key_mgr_read_pkcs12_key_store(env, prv_key_file,
password, &c, &prvkey)==AXIS2_FAILURE) || !prvkey)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Cannot load the private key from pfx file.");
return AXIS2_FAILURE;
}
@@ -410,14 +416,14 @@
env, prv_key_file, password);
if(!prvkey)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Cannot load the private key from file.");
return AXIS2_FAILURE;
}
}
else
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Unknown Private key format.");
return AXIS2_FAILURE;
}
@@ -437,7 +443,7 @@
status = oxs_xml_sig_sign(env, sign_ctx, sec_node, &sig_node);
if(status!=AXIS2_SUCCESS)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Message signing failed.");
return AXIS2_FAILURE;
}
@@ -450,7 +456,7 @@
key_info_node = oxs_token_build_key_info_element(env, sig_node);
if(!key_info_node)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Key info element build failed.");
return AXIS2_FAILURE;
}
@@ -463,7 +469,7 @@
env, key_info_node);
if(!str_node)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Security Token element creation failed in Direct reference.");
return AXIS2_FAILURE;
}
@@ -472,7 +478,7 @@
env, str_node, cert_id_ref, OXS_VALUE_X509V3);
if(!reference_node)
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Security Token element creation failed in Direct reference.");
return AXIS2_FAILURE;
}
@@ -482,6 +488,8 @@
cert = rampart_sig_get_cert(env, rampart_context);
if(!cert)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[rampart][rampart_signature] Cannot get the certificate");
return AXIS2_FAILURE;
}
if(axutil_strcmp(eki, RAMPART_STR_EMBEDDED) == 0)
@@ -501,7 +509,7 @@
}
else
{
- AXIS2_LOG_INFO(env->log,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_signature] Unknown key Identifier type.Token attaching failed");
status = AXIS2_FAILURE;
}