Author: manjula
Date: Sun Jun 3 21:26:21 2007
New Revision: 544046
URL: http://svn.apache.org/viewvc?view=rev&rev=544046
Log:
Handling token include scenarios.
Modified:
webservices/rampart/trunk/c/include/rampart_context.h
webservices/rampart/trunk/c/samples/secpolicy/scenario1/services.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario2/services.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario3/services.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario4/services.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario5/services.xml
webservices/rampart/trunk/c/src/util/rampart_context.c
webservices/rampart/trunk/c/src/util/rampart_encryption.c
webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
webservices/rampart/trunk/c/src/util/rampart_signature.c
Modified: webservices/rampart/trunk/c/include/rampart_context.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_context.h?view=diff&rev=544046&r1=544045&r2=544046
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_context.h (original)
+++ webservices/rampart/trunk/c/include/rampart_context.h Sun Jun 3 21:26:21
2007
@@ -392,7 +392,8 @@
rampart_context_t *rampart_context,
const axutil_env_t *env,
axis2_bool_t for_encryption,
- axis2_bool_t server_side);
+ axis2_bool_t server_side,
+ axis2_bool_t is_inpath);
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
rampart_context_check_is_derived_keys(
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?view=diff&rev=544046&r1=544045&r2=544046
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario1/services.xml
(original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario1/services.xml Sun
Jun 3 21:26:21 2007
@@ -21,7 +21,7 @@
<wsp:Policy>
<sp:InitiatorToken>
<wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -30,7 +30,7 @@
</sp:InitiatorToken>
<sp:RecipientToken>
<wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario2/services.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario2/services.xml?view=diff&rev=544046&r1=544045&r2=544046
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario2/services.xml
(original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario2/services.xml Sun
Jun 3 21:26:21 2007
@@ -21,7 +21,7 @@
<wsp:Policy>
<sp:InitiatorToken>
<wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -30,7 +30,7 @@
</sp:InitiatorToken>
<sp:RecipientToken>
<wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario3/services.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario3/services.xml?view=diff&rev=544046&r1=544045&r2=544046
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario3/services.xml
(original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario3/services.xml Sun
Jun 3 21:26:21 2007
@@ -21,7 +21,7 @@
<wsp:Policy>
<sp:InitiatorToken>
<wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -30,7 +30,7 @@
</sp:InitiatorToken>
<sp:RecipientToken>
<wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
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?view=diff&rev=544046&r1=544045&r2=544046
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario4/services.xml
(original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario4/services.xml Sun
Jun 3 21:26:21 2007
@@ -21,7 +21,7 @@
<wsp:Policy>
<sp:InitiatorToken>
<wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -30,7 +30,7 @@
</sp:InitiatorToken>
<sp:RecipientToken>
<wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario5/services.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario5/services.xml?view=diff&rev=544046&r1=544045&r2=544046
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario5/services.xml
(original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario5/services.xml Sun
Jun 3 21:26:21 2007
@@ -21,7 +21,7 @@
<wsp:Policy>
<sp:InitiatorToken>
<wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -30,7 +30,7 @@
</sp:InitiatorToken>
<sp:RecipientToken>
<wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
Modified: webservices/rampart/trunk/c/src/util/rampart_context.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_context.c?view=diff&rev=544046&r1=544045&r2=544046
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_context.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_context.c Sun Jun 3 21:26:21
2007
@@ -1716,7 +1716,8 @@
rampart_context_t *rampart_context,
const axutil_env_t *env,
axis2_bool_t for_encryption,
- axis2_bool_t server_side)
+ axis2_bool_t server_side,
+ axis2_bool_t is_inpath)
{
rp_property_t *binding = NULL;
binding = rp_secpolicy_get_binding(rampart_context->secpolicy,env);
@@ -1729,15 +1730,30 @@
asym_binding = (rp_asymmetric_binding_t
*)rp_property_get_value(binding,env);
if(asym_binding)
{
- if((for_encryption && server_side) || (!for_encryption &&
!server_side))
- {
- return
rp_asymmetric_binding_get_initiator_token(asym_binding,env);
+ if(is_inpath)
+ {
+ if((for_encryption && server_side) || (!for_encryption &&
!server_side))
+ {
+ return
rp_asymmetric_binding_get_recipient_token(asym_binding,env);
+ }
+ else if((for_encryption && !server_side) || (!for_encryption
&& server_side))
+ {
+ return
rp_asymmetric_binding_get_initiator_token(asym_binding,env);
+ }
+ else return NULL;
}
- else if((for_encryption && !server_side) || (!for_encryption &&
server_side))
+ else
{
- return
rp_asymmetric_binding_get_recipient_token(asym_binding,env);
- }
- else return NULL;
+ if((server_side && for_encryption) || (!for_encryption &&
!server_side))
+ {
+ return
rp_asymmetric_binding_get_initiator_token(asym_binding,env);
+ }
+ else if((server_side && !for_encryption)|| (for_encryption &&
!server_side))
+ {
+ return
rp_asymmetric_binding_get_recipient_token(asym_binding,env);
+ }
+ else return NULL;
+ }
}
else
return NULL;
@@ -1953,7 +1969,7 @@
const axutil_env_t *env)
{
axis2_char_t *inclusion = NULL;
- axis2_bool_t include = AXIS2_TRUE;
+ axis2_bool_t include = AXIS2_FALSE;
if(token_type == RP_TOKEN_X509)
{
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=544046&r1=544045&r2=544046
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_encryption.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_encryption.c Sun Jun 3
21:26:21 2007
@@ -97,7 +97,7 @@
return AXIS2_SUCCESS;
}
/*Now we have to check whether a token is specified.*/
- token =
rampart_context_get_token(rampart_context,env,AXIS2_TRUE,server_side);
+ token = rampart_context_get_token(rampart_context, env, AXIS2_TRUE,
server_side, AXIS2_FALSE);
if(!token)
{
AXIS2_LOG_INFO(env->log,"[rampart][rampart_encryption] Encryption
Token is not specified");
Modified: webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c?view=diff&rev=544046&r1=544045&r2=544046
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
(original)
+++ webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c Sun Jun
3 21:26:21 2007
@@ -549,7 +549,7 @@
/*Get the key identifiers and build the certificate*/
/*First we should verify with policy*/
- token =
rampart_context_get_token(rampart_context,env,AXIS2_FALSE,server_side);
+ token = rampart_context_get_token(rampart_context, env, AXIS2_FALSE,
server_side, AXIS2_TRUE);
if(!token)
{
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=544046&r1=544045&r2=544046
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_signature.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_signature.c Sun Jun 3
21:26:21 2007
@@ -184,7 +184,7 @@
axutil_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);
+ token = rampart_context_get_token(rampart_context, env, AXIS2_FALSE,
server_side, AXIS2_FALSE);
if(!token)
{
AXIS2_LOG_INFO(env->log,"[rampart][rampart_signature] Signature Token
is not specified");
