Author: shankar Date: Wed Jun 25 04:48:05 2008 New Revision: 671518 URL: http://svn.apache.org/viewvc?rev=671518&view=rev Log: changing rahas module level policy
Modified:
webservices/rampart/trunk/c/build/win32/deploy_rampart.bat
webservices/rampart/trunk/c/samples/secpolicy/scenario25/client-policy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario25/services.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario26/client-policy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario26/services.xml
webservices/rampart/trunk/c/src/data/rahas_module.xml
Modified: webservices/rampart/trunk/c/build/win32/deploy_rampart.bat
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/build/win32/deploy_rampart.bat?rev=671518&r1=671517&r2=671518&view=diff
==============================================================================
--- webservices/rampart/trunk/c/build/win32/deploy_rampart.bat (original)
+++ webservices/rampart/trunk/c/build/win32/deploy_rampart.bat Wed Jun 25
04:48:05 2008
@@ -10,7 +10,7 @@
md %AXIS2C_HOME%\modules\rahas\
copy modules\rahas\mod_rahas.dll %AXIS2C_HOME%\modules\rahas\
-bin\samples\secpolicy\deploy.js modules\rahas\module.xml
%AXIS2C_HOME%\modules\rahas\module.xml
+copy modules\rahas\module.xml %AXIS2C_HOME%\modules\rahas\module.xml
copy modules\rahas\mod_rahas.* %AXIS2C_HOME%\lib\
md %AXIS2C_HOME%\services\sec_echo\
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario25/client-policy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario25/client-policy.xml?rev=671518&r1=671517&r2=671518&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario25/client-policy.xml
(original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario25/client-policy.xml
Wed Jun 25 04:48:05 2008
@@ -11,67 +11,36 @@
<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
<wsp:ExactlyOne>
<wsp:All>
-
<sp:SymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+
<sp:AsymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<wsp:Policy>
-
<sp:ProtectionToken>
+
<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:RequireDerivedKeys/>
-
<sp:RequireThumbprintReference/>
<sp:WssX509V3Token10/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
-
</sp:ProtectionToken>
-
<sp:AlgorithmSuite>
+
</sp:InitiatorToken>
+
<sp:RecipientToken>
<wsp:Policy>
-
<sp:Basic256/>
+
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+
<wsp:Policy>
+
<sp:WssX509V3Token10/>
+
</wsp:Policy>
+
</sp:X509Token>
</wsp:Policy>
-
</sp:AlgorithmSuite>
+
</sp:RecipientToken>
<sp:Layout>
<wsp:Policy>
<sp:Strict/>
</wsp:Policy>
</sp:Layout>
<sp:IncludeTimestamp/>
-
<sp:EncryptSignature/>
-
<sp:OnlySignEntireHeadersAndBody/>
-
</wsp:Policy>
-
</sp:SymmetricBinding>
-
<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/AlwaysToRecipient";>
-
<wsp:Policy>
-
<sp:WssUsernameToken10/>
-
</wsp:Policy>
-
</sp:UsernameToken>
-
</wsp:Policy>
-
</sp:SignedSupportingTokens>
-
<sp:Wss11
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
-
<wsp:Policy>
-
<sp:MustSupportRefKeyIdentifier/>
-
<sp:MustSupportRefIssuerSerial/>
-
<sp:MustSupportRefThumbprint/>
-
<sp:MustSupportRefEncryptedKey/>
</wsp:Policy>
-
</sp:Wss11>
-
<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:Header
Namespace="http://www.w3.org/2005/08/addressing"/>
-
</sp:SignedParts>
+
</sp:AsymmetricBinding>
<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>
-
<rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
@@ -89,67 +58,36 @@
<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
<wsp:ExactlyOne>
<wsp:All>
-
<sp:SymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+
<sp:AsymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<wsp:Policy>
-
<sp:ProtectionToken>
+
<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:RequireDerivedKeys/>
-
<sp:RequireThumbprintReference/>
<sp:WssX509V3Token10/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
-
</sp:ProtectionToken>
-
<sp:AlgorithmSuite>
+
</sp:InitiatorToken>
+
<sp:RecipientToken>
<wsp:Policy>
-
<sp:Basic256/>
+
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+
<wsp:Policy>
+
<sp:WssX509V3Token10/>
+
</wsp:Policy>
+
</sp:X509Token>
</wsp:Policy>
-
</sp:AlgorithmSuite>
+
</sp:RecipientToken>
<sp:Layout>
<wsp:Policy>
<sp:Strict/>
</wsp:Policy>
</sp:Layout>
<sp:IncludeTimestamp/>
-
<sp:EncryptSignature/>
-
<sp:OnlySignEntireHeadersAndBody/>
-
</wsp:Policy>
-
</sp:SymmetricBinding>
-
<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/AlwaysToRecipient";>
-
<wsp:Policy>
-
<sp:WssUsernameToken10/>
-
</wsp:Policy>
-
</sp:UsernameToken>
-
</wsp:Policy>
-
</sp:SignedSupportingTokens>
-
<sp:Wss11
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
-
<wsp:Policy>
-
<sp:MustSupportRefKeyIdentifier/>
-
<sp:MustSupportRefIssuerSerial/>
-
<sp:MustSupportRefThumbprint/>
-
<sp:MustSupportRefEncryptedKey/>
</wsp:Policy>
-
</sp:Wss11>
-
<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:Header
Namespace="http://www.w3.org/2005/08/addressing"/>
-
</sp:SignedParts>
+
</sp:AsymmetricBinding>
<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>
-
<rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario25/services.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario25/services.xml?rev=671518&r1=671517&r2=671518&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario25/services.xml
(original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario25/services.xml Wed
Jun 25 04:48:05 2008
@@ -8,74 +8,74 @@
<module ref="rahas"/>
<operation name="echoString">
- <parameter
name="wsamapping">http://example.com/ws/2004/09/policy/Test/EchoRequest</parameter>
+ <parameter
name="wsamapping">http://example.com/ws/2004/09/policy/Test/EchoRequest</parameter>
+ <wsp:Policy
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+ <wsp:Policy>
+ <sp:EncryptionToken>
+ <wsp:Policy>
+
<sp:SecureConversationToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+
<wsp:Policy>
+
<sp:SC10SecurityContextToken/>
+
</wsp:Policy>
+
</sp:SecureConversationToken>
+ </wsp:Policy>
+ </sp:EncryptionToken>
+ <sp:SignatureToken>
+ <wsp:Policy>
+
<sp:SecureConversationToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+
<wsp:Policy>
+
<sp:SC10SecurityContextToken/>
+
</wsp:Policy>
+
</sp:SecureConversationToken>
+ </wsp:Policy>
+ </sp:SignatureToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+
<sp:OnlySignEntireHeadersAndBody/>
+ <sp:EncryptSignature/>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <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:SignedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+ <sp:Body/>
+ <sp:Header
Namespace="http://www.w3.org/2005/08/addressing"/>
+ </sp:SignedParts>
+ <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>Bob</rampc:User>
+
<rampc:PasswordType>Digest</rampc:PasswordType>
+
<rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ </rampc:RampartConfig>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
</operation>
- <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <wsp:Policy>
- <sp:EncryptionToken>
- <wsp:Policy>
-
<sp:SecureConversationToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
- <wsp:Policy>
-
<sp:SC10SecurityContextToken/>
- </wsp:Policy>
- </sp:SecureConversationToken>
- </wsp:Policy>
- </sp:EncryptionToken>
- <sp:SignatureToken>
- <wsp:Policy>
-
<sp:SecureConversationToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
- <wsp:Policy>
-
<sp:SC10SecurityContextToken/>
- </wsp:Policy>
- </sp:SecureConversationToken>
- </wsp:Policy>
- </sp:SignatureToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic256/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:OnlySignEntireHeadersAndBody/>
- <sp:EncryptSignature/>
- </wsp:Policy>
- </sp:SymmetricBinding>
- <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:SignedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <sp:Body/>
- <sp:Header
Namespace="http://www.w3.org/2005/08/addressing"/>
- </sp:SignedParts>
- <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>Bob</rampc:User>
- <rampc:PasswordType>Digest</rampc:PasswordType>
-
<rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- </rampc:RampartConfig>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
</service>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario26/client-policy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario26/client-policy.xml?rev=671518&r1=671517&r2=671518&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario26/client-policy.xml
(original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario26/client-policy.xml
Wed Jun 25 04:48:05 2008
@@ -11,36 +11,67 @@
<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
<wsp:ExactlyOne>
<wsp:All>
-
<sp:AsymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+
<sp:SymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<wsp:Policy>
-
<sp:InitiatorToken>
+
<sp:ProtectionToken>
<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:RequireDerivedKeys/>
+
<sp:RequireThumbprintReference/>
<sp:WssX509V3Token10/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
-
</sp:InitiatorToken>
-
<sp:RecipientToken>
+
</sp:ProtectionToken>
+
<sp:AlgorithmSuite>
<wsp:Policy>
-
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
-
<wsp:Policy>
-
<sp:WssX509V3Token10/>
-
</wsp:Policy>
-
</sp:X509Token>
+
<sp:Basic256/>
</wsp:Policy>
-
</sp:RecipientToken>
+
</sp:AlgorithmSuite>
<sp:Layout>
<wsp:Policy>
<sp:Strict/>
</wsp:Policy>
</sp:Layout>
<sp:IncludeTimestamp/>
+
<sp:EncryptSignature/>
+
<sp:OnlySignEntireHeadersAndBody/>
+
</wsp:Policy>
+
</sp:SymmetricBinding>
+
<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/AlwaysToRecipient";>
+
<wsp:Policy>
+
<sp:WssUsernameToken10/>
+
</wsp:Policy>
+
</sp:UsernameToken>
+
</wsp:Policy>
+
</sp:SignedSupportingTokens>
+
<sp:Wss11
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+
<wsp:Policy>
+
<sp:MustSupportRefKeyIdentifier/>
+
<sp:MustSupportRefIssuerSerial/>
+
<sp:MustSupportRefThumbprint/>
+
<sp:MustSupportRefEncryptedKey/>
</wsp:Policy>
-
</sp:AsymmetricBinding>
+
</sp:Wss11>
+
<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:Header
Namespace="http://www.w3.org/2005/08/addressing"/>
+
</sp:SignedParts>
<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>
+
<rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
@@ -58,36 +89,67 @@
<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
<wsp:ExactlyOne>
<wsp:All>
-
<sp:AsymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+
<sp:SymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<wsp:Policy>
-
<sp:InitiatorToken>
+
<sp:ProtectionToken>
<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:RequireDerivedKeys/>
+
<sp:RequireThumbprintReference/>
<sp:WssX509V3Token10/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
-
</sp:InitiatorToken>
-
<sp:RecipientToken>
+
</sp:ProtectionToken>
+
<sp:AlgorithmSuite>
<wsp:Policy>
-
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
-
<wsp:Policy>
-
<sp:WssX509V3Token10/>
-
</wsp:Policy>
-
</sp:X509Token>
+
<sp:Basic256/>
</wsp:Policy>
-
</sp:RecipientToken>
+
</sp:AlgorithmSuite>
<sp:Layout>
<wsp:Policy>
<sp:Strict/>
</wsp:Policy>
</sp:Layout>
<sp:IncludeTimestamp/>
+
<sp:EncryptSignature/>
+
<sp:OnlySignEntireHeadersAndBody/>
+
</wsp:Policy>
+
</sp:SymmetricBinding>
+
<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/AlwaysToRecipient";>
+
<wsp:Policy>
+
<sp:WssUsernameToken10/>
+
</wsp:Policy>
+
</sp:UsernameToken>
+
</wsp:Policy>
+
</sp:SignedSupportingTokens>
+
<sp:Wss11
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+
<wsp:Policy>
+
<sp:MustSupportRefKeyIdentifier/>
+
<sp:MustSupportRefIssuerSerial/>
+
<sp:MustSupportRefThumbprint/>
+
<sp:MustSupportRefEncryptedKey/>
</wsp:Policy>
-
</sp:AsymmetricBinding>
+
</sp:Wss11>
+
<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:Header
Namespace="http://www.w3.org/2005/08/addressing"/>
+
</sp:SignedParts>
<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>
+
<rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario26/services.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario26/services.xml?rev=671518&r1=671517&r2=671518&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario26/services.xml
(original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario26/services.xml Wed
Jun 25 04:48:05 2008
@@ -12,36 +12,61 @@
<wsp:Policy
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
<wsp:ExactlyOne>
<wsp:All>
- <sp:AsymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+ <sp:SymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+
<wsp:Policy>
+
<sp:RequireDerivedKeys/>
+
<sp:RequireThumbprintReference/>
+
<sp:WssX509V3Token10/>
+
</wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:EncryptSignature/>
+
<sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <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:InitiatorToken>
- <wsp:Policy>
-
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
-
<wsp:Policy>
-
<sp:WssX509V3Token10/>
-
</wsp:Policy>
-
</sp:X509Token>
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
-
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
-
<wsp:Policy>
-
<sp:WssX509V3Token10/>
-
</wsp:Policy>
-
</sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
- <sp:Layout>
- <wsp:Policy>
-
<sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
+
<sp:MustSupportRefKeyIdentifier/>
+
<sp:MustSupportRefEmbeddedToken/>
+
<sp:MustSupportRefIssuerSerial/>
</wsp:Policy>
- </sp:AsymmetricBinding>
+ </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>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>
+
<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>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/rampart/trunk/c/src/data/rahas_module.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/data/rahas_module.xml?rev=671518&r1=671517&r2=671518&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/data/rahas_module.xml (original)
+++ webservices/rampart/trunk/c/src/data/rahas_module.xml Wed Jun 25 04:48:05
2008
@@ -11,61 +11,36 @@
<wsp:Policy
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
<wsp:ExactlyOne>
<wsp:All>
- <sp:SymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <wsp:Policy>
- <sp:ProtectionToken>
- <wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
-
<wsp:Policy>
-
<sp:RequireDerivedKeys/>
-
<sp:RequireThumbprintReference/>
-
<sp:WssX509V3Token10/>
-
</wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:ProtectionToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic256/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:EncryptSignature/>
-
<sp:OnlySignEntireHeadersAndBody/>
- </wsp:Policy>
- </sp:SymmetricBinding>
- <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";>
+ <sp:AsymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<wsp:Policy>
-
<sp:MustSupportRefKeyIdentifier/>
-
<sp:MustSupportRefEmbeddedToken/>
-
<sp:MustSupportRefIssuerSerial/>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+
<wsp:Policy>
+
<sp:WssX509V3Token10/>
+
</wsp:Policy>
+
</sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+
<wsp:Policy>
+
<sp:WssX509V3Token10/>
+
</wsp:Policy>
+
</sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:Layout>
+ <wsp:Policy>
+
<sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
</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>
+ </sp:AsymmetricBinding>
<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>
-
<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>
</wsp:All>
</wsp:ExactlyOne>
