Author: kaushalye
Date: Wed Dec 12 21:10:13 2007
New Revision: 603818
URL: http://svn.apache.org/viewvc?rev=603818&view=rev
Log:
Removing additional configurations from sample sec policies
Some bug fixes
Modified:
webservices/rampart/trunk/c/samples/secpolicy/README
webservices/rampart/trunk/c/samples/secpolicy/scenario4/services.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario9/client-policy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario9/services.xml
webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c
Modified: webservices/rampart/trunk/c/samples/secpolicy/README
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/README?rev=603818&r1=603817&r2=603818&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/README (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/README Wed Dec 12 21:10:13
2007
@@ -49,7 +49,7 @@
FAQ:
---
-* I am NOT in LINUX. Are there any changes to be done in samples.
+* I am NOT on LINUX. Are there any changes to be done in samples.
----------------------------------------------------------------
YES. You have to change file names accordingly. For example your password
callback module might have "*.so" as the extension. This might be different in
Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario4/services.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario4/services.xml?rev=603818&r1=603817&r2=603818&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario4/services.xml
(original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario4/services.xml Wed
Dec 12 21:10:13 2007
@@ -58,7 +58,6 @@
</sp:SignedParts>
<rampc:RampartConfig
xmlns:rampc="http://ws.apache.org/rampart/c/policy";>
<rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
<rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
<rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario9/client-policy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario9/client-policy.xml?rev=603818&r1=603817&r2=603818&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario9/client-policy.xml
(original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario9/client-policy.xml
Wed Dec 12 21:10:13 2007
@@ -52,7 +52,6 @@
<rampc:RampartConfig
xmlns:rampc="http://ws.apache.org/rampart/c/policy";>
<rampc:User>Alice</rampc:User>
<rampc:TimeToLive>360</rampc:TimeToLive>
- <rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
<rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario9/services.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario9/services.xml?rev=603818&r1=603817&r2=603818&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario9/services.xml
(original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario9/services.xml Wed
Dec 12 21:10:13 2007
@@ -57,7 +57,6 @@
<rampc:RampartConfig
xmlns:rampc="http://ws.apache.org/rampart/c/policy";>
<rampc:User>Bob</rampc:User>
<rampc:TimeToLive>360</rampc:TimeToLive>
- <rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
<rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
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=603818&r1=603817&r2=603818&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 Wed Dec
12 21:10:13 2007
@@ -439,11 +439,15 @@
{
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][shb] Asymmetric
Binding. ");
+ AXIS2_LOG_INFO(env->log, "[rampart][shb] Asymmetric Binding. ");
status = rampart_shb_do_asymmetric_binding(env, msg_ctx,
rampart_context, soap_envelope, sec_node, sec_ns_obj);
axiom_namespace_free(sec_ns_obj, env);
if(AXIS2_FAILURE == status){
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][shb] Asymmetric
Binding failed");
+ if(axis2_msg_ctx_get_server_side(msg_ctx,env)){
+ rampart_create_fault_envelope(env,
RAMPART_FAULT_INVALID_SECURITY,
+ " Asymmetric Binding failed. Check
configurations ", RAMPART_FAULT_IN_POLICY, msg_ctx);
+ }
return AXIS2_FAILURE;
}else{
return AXIS2_SUCCESS;
@@ -460,6 +464,10 @@
axiom_namespace_free(sec_ns_obj, env);
if(AXIS2_FAILURE == status){
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][shb] Symmetric
Binding failed");
+ if(axis2_msg_ctx_get_server_side(msg_ctx,env)){
+ rampart_create_fault_envelope(env,
RAMPART_FAULT_INVALID_SECURITY,
+ " Symmetric Binding failed. Check
configurations ", RAMPART_FAULT_IN_POLICY, msg_ctx);
+ }
return AXIS2_FAILURE;
}else{
return AXIS2_SUCCESS;
