Author: kaushalye
Date: Wed Mar 28 23:12:29 2007
New Revision: 523574
URL: http://svn.apache.org/viewvc?view=rev&rev=523574
Log:
1. Re-writing scenarios for rampart samples
2. Fixing failures due to changes in Axis2/C. Pls propagate changes properly
hereafter :(
Modified:
webservices/rampart/trunk/c/samples/authn_provider/authn_provider.c
webservices/rampart/trunk/c/samples/callback/htpasswd_callback/htpwcb.c
webservices/rampart/trunk/c/samples/secpolicy/README.txt
webservices/rampart/trunk/c/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario2/service-incoming-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-incoming-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml
webservices/rampart/trunk/c/src/util/rampart_handler_util.c
webservices/rampart/trunk/c/src/util/rampart_token_processor.c
Modified: webservices/rampart/trunk/c/samples/authn_provider/authn_provider.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/authn_provider/authn_provider.c?view=diff&rev=523574&r1=523573&r2=523574
==============================================================================
--- webservices/rampart/trunk/c/samples/authn_provider/authn_provider.c
(original)
+++ webservices/rampart/trunk/c/samples/authn_provider/authn_provider.c Wed Mar
28 23:12:29 2007
@@ -48,11 +48,11 @@
res = axis2_strstr(line, ":");
ch = res[0];
res[0] = '\0';
- un = (axis2_char_t *) axis2_strdup(line, env);
+ un = (axis2_char_t *) axis2_strdup(env, line);
res[0] = ch;
if(0 == axis2_strcmp(un, username)){
- pw = (axis2_char_t *) axis2_strdup(&(res[1]), env);
- password = axis2_strndup(pw, axis2_strlen(pw)-1, env); /*We need
to remove the end of line character*/
+ pw = (axis2_char_t *) axis2_strdup(env, &(res[1]));
+ password = axis2_strndup(env, pw, axis2_strlen(pw)-1); /*We need
to remove the end of line character*/
break;
}
Modified:
webservices/rampart/trunk/c/samples/callback/htpasswd_callback/htpwcb.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/callback/htpasswd_callback/htpwcb.c?view=diff&rev=523574&r1=523573&r2=523574
==============================================================================
--- webservices/rampart/trunk/c/samples/callback/htpasswd_callback/htpwcb.c
(original)
+++ webservices/rampart/trunk/c/samples/callback/htpasswd_callback/htpwcb.c Wed
Mar 28 23:12:29 2007
@@ -58,11 +58,11 @@
res = axis2_strstr(line, ":");
ch = res[0];
res[0] = '\0';
- un = (axis2_char_t *) axis2_strdup(line, env);
+ un = (axis2_char_t *) axis2_strdup(env, line);
res[0] = ch;
if(0 == axis2_strcmp(un, username)){
- pw = (axis2_char_t *) axis2_strdup(&(res[1]), env);
- password = axis2_strndup(pw, axis2_strlen(pw)-1, env); /*We need
to remove the end of line character*/
+ pw = (axis2_char_t *) axis2_strdup( env, &(res[1]));
+ password = axis2_strndup(env, pw, axis2_strlen(pw)-1); /*We need
to remove the end of line character*/
break;
}
Modified: webservices/rampart/trunk/c/samples/secpolicy/README.txt
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/README.txt?view=diff&rev=523574&r1=523573&r2=523574
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/README.txt (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/README.txt Wed Mar 28
23:12:29 2007
@@ -17,9 +17,11 @@
Scenario Summary
-------------------
1. Timestamp
-2. UsernameToken+Timestamp
-3. Client-Encrypt(IssuerSerial)
-4. Client-Encrypt(RefKeyIdentifier)
-5. Client-Encrypt(Embedded)
-6. Client-Encrypt(DirectReference)
-7. Both client and server Encrypts
+2. UsernameToken
+3. Client Encrypt(DirectReference)
+4. Client Encrypt(IssuerSerial/RefKeyIdentifier/Embedded)
+5. Client Sign(DirectReference)
+6. Client Sign(IssuerSerial/RefKeyIdentifier/Embedded)
+7. Timestamp, UsernameToken, Encrypt, Sign (Sign before encrypt)
+8. Timestamp, UsernameToken, Encrypt, Sign (Encrypt before sign)
+
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml?view=diff&rev=523574&r1=523573&r2=523574
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml
Wed Mar 28 23:12:29 2007
@@ -21,7 +21,6 @@
</sp:X509Token>
</wsp:Policy>
</sp:RecipientToken>
- <sp:IncludeTimestamp/>
</wsp:Policy>
</sp:AsymmetricBinding>
<sp:SignedSupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario2/service-incoming-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario2/service-incoming-secpolicy.xml?view=diff&rev=523574&r1=523573&r2=523574
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario2/service-incoming-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario2/service-incoming-secpolicy.xml
Wed Mar 28 23:12:29 2007
@@ -21,7 +21,6 @@
</sp:X509Token>
</wsp:Policy>
</sp:RecipientToken>
- <sp:IncludeTimestamp/>
</wsp:Policy>
</sp:AsymmetricBinding>
<sp:SignedSupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml?view=diff&rev=523574&r1=523573&r2=523574
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
Wed Mar 28 23:12:29 2007
@@ -5,7 +5,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/Always";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -14,7 +14,7 @@
</sp:InitiatorToken>
<sp:RecipientToken>
<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/Always";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -31,32 +31,16 @@
<sp:Strict/>
</wsp:Policy>
</sp:Layout>
- <sp:IncludeTimestamp/>
<sp:EncryptBeforeSigning/>
</wsp:Policy>
</sp:AsymmetricBinding>
- <sp:SignedSupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <wsp:Policy>
- <sp:UsernameToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always"/>
- </wsp:Policy>
- </sp:SignedSupportingTokens>
- <sp:Wss10
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <wsp:Policy>
- <sp:MustSupportRefIssuerSerial/>
- </wsp:Policy>
- </sp:Wss10>
<sp:EncryptedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<sp:Body/>
</sp:EncryptedParts>
<rampc:RampartConfig
xmlns:rampc="http://ws.apache.org/rampart/c/policy";>
- <rampc:User>Gampola</rampc:User>
- <rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
- <rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario3/service-incoming-secpolicy.xml?view=diff&rev=523574&r1=523573&r2=523574
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
Wed Mar 28 23:12:29 2007
@@ -5,7 +5,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/Always";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -14,7 +14,7 @@
</sp:InitiatorToken>
<sp:RecipientToken>
<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/Always";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -31,31 +31,15 @@
<sp:Strict/>
</wsp:Policy>
</sp:Layout>
- <sp:IncludeTimestamp/>
<sp:EncryptBeforeSigning/>
</wsp:Policy>
</sp:AsymmetricBinding>
- <sp:SignedSupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <wsp:Policy>
- <sp:UsernameToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always"/>
- </wsp:Policy>
- </sp:SignedSupportingTokens>
- <sp:Wss10
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <wsp:Policy>
- <sp:MustSupportRefIssuerSerial/>
- </wsp:Policy>
- </sp:Wss10>
<sp:EncryptedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<sp:Body/>
</sp:EncryptedParts>
<rampc:RampartConfig
xmlns:rampc="http://ws.apache.org/rampart/c/policy";>
- <rampc:User>Gampola</rampc:User>
- <rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
- <rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml?view=diff&rev=523574&r1=523573&r2=523574
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
Wed Mar 28 23:12:29 2007
@@ -42,21 +42,19 @@
</sp:SignedSupportingTokens>
<sp:Wss10
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<wsp:Policy>
+ <!--Please uncomment ONE of these to select an identifier
pattern-->
<sp:MustSupportRefKeyIdentifier/>
+ <!--sp:MustSupportRefEmbeddedToken/-->
+ <!--sp:MustSupportRefIssuerSerial-->
</wsp:Policy>
</sp:Wss10>
<sp:EncryptedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<sp:Body/>
</sp:EncryptedParts>
<rampc:RampartConfig
xmlns:rampc="http://ws.apache.org/rampart/c/policy";>
- <rampc:User>Gampola</rampc:User>
- <rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
- <rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario4/service-incoming-secpolicy.xml?view=diff&rev=523574&r1=523573&r2=523574
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
Wed Mar 28 23:12:29 2007
@@ -31,31 +31,22 @@
<sp:Strict/>
</wsp:Policy>
</sp:Layout>
- <sp:IncludeTimestamp/>
<sp:EncryptBeforeSigning/>
</wsp:Policy>
</sp:AsymmetricBinding>
- <sp:SignedSupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <wsp:Policy>
- <sp:UsernameToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always"/>
- </wsp:Policy>
- </sp:SignedSupportingTokens>
<sp:Wss10
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<wsp:Policy>
<sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefEmbeddedToken/>
+ <sp:MustSupportRefIssuerSerial/>
</wsp:Policy>
</sp:Wss10>
<sp:EncryptedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<sp:Body/>
</sp:EncryptedParts>
<rampc:RampartConfig
xmlns:rampc="http://ws.apache.org/rampart/c/policy";>
- <rampc:User>Gampola</rampc:User>
- <rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
- <rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-incoming-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-incoming-secpolicy.xml?view=diff&rev=523574&r1=523573&r2=523574
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-incoming-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-incoming-secpolicy.xml
Wed Mar 28 23:12:29 2007
@@ -5,7 +5,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/Always";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -14,7 +14,7 @@
</sp:InitiatorToken>
<sp:RecipientToken>
<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/Always";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml?view=diff&rev=523574&r1=523573&r2=523574
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
Wed Mar 28 23:12:29 2007
@@ -5,7 +5,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/Always";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -14,7 +14,7 @@
</sp:InitiatorToken>
<sp:RecipientToken>
<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/Always";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -31,32 +31,16 @@
<sp:Strict/>
</wsp:Policy>
</sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:EncryptBeforeSigning/>
</wsp:Policy>
</sp:AsymmetricBinding>
- <sp:SignedSupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <wsp:Policy>
- <sp:UsernameToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always"/>
- </wsp:Policy>
- </sp:SignedSupportingTokens>
- <sp:Wss10
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <wsp:Policy>
- <sp:MustSupportRefEmbeddedToken/>
- </wsp:Policy>
- </sp:Wss10>
- <sp:EncryptedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <sp:Body/>
- </sp:EncryptedParts>
+ <sp:SignedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+ <sp:Body/>
+ </sp:SignedParts>
<rampc:RampartConfig
xmlns:rampc="http://ws.apache.org/rampart/c/policy";>
- <rampc:User>Gampola</rampc:User>
- <rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
- <rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_store.pfx</rampc:PrivateKey>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-incoming-secpolicy.xml?view=diff&rev=523574&r1=523573&r2=523574
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
Wed Mar 28 23:12:29 2007
@@ -5,7 +5,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/Always";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -14,7 +14,7 @@
</sp:InitiatorToken>
<sp:RecipientToken>
<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/Always";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -31,30 +31,14 @@
<sp:Strict/>
</wsp:Policy>
</sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:EncryptBeforeSigning/>
</wsp:Policy>
</sp:AsymmetricBinding>
- <sp:SignedSupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <wsp:Policy>
- <sp:UsernameToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always"/>
- </wsp:Policy>
- </sp:SignedSupportingTokens>
- <sp:Wss10
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <wsp:Policy>
- <sp:MustSupportRefEmbeddedToken/>
- </wsp:Policy>
- </sp:Wss10>
- <sp:EncryptedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <sp:Body/>
- </sp:EncryptedParts>
+ <sp:SignedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+ <sp:Body/>
+ </sp:SignedParts>
<rampc:RampartConfig
xmlns:rampc="http://ws.apache.org/rampart/c/policy";>
- <rampc:User>Gampola</rampc:User>
- <rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
- <rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml?view=diff&rev=523574&r1=523573&r2=523574
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml
Wed Mar 28 23:12:29 2007
@@ -5,7 +5,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/Always";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
@@ -14,7 +14,7 @@
</sp:InitiatorToken>
<sp:RecipientToken>
<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/Always";>
<wsp:Policy>
<sp:WssX509V3Token10/>
</wsp:Policy>
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=523574&r1=523573&r2=523574
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_handler_util.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_handler_util.c Wed Mar 28
23:12:29 2007
@@ -116,7 +116,7 @@
sec_headers =
axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header, env,
RAMPART_WSSE_XMLNS);
if (sec_headers)
{
- sec_ns_str = axis2_strdup(RAMPART_WSSE_XMLNS, env);
+ sec_ns_str = axis2_strdup(env, RAMPART_WSSE_XMLNS);
header_block_ht = axiom_soap_header_get_all_header_blocks(soap_header,
env);
if (!header_block_ht)
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=523574&r1=523573&r2=523574
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_token_processor.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_token_processor.c Wed Mar 28
23:12:29 2007
@@ -78,7 +78,7 @@
/*Select ref using node*/
ref = oxs_token_get_reference(env, ref_node);
- ref_id = axis2_string_substring_starting_at(axis2_strdup(ref, env), 1);
+ ref_id = axis2_string_substring_starting_at(axis2_strdup(env, ref), 1);
/*Find the token with the id=ref_id within the scope of scope_node*/
bst_node = oxs_axiom_get_node_by_id(env, scope_node,"wsu:Id",ref_id);
