Author: alessio.soldano(a)jboss.com
Date: 2012-01-10 10:24:08 -0500 (Tue, 10 Jan 2012)
New Revision: 15483
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
Log:
[JBWS-3405] Updating Sign-Encrypt sample to use WS-SecurityPolicy 1.2 and to be pretty
much equivalent to WS-SecurityPolicy Example 2.2.2 (Mutual Authentication with X.509
Certificats, Sign, Encrypt)
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2012-01-10
14:43:43 UTC (rev 15482)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2012-01-10
15:24:08 UTC (rev 15483)
@@ -7,7 +7,7 @@
xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w...
xmlns:wsaws="http://www.w3.org/2005/08/addressing"
-
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"...
+
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&...
<types>
<xsd:schema>
<xsd:import
namespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypoli...
schemaLocation="SecurityService_schema1.xsd"/>
@@ -26,7 +26,7 @@
</operation>
</portType>
<binding name="SecurityServicePortBinding"
type="tns:ServiceIface">
- <wsp:PolicyReference URI="#SecurityServiceSignThenEncryptPolicy"/>
+ <wsp:PolicyReference URI="#SecurityServiceEncryptThenSignPolicy"/>
<soap:binding
transport="http://schemas.xmlsoap.org/soap/http"
style="document"/>
<operation name="sayHello">
<soap:operation soapAction=""/>
@@ -44,23 +44,23 @@
</port>
</service>
- <wsp:Policy wsu:Id="SecurityServiceSignThenEncryptPolicy"
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"...
+ <wsp:Policy wsu:Id="SecurityServiceEncryptThenSignPolicy"
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&...
<wsp:ExactlyOne>
<wsp:All>
- <sp:AsymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"...
+ <sp:AsymmetricBinding
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&...
<wsp:Policy>
<sp:InitiatorToken>
<wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolic...
+ <sp:X509Token
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/...
<wsp:Policy>
<sp:WssX509V1Token11/>
</wsp:Policy>
- </sp:X509Token>
+ </sp:X509Token>
</wsp:Policy>
</sp:InitiatorToken>
<sp:RecipientToken>
<wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolic...
+ <sp:X509Token
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/...
<wsp:Policy>
<sp:WssX509V1Token11/>
</wsp:Policy>
@@ -74,13 +74,13 @@
</sp:AlgorithmSuite>
<sp:Layout>
<wsp:Policy>
- <sp:Lax/>
+ <sp:Strict/>
</wsp:Policy>
</sp:Layout>
<sp:IncludeTimestamp/>
- <sp:EncryptSignature/>
+ <sp:ProtectTokens/>
<sp:OnlySignEntireHeadersAndBody/>
- <sp:SignBeforeEncrypting/>
+ <sp:EncryptBeforeSigning/>
</wsp:Policy>
</sp:AsymmetricBinding>
<sp:SignedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"...
@@ -91,7 +91,6 @@
</sp:EncryptedParts>
<sp:Wss10
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"...
<wsp:Policy>
- <!-- sp:MustSupportRefKeyIdentifier/-->
<sp:MustSupportRefIssuerSerial/>
</wsp:Policy>
</sp:Wss10>